diff --git a/.github/actions/upload_coverage/action.yml b/.github/actions/upload_coverage/action.yml
index a992d7625..e4cc93b47 100644
--- a/.github/actions/upload_coverage/action.yml
+++ b/.github/actions/upload_coverage/action.yml
@@ -24,4 +24,4 @@ runs:
   - uses: actions/upload-artifact@v4
     with:
       path: "/tmp/codeclimate/*.json"
-      name: codeclimate
+      name: codeclimate-${{ inputs.flags }}
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 9557082be..6a02945a0 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -401,8 +401,9 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: "codeclimate"
-          path: "codeclimate"
+          path: codeclimate
+          pattern: codeclimate-*
+          merge-multiple: true
       - name: Upload coverage results to Code Climate
         run: |-
           cc-test-reporter sum-coverage codeclimate/*.json -o total.json