diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ea5c3fb..19aba70 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,30 +23,41 @@ jobs:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
         python: [38, 39, 310, 311, 312]
-        bitness: [32, 64]
-        include:
-          # Run 32 and 64 bit version in parallel for Linux and Windows
+        platform_id:
+          - win_amd64
+          - win32
+          - manylinux_x86_64
+          - manylinux_i686
+          - manylinux_aarch64
+          - macosx_universal2
+        exclude:
+          # Skip Linux and Mac builds on Windows
           - os: windows-latest
-            bitness: 64
-            platform_id: win_amd64
+            platform_id: manylinux_aarch64
+          - os: windows-latest
+            platform_id: manylinux_i686
           - os: windows-latest
-            bitness: 32
-            platform_id: win32
-          - os: ubuntu-latest
-            bitness: 64
             platform_id: manylinux_x86_64
+          - os: windows-latest
+            platform_id: macosx_universal2
+          # Skip Mac and Windows builds on Linux
           - os: ubuntu-latest
-            bitness: 32
-            platform_id: manylinux_i686
+            platform_id: macosx_universal2
           - os: ubuntu-latest
-            bitness: 64
-            platform_id: manylinux_aarch64
+            platform_id: win_amd64
+          - os: ubuntu-latest
+            platform_id: win32
+          # Skip Linux and Windows builds on Mac
           - os: macos-latest
-            bitness: 64
-            platform_id: macosx_universal2
-        exclude:
+            platform_id: win_amd64
+          - os: macos-latest
+            platform_id: win32
+          - os: macos-latest
+            platform_id: manylinux_x86_64
           - os: macos-latest
-            bitness: 32
+            platform_id: manylinux_i686
+          - os: macos-latest
+            platform_id: manylinux_aarch64
     env:
       CIBW_ARCHS_LINUX: auto aarch64
       CIBW_ARCHS_MACOS: x86_64 universal2
@@ -61,7 +72,8 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Set up QEMU
-        if: runner.os == 'Linux'
+        if: |
+          runner.os == 'Linux' && (matrix.platform_id == 'manylinux_aarch64' || matrix.platform_id == 'manylinux_i686')
         uses: docker/setup-qemu-action@v2
         with:
           platforms: all
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 2537211..a3bb5d3 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -10,7 +10,6 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12"]
-
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -22,4 +21,4 @@ jobs:
         python -m pip install --upgrade pip
         pip install tox tox-gh-actions
     - name: Test with tox
-      run: tox
\ No newline at end of file
+      run: tox