diff --git a/.github/workflows/coverage_comment.yml b/.github/workflows/coverage_comment.yml
index 42a5b0251f..fc58575836 100644
--- a/.github/workflows/coverage_comment.yml
+++ b/.github/workflows/coverage_comment.yml
@@ -8,6 +8,7 @@ on:
 
 permissions:
   contents: read
+  actions: read
   pull-requests: write
 
 jobs:
@@ -20,16 +21,22 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
-      - name: Download diff coverage report
+      - name: Download coverage artifacts
         uses: actions/download-artifact@v4
         with:
-          name: diff-coverage-report-${{ github.event.workflow_run.pull_requests[0].number }}
+          name: coverage-artifacts
           github-token: ${{ secrets.GITHUB_TOKEN }}
           run-id: ${{ github.event.workflow_run.id }}
 
+      - name: Read PR number
+        id: pr
+        run: |
+          pr_number=$(cat pr_number.txt)
+          echo "number=$pr_number" >> $GITHUB_OUTPUT
+
       - name: Post/update PR comment
         env:
-          PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }}
+          PR_NUMBER: ${{ steps.pr.outputs.number }}
         uses: actions/github-script@v8
         with:
           script: |
diff --git a/.github/workflows/coverage_tests.yml b/.github/workflows/coverage_tests.yml
index af463bb295..89b671b3cb 100644
--- a/.github/workflows/coverage_tests.yml
+++ b/.github/workflows/coverage_tests.yml
@@ -66,10 +66,16 @@ jobs:
             Set-Content -Path diff-cover-report.md -Value 'No coverage data available.'
           }
 
-      - name: Upload diff coverage report
+      - name: Save PR number
+        if: success()
+        run: echo "${{ github.event.pull_request.number }}" > pr_number.txt
+
+      - name: Upload artifacts
         if: success()
         uses: actions/upload-artifact@v4
         with:
-          name: diff-coverage-report-${{ github.event.pull_request.number }}
-          path: diff-cover-report.md
+          name: coverage-artifacts
+          path: |
+            diff-cover-report.md
+            pr_number.txt
           retention-days: 1