diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 74917a39..6d4c9597 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -3,21 +3,20 @@ name: Build
 on: [pull_request]
 
 jobs:
-  build_wheels:
+  build_wheels_linux:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        #os: [ubuntu-20.04, windows-2019, macos-11]
-        os: [ubuntu-20.04, macos-11]
-        arch: [x86_64, auto32, auto64, aarch64, ppc64le, s390x, arm64]
+        os: [ubuntu-20.04]
+        arch: [x86_64, i686, aarch64, ppc64le, s390x]
 
     steps:
       - name: Checkout LeptonInjector
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.9'  # update once build dependencies are available
 
@@ -28,6 +27,33 @@ jobs:
         if: ${{ failure() }}
         uses: mxschmitt/action-tmate@v3
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
+        with:
+          path: ./wheelhouse/*.whl
+  build_wheels_macos:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-11]
+        arch: [x86_64, arm64]
+
+    steps:
+      - name: Checkout LeptonInjector
+        uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.9'  # update once build dependencies are available
+
+      - name: Build wheels
+        uses: pypa/cibuildwheel@v2.16.2
+
+      - name: Setup tmate session
+        if: ${{ failure() }}
+        uses: mxschmitt/action-tmate@v3
+
+      - uses: actions/upload-artifact@v4
         with:
           path: ./wheelhouse/*.whl