diff --git a/build/maven/template/pom.xml.template b/build/maven/template/pom.xml.template
index f2503ba4d..56ef76223 100644
--- a/build/maven/template/pom.xml.template
+++ b/build/maven/template/pom.xml.template
@@ -147,6 +147,23 @@
     								<ignore></ignore>
     							</action>
     						</pluginExecution>
+							<pluginExecution>
+    							<pluginExecutionFilter>
+    								<groupId>
+    									com.coveo
+    								</groupId>
+    								<artifactId>
+    									fmt-maven-plugin
+    								</artifactId>
+    								<versionRange>[2.8,)</versionRange>
+    								<goals>
+    									<goal>format</goal>
+    								</goals>
+    							</pluginExecutionFilter>
+    							<action>
+    								<ignore></ignore>
+    							</action>
+    						</pluginExecution>
     					</pluginExecutions>
     				</lifecycleMappingMetadata>
     			</configuration>
diff --git a/languages/mopt/xtext/pom.xml b/languages/mopt/xtext/pom.xml
index 7dfc74638..16ab5207e 100644
--- a/languages/mopt/xtext/pom.xml
+++ b/languages/mopt/xtext/pom.xml
@@ -167,9 +167,7 @@
 										</versionRange>
 										<goals>
 											<goal>add-resource</goal>
-											<goal>add-source</goal>
 											<goal>add-test-resource</goal>
-											<goal>add-test-source</goal>
 										</goals>
 									</pluginExecutionFilter>
 									<action>