diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index cf7bcf4be15..816940136a4 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -138,6 +138,8 @@ jobs:
       - name: Setup repo and non-root user
         run: |
           git --version
+          # See http://changelogs.ubuntu.com/changelogs/pool/main/g/git/git_2.25.1-1ubuntu3.3/changelog
+          git config --global --add safe.directory /__w/spack/spack
           git fetch --unshallow
           . .github/workflows/setup_git.sh
       - name: Bootstrap clingo