diff --git a/.editorconfig b/.editorconfig
index ddde48ba4..8f0de65c5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,19 +1,18 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
 root = true
 
 [*]
-end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
+end_of_line = lf
+indent_size = 4
 indent_style = space
-indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
 
-[*.{diff,md}]
+[*.md]
 trim_trailing_whitespace = false
 
-[*.{php,tpl}]
+[*.{yml,yaml}]
+indent_size = 2
+
+[docker-compose.yml]
 indent_size = 4