diff --git a/.github/workflows/build-testpypi.yml b/.github/workflows/build-testpypi.yml
index 72ad92fa..ee01658e 100644
--- a/.github/workflows/build-testpypi.yml
+++ b/.github/workflows/build-testpypi.yml
@@ -9,6 +9,7 @@ jobs:
     strategy:
       matrix:
        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+       pyver: [cp39, cp310, cp311, cp312, cp313]
 
     steps:
       - uses: actions/checkout@v4
@@ -17,13 +18,14 @@ jobs:
         uses: pypa/cibuildwheel@v2.21
         env:
           CIBW_SKIP: pp*
+          CIBW_BUILD: ${{ matrix.pyver }}-*
           CIBW_BEFORE_BUILD: python -c "import shutil ; shutil.copyfile('tools/setup-pypi.cfg','setup.apsw')"
           CIBW_TEST_COMMAND: python -m apsw.tests -v
           APSW_HEAVY_DURATION: 2
 
       - uses: actions/upload-artifact@v4
         with:
-          name: dist-${{ matrix.os }}
+          name: dist-${{ matrix.os }}-${{ matrix.pyver }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
 
 
@@ -32,6 +34,7 @@ jobs:
       strategy:
         matrix:
           arch: [aarch64]
+          pyver: [cp39, cp310, cp311, cp312, cp313]
 
       steps:
         - uses: actions/checkout@v4
@@ -45,6 +48,7 @@ jobs:
           uses: pypa/cibuildwheel@v2.21
           env:
             CIBW_SKIP: pp*
+            CIBW_BUILD: ${{ matrix.pyver }}-*
             CIBW_ARCHS_LINUX: ${{ matrix.arch }}
             CIBW_BEFORE_BUILD: python -c "import shutil ; shutil.copyfile('tools/setup-pypi.cfg','setup.apsw')"
             CIBW_TEST_COMMAND: python -m apsw.tests -v
@@ -52,7 +56,7 @@ jobs:
 
         - uses: actions/upload-artifact@v4
           with:
-            name: dist-qemu-${{ matrix.arch }}
+            name: dist-qemu-${{ matrix.arch }}-${{ matrix.pyver }}-${{ strategy.job-index }}
             path: ./wheelhouse/*.whl