diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index b0e86d15..33098549 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -26,7 +26,7 @@ jobs:
         # Skips PyPy
         os: [ubuntu-latest, macos-latest]
         cibw_archs: [auto64, arm64]
-        cibw_build: [cp38, cp39, cp310, cp311]
+        cibw_build: [cp38-*, cp39-*, cp310-*, cp311-*]
         cibw_skip: [pp*]
         exclude:
         - os: ubuntu-latest
@@ -44,7 +44,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: wheelhouse-${{ matrix.os }}-${{ matrix.cibw_archs }}-${{ matrix.cibw_build }}
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
 
   build_source:
@@ -69,8 +69,8 @@ jobs:
 
     - uses: actions/upload-artifact@v4
       with:
-        name: sdist
-        path: ./dist/*.tar.gz
+        name: cibw-sdist
+        path: dist/*.tar.gz
 
   publish:
     name: Publish to PyPI
@@ -81,17 +81,26 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Download sdist artifacts to dist/
-      uses: actions/download-artifact@v4.1.7
-      with:
-        name: sdist
-        path: dist/
-
-    - name: Download wheelhouse artifacts to dist/
-      uses: actions/download-artifact@v4.1.7
+    steps:
+    - name: Download sdist and wheelhouse artifacts to dist/
+      uses: actions/download-artifact@v4
       with:
-        name: wheelhouse
-        path: dist/
+        # unpacks all CIBW artifacts into dist/
+        pattern: cibw-*
+        path: dist
+        merge-multiple: true
+
+#    - name: Download sdist artifacts to dist/
+#      uses: actions/download-artifact@v4
+#      with:
+#        name: sdist
+#        path: dist/
+
+#    - name: Download wheelhouse artifacts to dist/
+#      uses: actions/download-artifact@v4
+#      with:
+#        name: wheelhouse
+#        path: dist/
 
     - name: Publish package to PyPI
       # All files in dist/ are published