diff --git a/.editorconfig b/.editorconfig
index 0679d88a..ddda9782 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,14 +1,24 @@
-# EditorConfig is awesome: http://EditorConfig.org
-
-# top-most EditorConfig file
 root = true
 
-[*]
+[*.java]
+indent_style = tab
+indent_size = 4
+continuation_indent_size = 8
+
+[*.groovy]
+indent_style = tab
+indent_size = 4
+continuation_indent_size = 8
+
+[*.xml]
 indent_style = tab
 indent_size = 4
-end_of_line = lf
-insert_final_newline = true
+continuation_indent_size = 8
 
 [*.yml]
 indent_style = space
 indent_size = 2
+
+[*.yaml]
+indent_style = space
+indent_size = 2
diff --git a/pom.xml b/pom.xml
index 051c56f6..3ec1ecac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,14 +56,14 @@
 					</additionalConfig>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>io.spring.javaformat</groupId>
 				<artifactId>spring-javaformat-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>