diff --git a/.github/workflows/test-and-upload-coverage.yml b/.github/workflows/test-and-upload-coverage.yml
index d92ae01cce..de7c9df848 100644
--- a/.github/workflows/test-and-upload-coverage.yml
+++ b/.github/workflows/test-and-upload-coverage.yml
@@ -95,18 +95,23 @@ jobs:
         if: ${{ !matrix.detect-changes }}
         uses: actions/upload-artifact@v3
         with:
-          name: ${{ matrix.client-type }}_${{ matrix.database-type }}_${{ matrix.mutation-type }}
+          name: ${{ matrix.os }}_${{ matrix.client-type }}_${{ matrix.database-type }}_${{ matrix.mutation-type }}
           path: coverage.txt
           if-no-files-found: error
-          retention-days: 1
+          retention-days: 7
 
   upload-coverage:
     name: Upload test code coverage job
 
-    runs-on: ubuntu-latest
-
     needs: run-tests
 
+    # Important to know: 
+    # - We didn't use `if: always()` here, so this job doesn't run if we manually canceled.
+    # - `if: success()` is always implied unless `always()` or `failure()` is specified.
+    if: success() || failure()
+
+    runs-on: ubuntu-latest
+
     steps:
       - name: Checkout code into the directory
         uses: actions/checkout@v3