diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..6e394e06ab
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,10 @@
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.yaml]
+indent_size = 2