diff --git a/.github/workflows/python-test-coverage.yml b/.github/workflows/python-test-coverage.yml
index 1caef440be85..326e14533d8b 100644
--- a/.github/workflows/python-test-coverage.yml
+++ b/.github/workflows/python-test-coverage.yml
@@ -35,7 +35,7 @@ jobs:
           allowed-conclusions: success
       - uses: actions/checkout@v4
       - name: Setup filename variables
-        run: echo "FILE_ID=${{ github.run_id }}-${{ matrix.os }}-${{ matrix.python-version }}" >> $GITHUB_ENV
+        run: echo "FILE_ID=${{ github.event.number }}-${{ matrix.os }}-${{ matrix.python-version }}" >> $GITHUB_ENV
       - name: Download coverage
         continue-on-error: true
         uses: dawidd6/action-download-artifact@v3
@@ -60,12 +60,12 @@ jobs:
         uses: MishaKav/pytest-coverage-comment@main
         with:
           github-token: ${{ secrets.GH_ACTIONS_PR_WRITE }}
-          pytest-coverage-path: python-coverage-${{ matrix.os }}-${{ matrix.python-version }}.txt
+          pytest-coverage-path: python-coverage-${{ env.FILE_ID }}.txt
           coverage-path-prefix: "python/"
           title: "Python ${{ matrix.python-version }} Test Coverage Report"
           badge-title: "Py${{ matrix.python-version }} Test Coverage"
           report-only-changed-files: true
           junitxml-title: "Python ${{ matrix.python-version }} Unit Test Overview"
-          junitxml-path: pytest-${{ matrix.os }}-${{ matrix.python-version }}.xml
+          junitxml-path: pytest-${{ env.FILE_ID }}.xml
           default-branch: "main"
           unique-id-for-comment: python-${{ matrix.python-version }}
diff --git a/.github/workflows/python-unit-tests.yml b/.github/workflows/python-unit-tests.yml
index d3afc9e7a96e..8e34ad0e9b5f 100644
--- a/.github/workflows/python-unit-tests.yml
+++ b/.github/workflows/python-unit-tests.yml
@@ -29,7 +29,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup filename variables
-        run: echo "FILE_ID=${{ github.run_id }}-${{ matrix.os }}-${{ matrix.python-version }}" >> $GITHUB_ENV
+        run: echo "FILE_ID=${{ github.event.number }}-${{ matrix.os }}-${{ matrix.python-version }}" >> $GITHUB_ENV
       - name: Install poetry
         run: pipx install poetry
       - name: Set up Python ${{ matrix.python-version }}