diff --git a/.github/actions/cleanup-and-coverage/action.yaml b/.github/actions/cleanup-and-coverage/action.yaml
index 8af4310092..f783b9518d 100644
--- a/.github/actions/cleanup-and-coverage/action.yaml
+++ b/.github/actions/cleanup-and-coverage/action.yaml
@@ -9,6 +9,10 @@ inputs:
   codecov-token:
     description: 'Codecov token for uploading reports'
     required: true
+  job-name:
+    description: 'Used to locate coverage dir (/tmp/coverage/<job-name>); pass matrix.job-name for matrix jobs.'
+    required: false
+    default: '${{ github.job }}'
   flags:
     description: 'Flags to identify the coverage report'
     required: false
@@ -35,6 +39,6 @@ runs:
       uses: codecov/codecov-action@v5
       with:
         token: ${{ inputs.codecov-token }}
-        directory: /tmp/coverage/${{ github.job }}
+        directory: /tmp/coverage/${{ inputs.job-name }}
         flags: ${{ inputs.flags }}
       if: ${{ !cancelled() }}
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 9cce05736c..7b6a49052c 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -472,6 +472,7 @@ jobs:
       uses: ./.github/actions/cleanup-and-coverage
       with:
         codecov-token: ${{ secrets.CODECOV_TOKEN }}
+        job-name: ${{ matrix.job-name }}
         flags: ${{ matrix.job-name }}
       if: always()
     - name: Upload test results to Codecov
@@ -513,7 +514,7 @@ jobs:
       S3DATA: scality
       S3METADATA: scality
       S3VAULT: scality
-      CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }}
+      CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }}-testcoverage
       MPU_TESTING: "yes"
       DEFAULT_BUCKET_KEY_FORMAT: ${{ matrix.vformat }}
       ENABLE_NULL_VERSION_COMPAT_MODE: ${{ matrix.enable-null-compat }}
@@ -602,6 +603,7 @@ jobs:
       uses: ./.github/actions/cleanup-and-coverage
       with:
         codecov-token: ${{ secrets.CODECOV_TOKEN }}
+        job-name: ${{ matrix.job-name }}
         flags: ${{ matrix.job-name }}
       if: always()
     - name: Upload test results to Codecov