diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..6ccdbfc9
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.go]
+indent_style = tab
+
+[*.proto]
+indent_size = 2
diff --git a/.github/workflows/.editorconfig b/.github/workflows/.editorconfig
index 7bd3346f..0902c6ae 100644
--- a/.github/workflows/.editorconfig
+++ b/.github/workflows/.editorconfig
@@ -1,2 +1,2 @@
-[*.yml]
+[{*.yml,*.yaml}]
 indent_size = 2
diff --git a/scripts/manifests/.editorconfig b/scripts/manifests/.editorconfig
new file mode 100644
index 00000000..0902c6ae
--- /dev/null
+++ b/scripts/manifests/.editorconfig
@@ -0,0 +1,2 @@
+[{*.yml,*.yaml}]
+indent_size = 2