diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index f3285fbf..bbd16533 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -18,7 +18,7 @@ concurrency:
 jobs:
   build-test:
     runs-on: ${{ matrix.conf.os }}
-    name: ${{ matrix.conf.os }}-${{ matrix.conf.target }}-${{ matrix.python-version }}-${{ matrix.conf.python-architecture }}-${{ matrix.conf.manylinux }}
+    name: ${{ matrix.conf.os }}-${{ matrix.python-version }}-${{ matrix.conf.target-triple }}-${{ matrix.conf.target }}
     strategy:
       fail-fast: ${{ !( startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/tags/') ) }}
       matrix:
@@ -54,62 +54,38 @@ jobs:
           # Windows x86_64 pypy
           - conf: { os: windows-latest, target: x86_64,  target-triple: x86_64-pc-windows-msvc }
             python-version: pypy3.9
-          - conf: { os: windows-latest, target: x86_64,  target-triple: x86_64-pc-windows-msvc }
-            python-version: pypy3.9
-          - conf: { os: windows-latest, target: x86_64,  target-triple: x86_64-pc-windows-msvc }
-            python-version: pypy3.10
           - conf: { os: windows-latest, target: x86_64,  target-triple: x86_64-pc-windows-msvc }
             python-version: pypy3.10
 
           # Linux x86_64 pypy
-          - conf: { os: ubuntu-latest, target: x86_64,  target-triple: x86_64-unknown-linux-gnu, manylinux: auto }
-            python-version: pypy3.9
           - conf: { os: ubuntu-latest, target: x86_64,  target-triple: x86_64-unknown-linux-gnu, manylinux: auto }
             python-version: pypy3.9
           - conf: { os: ubuntu-latest, target: x86_64,  target-triple: x86_64-unknown-linux-gnu, manylinux: auto }
             python-version: pypy3.10
-          - conf: { os: ubuntu-latest, target: x86_64,  target-triple: x86_64-unknown-linux-gnu, manylinux: auto }
-            python-version: pypy3.10
 
           # Linux arm pypy
-          - conf: { os: ubuntu-latest, target: aarch64,  target-triple: aarch64-unknown-linux-gnu, manylinux: auto }
-            python-version: pypy3.9
           - conf: { os: ubuntu-latest, target: aarch64,  target-triple: aarch64-unknown-linux-gnu, manylinux: auto }
             python-version: pypy3.9
           - conf: { os: ubuntu-latest, target: aarch64,  target-triple: aarch64-unknown-linux-gnu, manylinux: auto }
             python-version: pypy3.10
-          - conf: { os: ubuntu-latest, target: aarch64,  target-triple: aarch64-unknown-linux-gnu, manylinux: auto }
-            python-version: pypy3.10
 
           # OSX x86_64 pypy
           - conf: { os: macos-13, target: x86_64,  target-triple: x86_64-apple-darwin }
             python-version: pypy3.9
-          - conf: { os: macos-13, target: x86_64,  target-triple: x86_64-apple-darwin }
-            python-version: pypy3.9
-          - conf: { os: macos-13, target: x86_64,  target-triple: x86_64-apple-darwin }
-            python-version: pypy3.10
           - conf: { os: macos-13, target: x86_64,  target-triple: x86_64-apple-darwin }
             python-version: pypy3.10
 
           # OSX universal2 pypy
           - conf: { os: macos-13, target: universal2,  target-triple: x86_64-apple-darwin }
             python-version: pypy3.9
-          - conf: { os: macos-13, target: universal2,  target-triple: x86_64-apple-darwin }
-            python-version: pypy3.9
-          - conf: { os: macos-13, target: universal2,  target-triple: x86_64-apple-darwin }
-            python-version: pypy3.10
           - conf: { os: macos-13, target: universal2,  target-triple: x86_64-apple-darwin }
             python-version: pypy3.10
 
           # OSX arm pypy
-          - conf: { os: macos-13, target: aarch64,  target-triple: aarch64-apple-darwin }
-            python-version: pypy3.9
           - conf: { os: macos-13, target: aarch64,  target-triple: aarch64-apple-darwin }
             python-version: pypy3.9
           - conf: { os: macos-13, target: aarch64,  target-triple: aarch64-apple-darwin }
             python-version: pypy3.10
-          - conf: { os: macos-13, target: aarch64,  target-triple: aarch64-apple-darwin }
-            python-version: pypy3.10
           
     steps:
       - uses: actions/checkout@v4
@@ -253,10 +229,10 @@ jobs:
             venv/bin/python -c 'import cramjam'
 
       - name: Upload wheels
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ ( startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/tags/') ) }}
         with:
-          name: dist
+          name: ${{ matrix.conf.os }}-${{ matrix.python-version }}-${{ matrix.conf.target-triple }}-${{ matrix.conf.target }}
           path: dist
 
   build-sdist:
@@ -272,16 +248,14 @@ jobs:
           python -m pip install build
           python -m build --sdist -o ./dist
       - name: Upload sdists
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: dist
+          name: sdist
           path: dist
 
   pypi-publish:
     name: Upload release to PyPI
     if: startsWith(github.ref, 'refs/tags/')
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     needs: [build-test, build-sdist]
     environment:
@@ -290,9 +264,10 @@ jobs:
     permissions:
       id-token: write
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
-        name: dist
+        path: .
+        merge-multiple: true
     - name: List artifacts
       run: ls -lhs
     - name: Publish package distributions to PyPI
@@ -309,9 +284,10 @@ jobs:
     needs: [build-test, build-sdist]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
-        name: dist
+        path: .
+        merge-multiple: true
     - name: List artifacts
       run: ls -lhs
     - name: Upload to GitHub