diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 620d9c1efd36..07209e391d3e 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -269,7 +269,9 @@ jobs:
           gcc --version &&
           g++ --version &&
           python3 --version &&
-          cd /numpy && python3 setup.py install
+          git config --global --add safe.directory /numpy
+          cd /numpy &&
+          python3 setup.py install
         "
         docker commit the_build the_build
     - name: Run SIMD Tests
diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
index 78fa25995f3c..11907a285f72 100644
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@@ -36,6 +36,7 @@ jobs:
       - name: Update with Cygwin git
         # fetch-depth=0 above should make this short.
         run: |
+          dash -c "which git; /usr/bin/git config --system --add safe.directory /cygdrive/d/a/numpy/numpy"
           dash -c "which git; /usr/bin/git fetch --all -p"
       - name: Verify python version
         # Make sure it's the Cygwin one, not a Windows one