diff --git a/.editorconfig b/.editorconfig
index 1db555a7..b4674c8f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,5 +1,6 @@
-[*]
 root = true
+
+[*]
 indent_style = tab
 indent_size = tab
 tab_width = 4
@@ -7,3 +8,11 @@ charset = utf-8
 insert_final_newline = true
 trim_trailing_whitespace = true
 end_of_line = lf
+
+[{CMakeLists.txt,*.cmake}]
+indent_style = space
+indent_size = 2
+
+[*.yml]
+indent_style = space
+indent_size = 2