diff --git a/.github/actions/archive-artifacts/action.yaml b/.github/actions/archive-artifacts/action.yaml
index 67548aa490..731ebee0d2 100644
--- a/.github/actions/archive-artifacts/action.yaml
+++ b/.github/actions/archive-artifacts/action.yaml
@@ -35,10 +35,18 @@ runs:
     - name: Publish test report
       uses: mikepenz/action-junit-report@v4
       with:
-        check_name: ${{ inputs.stage}}
+        annotate_only: true
+        job_summary: false
         report_paths: ${{ inputs.junit-paths }}
       continue-on-error: true
 
+    - name: Upload test reports
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ inputs.stage}}-test-report
+        path: ${{ inputs.junit-paths }}
+        retention-days: 5
+
     - name: Upload results
       if: inputs.trunk_token && job.status != 'cancelled'
       uses: trunk-io/analytics-uploader@v1.4.0
diff --git a/.github/actions/debug-wait/action.yaml b/.github/actions/debug-wait/action.yaml
index 8549d78d51..61a05c903e 100644
--- a/.github/actions/debug-wait/action.yaml
+++ b/.github/actions/debug-wait/action.yaml
@@ -13,4 +13,4 @@ runs:
         tmate-server-port: ${{ env.TMATE_SERVER_PORT }}
         tmate-server-rsa-fingerprint: ${{ env.TMATE_SERVER_RSA_FINGERPRINT }}
         tmate-server-ed25519-fingerprint: ${{ env.TMATE_SERVER_ED25519_FINGERPRINT }}
-      if: job.status == 'failure' && runner.debug == '1'
+      if: runner.debug == '1'
diff --git a/.github/workflows/end2end.yaml b/.github/workflows/end2end.yaml
index 5f0f2fee8b..2af20711aa 100644
--- a/.github/workflows/end2end.yaml
+++ b/.github/workflows/end2end.yaml
@@ -413,9 +413,9 @@ jobs:
       - name: Run smoke tests
         run: bash run-e2e-test.sh "end2end" ${E2E_IMAGE_NAME}:${E2E_IMAGE_TAG} "smoke" "default"
         working-directory: ./.github/scripts/end2end
-      - name: Debug wait
-        uses: ./.github/actions/debug-wait
+      - uses: ./.github/actions/debug-wait
         timeout-minutes: 60
+        if: failure()
       - name: Archive and publish artifacts
         uses: ./.github/actions/archive-artifacts
         with:
@@ -472,9 +472,9 @@ jobs:
       - name: Run CTST end to end tests
         run: bash run-e2e-ctst.sh "" "" "" "" --tags @PRA
         working-directory: ./.github/scripts/end2end
-      - name: Debug wait
-        uses: ./.github/actions/debug-wait
+      - uses: ./.github/actions/debug-wait
         timeout-minutes: 60
+        if: failure()
       - name: Archive and publish artifacts
         uses: ./.github/actions/archive-artifacts
         with:
@@ -523,9 +523,9 @@ jobs:
       # - name: Run vault e2e tests
       #   run: bash vault-e2e-test.sh
       #   working-directory: ./.github/scripts/end2end
-      - name: Debug wait
-        uses: ./.github/actions/debug-wait
+      - uses: ./.github/actions/debug-wait
         timeout-minutes: 60
+        if: failure()
       - name: Archive and publish artifacts
         uses: ./.github/actions/archive-artifacts
         with:
@@ -562,9 +562,9 @@ jobs:
       - name: Run backbeat end to end tests
         run: bash run-e2e-test.sh "end2end" ${E2E_IMAGE_NAME}:${E2E_IMAGE_TAG} "backbeat" "default"
         working-directory: ./.github/scripts/end2end
-      - name: Debug wait
-        uses: ./.github/actions/debug-wait
+      - uses: ./.github/actions/debug-wait
         timeout-minutes: 60
+        if: failure()
       - name: Archive and publish artifacts
         uses: ./.github/actions/archive-artifacts
         with:
@@ -608,9 +608,9 @@ jobs:
       - name: Run CTST end to end tests
         run: bash run-e2e-ctst.sh "" "" "" "" --tags 'not @PRA'
         working-directory: ./.github/scripts/end2end
-      - name: Debug wait
-        uses: ./.github/actions/debug-wait
+      - uses: ./.github/actions/debug-wait
         timeout-minutes: 60
+        if: failure()
       - name: Archive and publish artifacts
         uses: ./.github/actions/archive-artifacts
         with:
@@ -622,6 +622,8 @@ jobs:
         run: kind delete cluster
 
   write-final-status:
+    permissions:
+      checks: write
     runs-on: ubuntu-latest
     needs:
       - check-dashboard-versions
@@ -635,6 +637,7 @@ jobs:
       - end2end-sharded
       - end2end-pra
       - ctst-end2end-sharded
+    if: always()
     steps:
       - name: Upload final status
         uses: scality/actions/upload_final_status@1.8.0
@@ -642,4 +645,14 @@ jobs:
           ARTIFACTS_USER: ${{ secrets.ARTIFACTS_USER }}
           ARTIFACTS_PASSWORD: ${{ secrets.ARTIFACTS_PASSWORD }}
           JOBS_RESULTS: ${{ join(needs.*.result) }}
-        if: always()
+
+      - name: Download all workflow run artifacts
+        uses: actions/download-artifact@v4
+
+      - name: Publish test report
+        uses: mikepenz/action-junit-report@v4
+        with:
+          check_name: 'junit: test results'
+          detailed_summary: true
+          report_paths: '*-test-report/*.xml'
+        continue-on-error: true