diff --git a/.editorconfig b/.editorconfig
index c910d25d8..9acb478c3 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -15,6 +15,12 @@ curly_bracket_next_line = true
 spaces_around_operators = true
 spaces_around_brackets = true
 
-[*.yml,*.yaml]
+[*.{yml,yaml}]
 indent_style = space
 indent_size = 2
+
+[*.{md,mdx}]
+trim_trailing_whitespace = false
+
+[*.go]
+indent_style = tab