diff --git a/.editorconfig b/.editorconfig
index 66ac3eeb9..8e994f3ca 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,4 +8,15 @@ indent_style = tab
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = false
-insert_final_newline = false
\ No newline at end of file
+insert_final_newline = false
+
+[*.go]
+indent_style = tab
+
+[*.{yaml,yml}]
+indent_style = space
+indent_size = 2
+
+[*.json]
+indent_style = space
+indent_size = 4
\ No newline at end of file