diff --git a/.editorconfig b/.editorconfig
index 7451d9ae75..96eb00eff0 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,9 +2,24 @@
 root = true
 
 [*]
-indent_style = space
-indent_size = 2
 end_of_line = lf
-charset = utf-8
+insert_final_newline = true
 trim_trailing_whitespace = true
-insert_final_newline = true
\ No newline at end of file
+charset = utf-8
+
+[*.dart]
+indent_style = space
+indent_size = 2
+
+# Groovy Gradle build scripts style (build.gradle files)
+[*.gradle]
+indent_style = space
+indent_size = 4
+
+# Kotlin code style according to https://developer.android.com/kotlin/style-guide
+[*.{kt, kts}]
+indent_size = 4
+max_line_length = 100
+
+[*.yml]
+indent_size = 2