diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml
index 8a971a7a..d8dfb270 100644
--- a/.github/workflows/test-and-deploy.yml
+++ b/.github/workflows/test-and-deploy.yml
@@ -58,14 +58,14 @@ jobs:
         uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: test-screenshots
+          name: test-screenshots-${{ matrix.shardIndex }}
           path: test/screenshots
           retention-days: 14
       - name: Upload test report artifact
         uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: test-blob-reports
+          name: test-blob-reports-${{ matrix.shardIndex }}
           path: test/report/
           retention-days: 14
   test-report:
@@ -84,13 +84,15 @@ jobs:
       - name: Download test screenshots artifact
         uses: actions/download-artifact@master
         with:
-          name: test-screenshots
+          pattern: test-screenshots-*
           path: test/screenshots
+          merge-multiple: true
       - name: Download test report artifact
         uses: actions/download-artifact@master
         with:
-          name: test-blob-reports
+          pattern: test-blob-reports-*
           path: test/blob-reports
+          merge-multiple: true
       - name: Merge blob reports into HTML report
         run: npx playwright merge-reports --config playwright.merge-reports.config.ts ./test/blob-reports
       - name: Upload Argos screenshots