diff --git a/.gitattributes b/.gitattributes
index f5760a67ec90a064f6f34446875054166db999da..d3b3d555c8e11e29bf7ba38e9954b75c547aa3c1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,5 @@
 /cert/.gitkeep export-ignore
-/config/.gitkeep export-ignore
-/metadata/.gitkeep export-ignore
 /tests export-ignore
-/tools export-ignore
 codecov.yml export-ignore
 .editorconfig export-ignore
 .gitattributes export-ignore
diff --git a/.gitignore b/.gitignore
index 35d237f357005dcc17b0e4dba7df423117c00a9c..6c8316247847ef24d524b9618e28d47beea930bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-/log/
 /config/
 /metadata/
 /cert/
@@ -13,10 +12,6 @@
 /www/assets/css/*.map
 .phpunit.result.cache
 
-!/config/.gitkeep
-!/metadata/.gitkeep
-!/cache/.gitkeep
-!/locales/.gitkeep
 !/www/assets/fonts/.gitkeep
 !/www/assets/js/.gitkeep
 !/www/assets/css/.gitkeep
diff --git a/bin/build-release.sh b/bin/build-release.sh
index 99b16e858c244eb7789f75fdcce4b7b158ef994c..d4194c2c5cca1e1c02b60b0f4f1dd1d10f80ce1f 100755
--- a/bin/build-release.sh
+++ b/bin/build-release.sh
@@ -51,9 +51,6 @@ npm audit fix
 npx browserslist@latest --update-db
 npm run build
 
-rm cert/.gitkeep
-rm bin/build-release.sh
-
 php "$COMPOSER" archive -f tar.gz --dir /tmp --file "$TARGET"
 rm "$COMPOSER"
 echo `shasum -a 256 /tmp/$TARGET.tar.gz`
diff --git a/composer.json b/composer.json
index bf639e40d76a4aaae6ef14036e8862dde1d085c6..8651b7a206da29b1dbe4b50e58c3489fe2c255e7 100644
--- a/composer.json
+++ b/composer.json
@@ -115,6 +115,8 @@
             ".gitattributes",
             ".gitignore",
             ".php_cs.dist",
+            "bin/build-release.sh",
+            "cert/.gitkeep",
             "codecov.yml",
             "node_modules",
             "phpcs.xml",
diff --git a/phpcs.xml b/phpcs.xml
index 9bdd0c40b11602f04d6f7900c9a79daf78be39ee..40b1cc46ada7007757307cd936a86eadd0c3e84a 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -7,8 +7,8 @@
     </description>
 
     <file>bin</file>
-    <file>config-templates</file>
-    <file>metadata-templates</file>
+    <file>config</file>
+    <file>metadata</file>
     <file>modules</file>
     <file>resources</file>
     <file>src</file>
diff --git a/psalm.xml b/psalm.xml
index 68f407eb4da390678a8e64afd6c4c10f00cbda25..62985323f8c0a61fcf3b94a1a7f8373820ca4826 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -8,8 +8,8 @@
     allowStringToStandInForClass="true"
 >
     <projectFiles>
-        <directory name="config-templates" />
-        <directory name="metadata-templates" />
+        <directory name="config" />
+        <directory name="metadata" />
         <directory name="modules" />
         <directory name="src/SimpleSAML" />
         <directory name="tests" />
@@ -69,8 +69,8 @@
         <!-- Suppress PossiblyUndefinedGlobalVariable on templates -->
         <PossiblyUndefinedGlobalVariable>
             <errorLevel type="suppress">
-                <directory name="config-templates" />
-                <directory name="metadata-templates" />
+                <directory name="config" />
+                <directory name="metadata" />
                 <directory name="modules/adfs/metadata-templates" />
             </errorLevel>
         </PossiblyUndefinedGlobalVariable>