diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 11b9dc7ae..95159782f 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -69,6 +69,7 @@ jobs:
           apt-get -y update
           apt-get -y install patchelf
           python -m pip install --upgrade nox pip setuptools
+          git config --global --add safe.directory '*'
       - name: Bundle the distribution
         id: bundle
         run: nox -vs bundle >> $GITHUB_OUTPUT
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d047d5b82..5200db371 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -121,6 +121,7 @@ jobs:
           apt-get -y update
           apt-get -y install patchelf
           python -m pip install --upgrade nox pip setuptools
+          git config --global --add safe.directory '*'
       - name: Bundle the distribution
         id: bundle
         run: nox -vs bundle >> $GITHUB_OUTPUT
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d26da9caa..e2acad82f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * GitHub CI uses GITHUB_OUTPUT instead of deprecated set-output
 * Releases now feature digests of each file
 * Change default Python version in CI/CD to 3.11
+* Temporary marking all directories as `safe.directory` inside CI/CD when bundling
 
 ## [3.6.0] - 2022-09-20