diff --git a/.editorconfig b/.editorconfig
index 3c1f41bdcca6..d5188ec09b59 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -23,3 +23,7 @@ indent_size = 4
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2