diff --git a/.editorconfig b/.editorconfig
index 06df99495e0..5be7b263743 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,10 +7,27 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
-indent_size = 4
-
-[*.bat]
-indent_size = 2
 
 [*.gradle]
 indent_size = 2
+
+[*.groovy]
+indent_size = 4
+
+[*.java]
+indent_size = 4
+
+[*.json]
+indent_size = 2
+
+[*.py]
+indent_size = 2
+
+[*.sh]
+indent_size = 2
+
+[*.{yml,yaml}]
+indent_size = 2
+
+[*.{xsd,xml}]
+indent_size = 4