diff --git a/.editorconfig b/.editorconfig
index 2995eb3fa..28489600c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -45,3 +45,11 @@ indent_size = 4
 [*.py]
 indent_style = space
 indent_size = 4
+
+[*.yaml]
+indent_style = space
+indent_size = 2
+
+[{*.zsh,.*.zsh,build-aux/.functions/*,.github/scripts/utils.zsh/*}]
+indent_style = space
+indent_size = 2