diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55117537..0dca3482 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,14 @@
 
 ### Added
 
+* Add .gitignore and .editorconfig to the list of files that are not updated if they exist [#655](https://github.com/NLeSC/python-template/pull/655)
+
 ### Changed
 
 ### Removed
 
+* Remove pyproject.toml and CITATION.cff from the list of files that are not updated if they exist [#655](https://github.com/NLeSC/python-template/pull/655)
+  
 ## [0.6.0]
 
 ### Added
diff --git a/copier/settings.yml b/copier/settings.yml
index cd2071bd..2593015b 100644
--- a/copier/settings.yml
+++ b/copier/settings.yml
@@ -3,8 +3,8 @@ _subdirectory: template
 
 # Settings like `_skip_if_exists` are merged
 _skip_if_exists:
-  - "pyproject.toml"
-  - CITATION.cff
   - LICENSE
   - CHANGELOG.md
   - CODE_OF_CONDUCT.md
+  - .gitignore
+  - .editorconfig