diff --git a/.editorconfig b/.editorconfig
index cb5cb07..42f292d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -20,6 +20,9 @@ trim_trailing_whitespace = false
 ij_php_space_before_short_closure_left_parenthesis = false
 ij_php_space_after_type_cast = true
 
+[*.yaml]
+indent_size = 2
+
 [*.yml]
 indent_size = 2
 
diff --git a/.gitignore b/.gitignore
index 0c1ed62..2096d5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,54 +1,47 @@
-#c3 codeception
-c3.php
-
-# composer itself is not needed
-composer.phar
+# codecoverage (if present)
+code_coverage
 
-# composer vendor dir
-/vendor
-
-# config plugin
-/config/.merge-plan.php
+# codeception (if present)
+c3.php
 
-#copilot
-copilot
+# composer
+composer.lock
 
-# local phpunit config
-/phpunit.xml
+# gitHub copilot config (if present)
+.copilot/
+.github/copilot/**
 
-# Mac DS_Store Files
+# mac ds_store (if present)
 .DS_Store
 
-# netbeans project files
+# netbeans project (if present)
 nbproject
 
-#node_modules
-/node_modules
-
-# package json lock
+# node_modules (if present)
+node_modules
 package-lock.json
 
-# phpstorm project files
+# phpstorm project (if present)
 .idea
 
-# phpunit itself is not needed
-phpunit.phar
+# phpunit (if present)
+.phpunit.cache
+.phpunit.result.cache
+phpunit.xml*
+
+# vagrant (if present)
+.vagrant
 
-# vagrant runtime
-/.vagrant
+# vendor
+vendor
 
-# vscode
+# vscode project (if present)
 .vscode
 
-# windows thumbnail cache
+# windows thumbnail cache (if present)
 Thumbs.db
 
-# yii console commands
-requirements.php
-/yii_test
-/yii_test.bat
-
-# zend studio for eclipse project files
+# zend studio for eclipse project (if present)
 .buildpath
 .project
 .settings
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ff53ca..6727631 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 0.1.3 Under development
 
 - Bug #204: Add YAML front matter to configuration files for consistency (@terabytesoftw)
+- Bug #210: Update `.editorconfig` and `.gitignore` for improved consistency and clarity (@terabytesoftw)
 
 ## 0.1.2 October 8, 2025