diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 368cee3..9958f9a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,8 +21,10 @@ jobs:
     - name: Upload wheel as artifact
       uses: actions/upload-artifact@v4
       with:
-        name: socketsocketcan-${{ github.sha }}
+        name: socketsocketcan-${{ matrix.docker_images }}-${{ github.sha }}
         path: dist
+        retention-days: 1
+        if-no-files-found: error
   amd64:
     name: Build amd64 wheels
     runs-on: ubuntu-24.04
@@ -52,8 +54,10 @@ jobs:
     - name: Upload wheel as artifact
       uses: actions/upload-artifact@v4
       with:
-        name: socketsocketcan-${{ github.sha }}
+        name: socketsocketcan-x86-${{ matrix.python-version }}-${{ github.sha }}
         path: dist
+        retention-days: 1
+        if-no-files-found: error
   sdist:
     name: Build sdist
     runs-on: ubuntu-24.04
@@ -71,8 +75,10 @@ jobs:
     - name: Upload sdist as artifact
       uses: actions/upload-artifact@v4
       with:
-        name: socketsocketcan-${{ github.sha }}
+        name: socketsocketcan-sdist-3.10-${{ github.sha }}
         path: dist
+        retention-days: 1
+        if-no-files-found: error
   release:
     needs: [armv7l, amd64, sdist]
     name: Release
@@ -85,8 +91,9 @@ jobs:
         python-version: '3.10'
     - uses: actions/download-artifact@v4
       with:
-        name: socketsocketcan-${{ github.sha }}
+        pattern: socketsocketcan-*-*-${{ github.sha }}
         path: socketsocketcan
+        merge-multiple: true
     - name: Publish to private PyPI server
       if: startsWith(github.ref, 'refs/tags/')
       run: |