diff --git a/.github/workflows/pr-test-lint.yml b/.github/workflows/pr-test-lint.yml
index 88c618d72f..c1a7231926 100644
--- a/.github/workflows/pr-test-lint.yml
+++ b/.github/workflows/pr-test-lint.yml
@@ -100,6 +100,16 @@ jobs:
         with:
           name: test-results
           path: report.xml
+          
+  event_file:
+    name: "Store event file"
+    runs-on: ubuntu-latest
+    steps:
+    - name: Upload
+      uses: actions/upload-artifact@v4
+      with:
+        name: Event File
+        path: ${{ github.event_path }}
 
   license-check:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/test-report.yml b/.github/workflows/test-report.yml
index 7c54b7728d..da6bab93c0 100644
--- a/.github/workflows/test-report.yml
+++ b/.github/workflows/test-report.yml
@@ -8,14 +8,22 @@ on:
 jobs:
   report:
     permissions:
-      actions: read  # Required to read the artifact
-      contents: read # Required to read the source
-      checks: write  # Required to write the results
+      actions: read        # Required to read the artifact
+      contents: read       # Required to read the source
+      checks: write        # Required to write the results
+      pull-requests: write # Required to write comments
     runs-on: ubuntu-latest
     steps:
-    - uses: dorny/test-reporter@v1
+    - name: Download and Extract Artifacts
+      uses: dawidd6/action-download-artifact@v3
       with:
-        artifact: test-results
-        name: Report test results
-        path: '*.xml'                     # Path to test results (inside artifact .zip)
-        reporter: java-junit              # Format of test results
+        run_id: ${{ github.event.workflow_run.id }}
+        path: artifacts
+
+    - name: Publish Test Results
+      uses: EnricoMi/publish-unit-test-result-action@v2
+      with:
+        commit: ${{ github.event.workflow_run.head_sha }}
+        event_file: artifacts/Store event file/event.json
+        event_name: ${{ github.event.workflow_run.event }}
+        files: "artifacts/**/*.xml"