diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index c6af2c8b2..eafaa957f 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -83,7 +83,7 @@ jobs:
         with:
           python-version: 3.8
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.20.0
+        uses: pypa/cibuildwheel@v2.21.1
         env:
           CIBW_SKIP: pp* # The Makefile requires python3-config which is not in pypy
           CIBW_ARCHS: ${{ matrix.os.archs }}
diff --git a/.github/workflows/wheels/cibw_before_build.sh b/.github/workflows/wheels/cibw_before_build.sh
index 29fffe090..018b0e0df 100644
--- a/.github/workflows/wheels/cibw_before_build.sh
+++ b/.github/workflows/wheels/cibw_before_build.sh
@@ -5,6 +5,10 @@ set -x
 make clean
 
 # DEBUG: show python3 and python3-config outputs
+if [ "$(uname)" != "Linux" ]; then
+    # https://github.com/pypa/cibuildwheel/issues/2021
+    ln -s $(dirname $(readlink -f $(which python3)))/python3-config $(dirname $(which python3))/python3-config
+fi
 python3 --version
 python3-config --includes