diff --git a/.editorconfig b/.editorconfig
index 8841bc6e..19ba592b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,12 @@
 root = true
 
 [*]
-insert_final_newline = true
 indent_style = space
 indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{yml,yaml}]
+indent_size = 2