diff --git a/.github/workflows/manual_triggerd_build_and_upload_to_test_pypi.yml b/.github/workflows/manual_triggerd_build_and_upload_to_test_pypi.yml
index 3fb13cf..e380ecb 100644
--- a/.github/workflows/manual_triggerd_build_and_upload_to_test_pypi.yml
+++ b/.github/workflows/manual_triggerd_build_and_upload_to_test_pypi.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-2019, macos-12]
+        os: [ubuntu-22.04, windows-2022, macos-11]
 
     steps:
       - uses: actions/checkout@v4
@@ -22,6 +22,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
@@ -37,6 +38,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
+          name: cibw-sdist
           path: ./dist/*.tar.gz
 
   upload_pypi:
@@ -46,8 +48,10 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: artifact
+          # unpacks all CIBW artifacts into dist/
+          pattern: cibw-*
           path: dist
+          merge-multiple: true
 
       - uses: pypa/gh-action-pypi-publish@v1.8.11
         with:
diff --git a/.github/workflows/release_triggerd_build_and_upload_to_pypi.yml b/.github/workflows/release_triggerd_build_and_upload_to_pypi.yml
index c2d396a..46a1654 100644
--- a/.github/workflows/release_triggerd_build_and_upload_to_pypi.yml
+++ b/.github/workflows/release_triggerd_build_and_upload_to_pypi.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-2019, macos-12]
+        os: [ubuntu-22.04, windows-2022, macos-11]
 
     steps:
       - uses: actions/checkout@v4
@@ -24,6 +24,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
@@ -39,6 +40,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
+          name: cibw-sdist
           path: ./dist/*.tar.gz
 
   upload_pypi:
@@ -48,8 +50,10 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: artifact
+          # unpacks all CIBW artifacts into dist/
+          pattern: cibw-*
           path: dist
+          merge-multiple: true
 
       - uses: pypa/gh-action-pypi-publish@v1.8.11
         with: