diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml
index 3ecc4e19..de666dce 100644
--- a/.github/workflows/default.yaml
+++ b/.github/workflows/default.yaml
@@ -203,8 +203,10 @@ jobs:
       - name: Store test results
         uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: test-results-${{ env.GIT_SHA7 }}-${{ env.VERSION_PREFIX }}${{ env.VERSION }}-${{ env.ARCH }}
           path: ${{ github.workspace }}/test-results-*.txt
+          if-no-files-found: error
+          overwrite: true
 
   push:
     name: "Push: ${{ matrix.version }}/multi"
@@ -247,7 +249,8 @@ jobs:
         name: Retrieve test results
         uses: actions/download-artifact@v4
         with:
-          name: test-results
+          pattern: test-results-${{ env.GIT_SHA7 }}-*
+          merge-multiple: true
       -
         # Generate persistent tags (edge, stable, release)
         name: Docker image tags