diff --git a/.editorconfig b/.editorconfig
index 68a969eaf..da84fc404 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,5 +8,8 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{yml,yaml}]
+[*.{yml,yaml,pug,json,css,sh}]
 indent_size = 2
+
+[Makefile]
+indent_style = tab