diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
index 24c8079..13f11ba 100644
--- a/.github/workflows/pypi.yml
+++ b/.github/workflows/pypi.yml
@@ -136,17 +136,43 @@ jobs:
           name: wheels
           path: dist
 
-  build_wheels:
-    name: Build wheels for musllinux
+  muslwheels_x86:
+    name: Build musllinux wheels for x86
     runs-on: ubuntu-latest
 
     env:
       CIBW_BUILD_VERBOSITY: 1
       CIBW_BEFORE_ALL_LINUX: "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly -y"
-      CIBW_ARCHS_LINUX: "auto aarch64"
+      CIBW_ARCHS_LINUX: "auto64"
       CIBW_ENVIRONMENT: 'PATH="$PATH:$HOME/.cargo/bin"'
-      CIBW_BUILD: "*-musllinux_x86_64 *-musllinux_aarch64"
-      CIBW_SKIP: "cp27-* cp34-* cp35-* cp36-*"
+      CIBW_BUILD: "*-musllinux_x86_64"
+      CIBW_SKIP: "cp27-* cp34-* cp35-* "
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Build wheels
+        uses: pypa/cibuildwheel@v2.9.0
+        with:
+          output-dir: dist
+
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: wheels
+          path: dist
+
+  aarch64_wheels:
+    name: Build wheels for aarch64 linux
+    runs-on: ubuntu-latest
+
+    env:
+      CIBW_BUILD_VERBOSITY: 1
+      CIBW_BEFORE_ALL_LINUX: "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly -y"
+      CIBW_ARCHS_LINUX: "aarch64"
+      CIBW_ENVIRONMENT: 'PATH="$PATH:$HOME/.cargo/bin"'
+      CIBW_BUILD: "*-musllinux_aarch64 *-manylinux_aarch64"
+      CIBW_SKIP: "cp27-* cp34-* cp35-* "
 
     steps:
       - uses: actions/checkout@v3
@@ -154,7 +180,7 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
         with:
-          platforms: all
+          platforms: arm64
 
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.9.0
@@ -171,7 +197,7 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     if: "startsWith(github.ref, 'refs/tags/')"
-    needs: [ macos, windows, linux, build_wheels]
+    needs: [ macos, windows, linux, muslwheels_x86, aarch64_wheels]
     steps:
       - uses: actions/download-artifact@v2
         with: