diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 66637813f472..e97331bd9452 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -75,27 +75,16 @@ jobs:
         - [macos-10.15, macosx_*]
         - [windows-2019, win_amd64]
         - [windows-2019, win32]
-        python: ["cp38", "cp39", "cp310"]
-        include:
+        python: ["cp38", "cp39", "cp310", "pp38", "pp39"]
+        exclude:
         # TODO: uncomment PyPy 3.9 builds once PyPy
         # re-releases a new minor version
         # NOTE: This needs a bump of cibuildwheel version, also, once that happens.
-        # manylinux pypy builds
-        - buildplat: [ubuntu-20.04, manylinux_x86_64]
+        # Don't build PyPy 32-bit windows
+        - buildplat: [windows-2019, win32]
           python: "pp38"
-        #- buildplat: [ubuntu-20.04, manylinux_x86_64]
-        #  python: "pp39"
-
-        - buildplat: [macos-10.15, macosx_x86_64]
-          python: "pp38"
-        #- buildplat: [macos-10.15, macosx_x86_64]
-        #  python: "pp39"
-
-        # Windows PyPy builds
-        - buildplat: [windows-2019, win_amd64]
-          python: "pp38"
-        #- buildplat: [windows-2019, win_amd64]
-        #  python: "pp39"
+        - buildplat: [windows-2019, win32]
+          python: "pp39"
     env:
       IS_32_BIT: ${{ matrix.buildplat[1] == 'win32' }}
       IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}