diff --git a/.github/workflows/python-package-create.yml b/.github/workflows/python-package-create.yml
index 5147069c..1aff61a1 100644
--- a/.github/workflows/python-package-create.yml
+++ b/.github/workflows/python-package-create.yml
@@ -67,32 +67,37 @@ jobs:
           repository: ${{ inputs.repository }}
           fetch-depth: 0  # Fetch all refs so setuptools_scm can generate the correct version number
 
-      - name: Setup Python
-        uses: actions/setup-python@v5.1.0
+      - name: Build & Upload Package
+        uses: hynek/build-and-inspect-python-package@v2.5.0
         with:
-          python-version: ${{ inputs.python-version }}
-          cache: pip
-          cache-dependency-path: |
-            **/setup.cfg
-            **/pyproject.toml
+          upload-name-suffix: ${{ steps.package.outputs.name }}${{ inputs.build-subdirectory && format('-{0}', inputs.build-subdirectory) || '' }}
 
-      - name: Update pip
-        run: python -m pip install -U pip
+      # - name: Setup Python
+      #   uses: actions/setup-python@v5.1.0
+      #   with:
+      #     python-version: ${{ inputs.python-version }}
+      #     cache: pip
+      #     cache-dependency-path: |
+      #       **/setup.cfg
+      #       **/pyproject.toml
 
-      - name: Install tox
-        run: python -m pip install ${{ inputs.tox-source }}
+      # - name: Update pip
+      #   run: python -m pip install -U pip
 
-      - name: Build Wheels
-        if: inputs.build-subdirectory == ''
-        run: tox -e package${{ inputs.tox-factors }}
+      # - name: Install tox
+      #   run: python -m pip install ${{ inputs.tox-source }}
 
-      - name: Build Wheels from Subdirectory
-        if: inputs.build-subdirectory != ''
-        run: tox -e package${{ inputs.tox-factors }} -- ${{ inputs.build-subdirectory }}
+      # - name: Build Wheels
+      #   if: inputs.build-subdirectory == ''
+      #   run: tox -e package${{ inputs.tox-factors }}
 
-      - name: Upload Package
-        uses: actions/upload-artifact@v4.3.3
-        with:
-          name: packages-${{ steps.package.outputs.name }}${{ inputs.build-subdirectory && format('-{0}', inputs.build-subdirectory) || '' }}
-          path: ${{ inputs.distribution-path }}
-          if-no-files-found: error
+      # - name: Build Wheels from Subdirectory
+      #   if: inputs.build-subdirectory != ''
+      #   run: tox -e package${{ inputs.tox-factors }} -- ${{ inputs.build-subdirectory }}
+
+      # - name: Upload Package
+      #   uses: actions/upload-artifact@v4.3.3
+      #   with:
+      #     name: packages-${{ steps.package.outputs.name }}${{ inputs.build-subdirectory && format('-{0}', inputs.build-subdirectory) || '' }}
+      #     path: ${{ inputs.distribution-path }}
+      #     if-no-files-found: error