diff --git a/.editorconfig b/.editorconfig
index de63ffd..d13da7d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,14 +6,9 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[*.yml]
-indent_size = 2
-
-[*.yml.j2]
+[*.{yml,yaml,yml.j2}]
 indent_size = 2
+trim_trailing_whitespace = true
 
 [Vagrantfile]
 indent_size = 2
-
-[Makefile]
-indent_style = tab