diff --git a/.editorconfig b/.editorconfig
index af67d04a3b..66406ca44e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,9 +6,13 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-trim_trailing_whitespaces = true
 indent_style = tab
-quote_type = single
+trim_trailing_whitespace = true
+insert_final_newline = true
 
-[*.js]
-quote_type = double
\ No newline at end of file
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[composer.json]
+indent_size = tab