diff --git a/.github/workflows/package-publish.yml b/.github/workflows/package-publish.yml
index 8e2efb3..264c2e4 100644
--- a/.github/workflows/package-publish.yml
+++ b/.github/workflows/package-publish.yml
@@ -32,9 +32,14 @@ jobs:
           echo "PATH=${PATH}:${HOME}/.cargo/bin" >> "$GITHUB_ENV"
           rustc --version
           python -m pip install build setuptools setuptools-rust
-      - name: Build wheels
-        run:
-          python -m build --outdir py_dist
+      - name: Build wheels with cibuildwheel
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install cibuildwheel==2.22.0
+          python -m cibuildwheel --output-dir py_dist
+#      - name: Build wheels
+#        run:
+#          python -m build --outdir py_dist
       - name: Store the compiled packages
         uses: actions/upload-artifact@v4
         with:
@@ -58,8 +63,13 @@ jobs:
           curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=stable
           echo "${HOME}/.cargo/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
           python -m pip install build setuptools setuptools-rust
-      - name: Build wheels
-        run: python -m build --outdir py_dist
+#      - name: Build wheels
+#        run: python -m build --outdir py_dist
+      - name: Build wheels with cibuildwheel
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install cibuildwheel==2.22.0
+          python -m cibuildwheel --output-dir py_dist
       - name: Store the compiled packages
         uses: actions/upload-artifact@v4
         with:
@@ -144,48 +154,3 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           packages-dir: py_dist/
-
-# Currently not intending on using automated github-release as the primary trigger for pypi publishing is by creating
-# a new github version release. This is done manually by the developer.
-#  github-release:
-#    name: >-
-#      Sign the Python 🐍 distribution 📦 with Sigstore
-#      and upload them to GitHub Release
-#    needs:
-#      - publish-to-pypi
-#    runs-on: ubuntu-latest
-#
-#    permissions:
-#      contents: write  # IMPORTANT: mandatory for making GitHub Releases
-#      id-token: write  # IMPORTANT: mandatory for sigstore
-#
-#    steps:
-#      - name: Download all the dists
-#        uses: actions/download-artifact@v4
-#        with:
-#          name: python-package-distributions
-#          path: py_dist/
-#      - name: Sign the dists with Sigstore
-#        uses: sigstore/gh-action-sigstore-python@v3.0.0
-#        with:
-#          inputs: >-
-#            ./py_dist/*.tar.gz
-#            ./py_dist/*.whl
-#      - name: Create GitHub Release
-#        env:
-#          GITHUB_TOKEN: ${{ github.token }}
-#        run: >-
-#          gh release create
-#          '${{ github.ref_name }}'
-#          --repo '${{ github.repository }}'
-#          --notes ""
-#      - name: Upload artifact signatures to GitHub Release
-#        env:
-#          GITHUB_TOKEN: ${{ github.token }}
-#        # Upload to GitHub Release using the `gh` CLI.
-#        # `dist/` contains the built packages, and the
-#        # sigstore-produced signatures and certificates.
-#        run: >-
-#          gh release upload
-#          '${{ github.ref_name }}' py_dist/**
-#          --repo '${{ github.repository }}'