diff --git a/.editorconfig b/.editorconfig
index 2f3fbe64be9f7..0cdfc80277e88 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,13 +13,6 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 indent_style = tab
 
-[*.yml]
-indent_style = space
-indent_size = 2
-
-[*.md]
-trim_trailing_whitespace = false
-
 [*.{gradle,java,kt}]
 indent_style = space
 
diff --git a/packages/create-block/CHANGELOG.md b/packages/create-block/CHANGELOG.md
index f5f440220b8c0..f80c07c56306c 100644
--- a/packages/create-block/CHANGELOG.md
+++ b/packages/create-block/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Enhancement
+
+-   Updated `.editorconfig` template files to work with automatic file formatting ([#30794](https://github.com/WordPress/gutenberg/pull/30794)).
+
 ## 2.2.0 (2021-04-06)
 
 ### Enhancement
diff --git a/packages/create-block/lib/templates/es5/.editorconfig.mustache b/packages/create-block/lib/templates/es5/.editorconfig.mustache
index a541e47e767bc..7cae5d565e1ae 100644
--- a/packages/create-block/lib/templates/es5/.editorconfig.mustache
+++ b/packages/create-block/lib/templates/es5/.editorconfig.mustache
@@ -12,10 +12,3 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 indent_style = tab
-
-[*.yml]
-indent_style = space
-indent_size = 2
-
-[*.md]
-trim_trailing_whitespace = false
diff --git a/packages/create-block/lib/templates/esnext/.editorconfig.mustache b/packages/create-block/lib/templates/esnext/.editorconfig.mustache
index a541e47e767bc..7cae5d565e1ae 100644
--- a/packages/create-block/lib/templates/esnext/.editorconfig.mustache
+++ b/packages/create-block/lib/templates/esnext/.editorconfig.mustache
@@ -12,10 +12,3 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 indent_style = tab
-
-[*.yml]
-indent_style = space
-indent_size = 2
-
-[*.md]
-trim_trailing_whitespace = false