diff --git a/.editorconfig b/.editorconfig
index f3c0421..44b0f00 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -16,6 +16,8 @@ indent_style = tab
 [*.md]
 trim_trailing_whitespace = false
 
-
 [*.py]
 indent_size = 4
+
+[Makefile]
+indent_style = tab
diff --git a/tools/xservice/gogen/assets/project/.editorconfig b/tools/xservice/gogen/assets/project/.editorconfig
index 3e67235..6dbb413 100644
--- a/tools/xservice/gogen/assets/project/.editorconfig
+++ b/tools/xservice/gogen/assets/project/.editorconfig
@@ -15,3 +15,9 @@ indent_style = tab
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.py]
+indent_size = 4
+
+[Makefile]
+indent_style = tab