diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
index fc5d0411..e62d979f 100644
--- a/.github/workflows/pypi.yml
+++ b/.github/workflows/pypi.yml
@@ -48,12 +48,13 @@ jobs:
         with:
           platforms: all
 
-      - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.2
+      # Build wheels
+      - run: pip install cibuildwheel==2.16.1
+      - run: python -m cibuildwheel --output-dir dist
         env:
           CIBW_TEST_COMMAND: python -m unittest discover -s {package}/tests
           CIBW_ARCHS_MACOS: x86_64 arm64 universal2
-          CIBW_ARCHS_LINUX: auto aarch64
+          CIBW_ARCHS_LINUX: x86_64 aarch64
 
       # Make wheels downloadable from GitHub UI and from the pypi step
       - uses: actions/upload-artifact@v3
@@ -90,13 +91,11 @@ jobs:
 
       - if: ${{ startsWith(github.ref, 'refs/tags/v') }}
         name: "Create GitHub Release"
-        uses: actions/create-release@v1
+        uses: softprops/action-gh-release@v1
         with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
           draft: false
           prerelease: false
           files: |
             dist/*.whl
             dist/*.tar.gz
-          token: ${{ secrets.GITHUB_TOKEN }}
+          generate_release_notes: true