diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index e129a8d..6d8321f 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -104,7 +104,7 @@ jobs:
             tox_env: 'py38-cython-nocov'
             cibw_arch: 'x86_64'
             cibw_build: 'cp38-*manylinux*'
-            artifact: 'ubuntu-x86_64-manylinux'
+            artifact: 'ubuntu-cp38-x86_64-manylinux'
             os: 'ubuntu-latest'
           - name: 'py38-cython-nocov (ubuntu/x86_64/musllinux)'
             python: '3.8'
@@ -113,7 +113,7 @@ jobs:
             tox_env: 'py38-cython-nocov'
             cibw_arch: 'x86_64'
             cibw_build: 'cp38-*musllinux*'
-            artifact: 'ubuntu-x86_64-musllinux'
+            artifact: 'ubuntu-cp38-x86_64-musllinux'
             os: 'ubuntu-latest'
           - name: 'py38-cython-nocov (ubuntu/aarch64/manylinux)'
             python: '3.8'
@@ -122,7 +122,7 @@ jobs:
             tox_env: 'py38-cython-nocov'
             cibw_arch: 'aarch64'
             cibw_build: 'cp38-*manylinux*'
-            artifact: 'ubuntu-aarch64-manylinux'
+            artifact: 'ubuntu-cp38-aarch64-manylinux'
             os: 'ubuntu-latest'
           - name: 'py38-cython-nocov (ubuntu/aarch64/musllinux)'
             python: '3.8'
@@ -131,7 +131,7 @@ jobs:
             tox_env: 'py38-cython-nocov'
             cibw_arch: 'aarch64'
             cibw_build: 'cp38-*musllinux*'
-            artifact: 'ubuntu-aarch64-musllinux'
+            artifact: 'ubuntu-cp38-aarch64-musllinux'
             os: 'ubuntu-latest'
           - name: 'py38-cython-nocov (windows/AMD64)'
             python: '3.8'
@@ -140,7 +140,7 @@ jobs:
             tox_env: 'py38-cython-nocov'
             cibw_arch: 'AMD64'
             cibw_build: 'cp38-*'
-            artifact: 'windows-AMD64-default'
+            artifact: 'windows-cp38-AMD64-default'
             os: 'windows-latest'
           - name: 'py38-cython-nocov (windows/x86)'
             python: '3.8'
@@ -149,7 +149,7 @@ jobs:
             tox_env: 'py38-cython-nocov'
             cibw_arch: 'x86'
             cibw_build: 'cp38-*'
-            artifact: 'windows-x86-default'
+            artifact: 'windows-cp38-x86-default'
             os: 'windows-latest'
           - name: 'py38-cython-nocov (macos/arm64)'
             python: '3.8'
@@ -158,7 +158,7 @@ jobs:
             tox_env: 'py38-cython-nocov'
             cibw_arch: 'arm64'
             cibw_build: 'cp38-*'
-            artifact: 'macos-arm64-default'
+            artifact: 'macos-cp38-arm64-default'
             os: 'macos-latest'
           - name: 'py39-pure-cover (ubuntu/x86_64)'
             python: '3.9'
@@ -245,7 +245,7 @@ jobs:
             tox_env: 'py39-cython-nocov'
             cibw_arch: 'x86_64'
             cibw_build: 'cp39-*manylinux*'
-            artifact: 'ubuntu-x86_64-manylinux'
+            artifact: 'ubuntu-cp39-x86_64-manylinux'
             os: 'ubuntu-latest'
           - name: 'py39-cython-nocov (ubuntu/x86_64/musllinux)'
             python: '3.9'
@@ -254,7 +254,7 @@ jobs:
             tox_env: 'py39-cython-nocov'
             cibw_arch: 'x86_64'
             cibw_build: 'cp39-*musllinux*'
-            artifact: 'ubuntu-x86_64-musllinux'
+            artifact: 'ubuntu-cp39-x86_64-musllinux'
             os: 'ubuntu-latest'
           - name: 'py39-cython-nocov (ubuntu/aarch64/manylinux)'
             python: '3.9'
@@ -263,7 +263,7 @@ jobs:
             tox_env: 'py39-cython-nocov'
             cibw_arch: 'aarch64'
             cibw_build: 'cp39-*manylinux*'
-            artifact: 'ubuntu-aarch64-manylinux'
+            artifact: 'ubuntu-cp39-aarch64-manylinux'
             os: 'ubuntu-latest'
           - name: 'py39-cython-nocov (ubuntu/aarch64/musllinux)'
             python: '3.9'
@@ -272,7 +272,7 @@ jobs:
             tox_env: 'py39-cython-nocov'
             cibw_arch: 'aarch64'
             cibw_build: 'cp39-*musllinux*'
-            artifact: 'ubuntu-aarch64-musllinux'
+            artifact: 'ubuntu-cp39-aarch64-musllinux'
             os: 'ubuntu-latest'
           - name: 'py39-cython-nocov (windows/AMD64)'
             python: '3.9'
@@ -281,7 +281,7 @@ jobs:
             tox_env: 'py39-cython-nocov'
             cibw_arch: 'AMD64'
             cibw_build: 'cp39-*'
-            artifact: 'windows-AMD64-default'
+            artifact: 'windows-cp39-AMD64-default'
             os: 'windows-latest'
           - name: 'py39-cython-nocov (windows/x86)'
             python: '3.9'
@@ -290,7 +290,7 @@ jobs:
             tox_env: 'py39-cython-nocov'
             cibw_arch: 'x86'
             cibw_build: 'cp39-*'
-            artifact: 'windows-x86-default'
+            artifact: 'windows-cp39-x86-default'
             os: 'windows-latest'
           - name: 'py39-cython-nocov (macos/arm64)'
             python: '3.9'
@@ -299,7 +299,7 @@ jobs:
             tox_env: 'py39-cython-nocov'
             cibw_arch: 'arm64'
             cibw_build: 'cp39-*'
-            artifact: 'macos-arm64-default'
+            artifact: 'macos-cp39-arm64-default'
             os: 'macos-latest'
           - name: 'py310-pure-cover (ubuntu/x86_64)'
             python: '3.10'
@@ -386,7 +386,7 @@ jobs:
             tox_env: 'py310-cython-nocov'
             cibw_arch: 'x86_64'
             cibw_build: 'cp310-*manylinux*'
-            artifact: 'ubuntu-x86_64-manylinux'
+            artifact: 'ubuntu-cp310-x86_64-manylinux'
             os: 'ubuntu-latest'
           - name: 'py310-cython-nocov (ubuntu/x86_64/musllinux)'
             python: '3.10'
@@ -395,7 +395,7 @@ jobs:
             tox_env: 'py310-cython-nocov'
             cibw_arch: 'x86_64'
             cibw_build: 'cp310-*musllinux*'
-            artifact: 'ubuntu-x86_64-musllinux'
+            artifact: 'ubuntu-cp310-x86_64-musllinux'
             os: 'ubuntu-latest'
           - name: 'py310-cython-nocov (ubuntu/aarch64/manylinux)'
             python: '3.10'
@@ -404,7 +404,7 @@ jobs:
             tox_env: 'py310-cython-nocov'
             cibw_arch: 'aarch64'
             cibw_build: 'cp310-*manylinux*'
-            artifact: 'ubuntu-aarch64-manylinux'
+            artifact: 'ubuntu-cp310-aarch64-manylinux'
             os: 'ubuntu-latest'
           - name: 'py310-cython-nocov (ubuntu/aarch64/musllinux)'
             python: '3.10'
@@ -413,7 +413,7 @@ jobs:
             tox_env: 'py310-cython-nocov'
             cibw_arch: 'aarch64'
             cibw_build: 'cp310-*musllinux*'
-            artifact: 'ubuntu-aarch64-musllinux'
+            artifact: 'ubuntu-cp310-aarch64-musllinux'
             os: 'ubuntu-latest'
           - name: 'py310-cython-nocov (windows/AMD64)'
             python: '3.10'
@@ -422,7 +422,7 @@ jobs:
             tox_env: 'py310-cython-nocov'
             cibw_arch: 'AMD64'
             cibw_build: 'cp310-*'
-            artifact: 'windows-AMD64-default'
+            artifact: 'windows-cp310-AMD64-default'
             os: 'windows-latest'
           - name: 'py310-cython-nocov (windows/x86)'
             python: '3.10'
@@ -431,7 +431,7 @@ jobs:
             tox_env: 'py310-cython-nocov'
             cibw_arch: 'x86'
             cibw_build: 'cp310-*'
-            artifact: 'windows-x86-default'
+            artifact: 'windows-cp310-x86-default'
             os: 'windows-latest'
           - name: 'py310-cython-nocov (macos/arm64)'
             python: '3.10'
@@ -440,7 +440,7 @@ jobs:
             tox_env: 'py310-cython-nocov'
             cibw_arch: 'arm64'
             cibw_build: 'cp310-*'
-            artifact: 'macos-arm64-default'
+            artifact: 'macos-cp310-arm64-default'
             os: 'macos-latest'
           - name: 'py311-pure-cover (ubuntu/x86_64)'
             python: '3.11'
@@ -527,7 +527,7 @@ jobs:
             tox_env: 'py311-cython-nocov'
             cibw_arch: 'x86_64'
             cibw_build: 'cp311-*manylinux*'
-            artifact: 'ubuntu-x86_64-manylinux'
+            artifact: 'ubuntu-cp311-x86_64-manylinux'
             os: 'ubuntu-latest'
           - name: 'py311-cython-nocov (ubuntu/x86_64/musllinux)'
             python: '3.11'
@@ -536,7 +536,7 @@ jobs:
             tox_env: 'py311-cython-nocov'
             cibw_arch: 'x86_64'
             cibw_build: 'cp311-*musllinux*'
-            artifact: 'ubuntu-x86_64-musllinux'
+            artifact: 'ubuntu-cp311-x86_64-musllinux'
             os: 'ubuntu-latest'
           - name: 'py311-cython-nocov (ubuntu/aarch64/manylinux)'
             python: '3.11'
@@ -545,7 +545,7 @@ jobs:
             tox_env: 'py311-cython-nocov'
             cibw_arch: 'aarch64'
             cibw_build: 'cp311-*manylinux*'
-            artifact: 'ubuntu-aarch64-manylinux'
+            artifact: 'ubuntu-cp311-aarch64-manylinux'
             os: 'ubuntu-latest'
           - name: 'py311-cython-nocov (ubuntu/aarch64/musllinux)'
             python: '3.11'
@@ -554,7 +554,7 @@ jobs:
             tox_env: 'py311-cython-nocov'
             cibw_arch: 'aarch64'
             cibw_build: 'cp311-*musllinux*'
-            artifact: 'ubuntu-aarch64-musllinux'
+            artifact: 'ubuntu-cp311-aarch64-musllinux'
             os: 'ubuntu-latest'
           - name: 'py311-cython-nocov (windows/AMD64)'
             python: '3.11'
@@ -563,7 +563,7 @@ jobs:
             tox_env: 'py311-cython-nocov'
             cibw_arch: 'AMD64'
             cibw_build: 'cp311-*'
-            artifact: 'windows-AMD64-default'
+            artifact: 'windows-cp311-AMD64-default'
             os: 'windows-latest'
           - name: 'py311-cython-nocov (windows/x86)'
             python: '3.11'
@@ -572,7 +572,7 @@ jobs:
             tox_env: 'py311-cython-nocov'
             cibw_arch: 'x86'
             cibw_build: 'cp311-*'
-            artifact: 'windows-x86-default'
+            artifact: 'windows-cp311-x86-default'
             os: 'windows-latest'
           - name: 'py311-cython-nocov (macos/arm64)'
             python: '3.11'
@@ -581,7 +581,7 @@ jobs:
             tox_env: 'py311-cython-nocov'
             cibw_arch: 'arm64'
             cibw_build: 'cp311-*'
-            artifact: 'macos-arm64-default'
+            artifact: 'macos-cp311-arm64-default'
             os: 'macos-latest'
           - name: 'py312-pure-cover (ubuntu/x86_64)'
             python: '3.12'
@@ -668,7 +668,7 @@ jobs:
             tox_env: 'py312-cython-nocov'
             cibw_arch: 'x86_64'
             cibw_build: 'cp312-*manylinux*'
-            artifact: 'ubuntu-x86_64-manylinux'
+            artifact: 'ubuntu-cp312-x86_64-manylinux'
             os: 'ubuntu-latest'
           - name: 'py312-cython-nocov (ubuntu/x86_64/musllinux)'
             python: '3.12'
@@ -677,7 +677,7 @@ jobs:
             tox_env: 'py312-cython-nocov'
             cibw_arch: 'x86_64'
             cibw_build: 'cp312-*musllinux*'
-            artifact: 'ubuntu-x86_64-musllinux'
+            artifact: 'ubuntu-cp312-x86_64-musllinux'
             os: 'ubuntu-latest'
           - name: 'py312-cython-nocov (ubuntu/aarch64/manylinux)'
             python: '3.12'
@@ -686,7 +686,7 @@ jobs:
             tox_env: 'py312-cython-nocov'
             cibw_arch: 'aarch64'
             cibw_build: 'cp312-*manylinux*'
-            artifact: 'ubuntu-aarch64-manylinux'
+            artifact: 'ubuntu-cp312-aarch64-manylinux'
             os: 'ubuntu-latest'
           - name: 'py312-cython-nocov (ubuntu/aarch64/musllinux)'
             python: '3.12'
@@ -695,7 +695,7 @@ jobs:
             tox_env: 'py312-cython-nocov'
             cibw_arch: 'aarch64'
             cibw_build: 'cp312-*musllinux*'
-            artifact: 'ubuntu-aarch64-musllinux'
+            artifact: 'ubuntu-cp312-aarch64-musllinux'
             os: 'ubuntu-latest'
           - name: 'py312-cython-nocov (windows/AMD64)'
             python: '3.12'
@@ -704,7 +704,7 @@ jobs:
             tox_env: 'py312-cython-nocov'
             cibw_arch: 'AMD64'
             cibw_build: 'cp312-*'
-            artifact: 'windows-AMD64-default'
+            artifact: 'windows-cp312-AMD64-default'
             os: 'windows-latest'
           - name: 'py312-cython-nocov (windows/x86)'
             python: '3.12'
@@ -713,7 +713,7 @@ jobs:
             tox_env: 'py312-cython-nocov'
             cibw_arch: 'x86'
             cibw_build: 'cp312-*'
-            artifact: 'windows-x86-default'
+            artifact: 'windows-cp312-x86-default'
             os: 'windows-latest'
           - name: 'py312-cython-nocov (macos/arm64)'
             python: '3.12'
@@ -722,7 +722,7 @@ jobs:
             tox_env: 'py312-cython-nocov'
             cibw_arch: 'arm64'
             cibw_build: 'cp312-*'
-            artifact: 'macos-arm64-default'
+            artifact: 'macos-cp312-arm64-default'
             os: 'macos-latest'
           - name: 'pypy38-pure-cover (ubuntu/x86_64)'
             python: 'pypy-3.8'
diff --git a/ci/templates/.github/workflows/github-actions.yml b/ci/templates/.github/workflows/github-actions.yml
index 9a4de92..9a17f06 100644
--- a/ci/templates/.github/workflows/github-actions.yml
+++ b/ci/templates/.github/workflows/github-actions.yml
@@ -53,7 +53,7 @@ jobs:
             cibw_arch: '{{ cibw_arch }}'
 {% if env.endswith('cython-nocov') and not prefix.startswith('pypy') %}
             cibw_build: '{{ cpython }}-{{ wheel_arch }}'
-            artifact: '{{ os }}-{{ cibw_arch }}-{{ wheel_arch.strip("*") or "default" }}'
+            artifact: '{{ os }}-{{ cpython }}-{{ cibw_arch }}-{{ wheel_arch.strip("*") or "default" }}'
 {% else %}
             cibw_build: false
 {% endif %}