diff --git a/.github/workflows/test-and-upload-coverage.yml b/.github/workflows/test-and-upload-coverage.yml
index 5513ec7ad8..d7e25a19d7 100644
--- a/.github/workflows/test-and-upload-coverage.yml
+++ b/.github/workflows/test-and-upload-coverage.yml
@@ -167,7 +167,17 @@ jobs:
         if: ${{ !matrix.detect-changes }}
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.os }}_${{ matrix.client-type }}_${{ matrix.database-type }}_${{ matrix.mutation-type }}
+          # Make sure the name is always unique per job as artifacts are now immutable.
+          # Note Issue: https://github.com/actions/upload-artifact/issues/478
+          # Solve: https://github.com/actions/upload-artifact/issues/478#issuecomment-1885470013
+          name: "coverage\
+            _${{ matrix.os }}\
+            _${{ matrix.client-type }}\
+            _${{ matrix.database-type }}\
+            _${{ matrix.mutation-type }}\
+            _${{ matrix.lens-type }}\
+            _${{ matrix.database-encryption }}\
+          "
           path: coverage.txt
           if-no-files-found: error
           retention-days: 7
@@ -191,6 +201,10 @@ jobs:
       - name: Download coverage reports
         uses: actions/download-artifact@v4
         with:
+          pattern: coverage_*
+          # Note: https://github.com/actions/download-artifact/blob/main/docs/MIGRATION.md
+          # Solve: https://github.com/actions/upload-artifact/issues/478#issuecomment-1885470013
+          merge-multiple: true
           path: coverage_reports
 
       - name: Upload coverage to Codecov
@@ -198,6 +212,7 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           name: defradb-codecov
+          files: coverage_reports/**/coverage.txt
           flags: all-tests
           os: 'linux'
           fail_ci_if_error: true