diff --git a/.editorconfig b/.editorconfig
index 7692ac78..66406ca4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,5 +6,13 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-trim_trailing_whitespaces = true
 indent_style = tab
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[composer.json]
+indent_size = tab