diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index b3e0d6c5..58d4c8d5 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -19,22 +19,17 @@ jobs:
     uses: ./.github/workflows/generate_third_party_licenses.yml
 
   build_wheels:
-    name: Wheels for ${{ matrix.python.id }} - ${{ matrix.builder.kind }} - ${{ matrix.builder.arch }}
+    name: Wheels for ${{ matrix.python }} - ${{ matrix.builder.kind }} - ${{ matrix.builder.arch }}
     runs-on: ${{ matrix.builder.runner }}
     needs: generate_third_party_licenses
     strategy:
       matrix:
         python:
-          - id: cp38
-            version: "3.8"
-          - id: cp39
-            version: "3.9"
-          - id: cp310
-            version: "3.10"
-          - id: cp311
-            version: "3.11"
-          - id: cp312
-            version: "3.12"
+          - cp38
+          - cp39
+          - cp310
+          - cp311
+          - cp312
         builder:
           - runner: codebuild-${{ vars.CODEBUILD_PROJECT_NAME }}-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-large
             kind: manylinux
@@ -48,9 +43,9 @@ jobs:
           - runner: macos-13
             kind: macosx
             arch: x86_64
-          - runner: macos-14
-            kind: macosx
-            arch: arm64
+#          - runner: macos-14
+#            kind: macosx
+#            arch: arm64
     permissions:
       id-token: write
       contents: read
@@ -81,14 +76,13 @@ jobs:
       - if: ${{ matrix.builder.arch != 'aarch64' }}
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python.version }}
-          cache: "pip"
+          python-version: "3.12"
 
       - name: Install pipx
         run: |
           which python
           python -m pip install --upgrade pipx
-          pipx ensurepath
+          python -m pipx ensurepath
 
       # Run cibuildwheel manually, as the current runner uses setup-python
       # https://github.com/pypa/cibuildwheel/issues/1623
@@ -97,7 +91,7 @@ jobs:
           cibuildwheel
           "s3torchconnectorclient"
           --output-dir "wheelhouse"
-          --only "${{ matrix.python.id }}-${{ matrix.builder.kind }}_${{ matrix.builder.arch }}"
+          --only "${{ matrix.python }}-${{ matrix.builder.kind }}_${{ matrix.builder.arch }}"
           2>&1
         shell: bash