diff --git a/.editorconfig b/.editorconfig
index 3638f5e..618aa3f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,9 +3,20 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
 
 # go files (excluding templates)
 [*.{go,mod,sum}]
 indent_style = tab
 indent_size = 4
 tab_width = 4
+
+# go html templates
+[*.tmpl]
+indent_style = tab
+indent_size = 2
+tab_width = 2
+
+[Makefile]
+indent_style = tab