diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..686c443ce
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,17 @@
+# Drupal editor configuration normalization
+# @see http://editorconfig.org/
+
+# This is the top-most .editorconfig file; do not search in parent directories.
+root = true
+
+# All files.
+[*]
+end_of_line = LF
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[composer.{json,lock}]
+indent_size = 4
diff --git a/.gitignore b/.gitignore
index 12ad63d87..466935400 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
-# Ignore directories generated by Composer
+# To ignore OS temporary files use global .gitignore
+# https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files#configuring-ignored-files-for-all-repositories-on-your-computer
+
+# Ignore directories generated by Composer.
 /drush/contrib/
 /vendor/
 /web/core/
@@ -7,19 +10,22 @@
 /web/profiles/contrib/
 /web/libraries/
 
-# Ignore sensitive information
+# Ignore sensitive information.
 /web/sites/*/settings.php
-/web/sites/*/settings.local.php
 
-# Ignore Drupal's file directory
+# Ignore Drupal's file directory.
 /web/sites/*/files/
 
-# Ignore SimpleTest multi-site environment
+# Ignore SimpleTest multi-site environment.
 /web/sites/simpletest
 
-# Ignore files generated by common IDEs
-/.idea/
-/.vscode/
-
-# Ignore .env files as they are personal
+# Ignore .env files as they could contain sensitive information.
 /.env
+
+# Manage .gitattributes with Drupal scaffold for cross-platform compatibility.
+# Remove the line below and commit the file for more granular control.
+/.gitattributes
+
+# Manage all .gitignore files with Drupal scaffold.
+# Remove the line below and commit the files for more granular control.
+**/.gitignore
diff --git a/composer.json b/composer.json
index 15b7c363f..784988875 100644
--- a/composer.json
+++ b/composer.json
@@ -63,6 +63,11 @@
     "extra": {
         "composer-exit-on-patch-failure": true,
         "drupal-scaffold": {
+            "file-mapping": {
+                "[project-root]/.gitignore": false,
+                "[web-root]/INSTALL.txt": false,
+                "[web-root]/README.txt": false
+            },
             "locations": {
                 "web-root": "web/"
             }