diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 8445527d..ca81c6fe 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -19,14 +19,18 @@ jobs:
     name: Wheels for ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     strategy:
+      # let other jobs in matrix complete if one fails
+      fail-fast: false
       matrix:
         include:
         - name: linux-amd
           os: ubuntu-24.04
         - name: linux-arm
           os: ubuntu-24.04-arm
-        - name: macos
-          os: macos-13
+        - name: macos-intel
+          os: macos-15-intel
+        - name: macos-arm
+          os: macos-15
         - name: windows-x64
           os: windows-latest
         - name: windows-x86
diff --git a/pyproject.toml b/pyproject.toml
index 09fbaaf7..83425468 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,7 +15,9 @@ test-command = "pytest"
 test-sources = ["test", "pytest.ini"]
 before-test = "pip install -r {project}/requirements-test.txt"
 # Will avoid testing on emulated architectures (specifically ppc64le)
-test-skip = "*-*linux_ppc64le"
+# Also, skip testing on pypy on macOS arm64 due issue with bootstrapping git config paths
+# see https://github.com/libgit2/pygit2/issues/1442
+test-skip = "*-*linux_ppc64le pp*-macosx_arm64"
 
 [tool.cibuildwheel.linux]
 repair-wheel-command = "LD_LIBRARY_PATH=/project/ci/lib64 auditwheel repair -w {dest_dir} {wheel}"
@@ -25,7 +27,6 @@ select = "*-musllinux*"
 repair-wheel-command = "LD_LIBRARY_PATH=/project/ci/lib auditwheel repair -w {dest_dir} {wheel}"
 
 [tool.cibuildwheel.macos]
-archs = ["universal2"]
 environment = {LIBGIT2_VERSION="1.9.1", LIBSSH2_VERSION="1.11.1", OPENSSL_VERSION="3.3.3", LIBGIT2="/Users/runner/work/pygit2/pygit2/ci"}
 repair-wheel-command = "DYLD_LIBRARY_PATH=/Users/runner/work/pygit2/pygit2/ci/lib delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}"