diff --git a/.editorconfig b/.editorconfig
index bd10a34f3..8d305734b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,11 +4,17 @@ root = true
 
 [*]
 charset = utf-8
+indent_style = tab
 
-[*.{css,html,js,json,less,txt}]
+[*.{css,html,js,less,txt,json,yml,md}]
 trim_trailing_whitespace = true
 end_of_line = lf
-tab_width = 4
+indent_size = 4
+insert_final_newline = true
+
+[*.yml}]
+indent_style = space
+indent_size = 2
 
 [*.md]
 trim_trailing_whitespace = false