diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index f993a5d2..ee6bde4b 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
     - master
+    - pypy-wheel-macos
     tags:
     - 'v*'
 
@@ -17,7 +18,7 @@ jobs:
         - name: linux
           os: ubuntu-24.04
         - name: macos
-          os: macos-13
+          os: macos-15
 
     steps:
       - uses: actions/checkout@v4
@@ -32,7 +33,7 @@ jobs:
           platforms: all
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.21.3
+        run: python -m pip install cibuildwheel==2.22.0
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
diff --git a/build.sh b/build.sh
index 646e46a1..8a4edb54 100644
--- a/build.sh
+++ b/build.sh
@@ -85,19 +85,6 @@ else
     cd ci
 fi
 
-# Install zlib
-# XXX Build libgit2 with USE_BUNDLED_ZLIB instead?
-if [ -n "$ZLIB_VERSION" ]; then
-    FILENAME=zlib-$ZLIB_VERSION
-    wget https://www.zlib.net/$FILENAME.tar.gz -N
-    tar xf $FILENAME.tar.gz
-    cd $FILENAME
-    ./configure --prefix=$PREFIX
-    make
-    make install
-    cd ..
-fi
-
 # Install openssl
 if [ -n "$OPENSSL_VERSION" ]; then
     FILENAME=openssl-$OPENSSL_VERSION
@@ -189,6 +176,7 @@ if [ -n "$LIBGIT2_VERSION" ]; then
                 -DOPENSSL_SSL_LIBRARY="../openssl-universal/$LIBSSL" \
                 -DOPENSSL_INCLUDE_DIR="../openssl-x86/include" \
                 -DCMAKE_INSTALL_PREFIX=$PREFIX \
+                -DUSE_BUNDLED_ZLIB=ON \
                 -DUSE_SSH=$USE_SSH
     else
         export CFLAGS=-I$PREFIX/include
@@ -197,6 +185,7 @@ if [ -n "$LIBGIT2_VERSION" ]; then
                 -DBUILD_TESTS=OFF \
                 -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
                 -DCMAKE_INSTALL_PREFIX=$PREFIX \
+                -DUSE_BUNDLED_ZLIB=ON \
                 -DUSE_SSH=$USE_SSH
     fi
     cmake --build . --target install