diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a1eafffde41..4919af5313c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,6 +78,7 @@ jobs:
         uses: ./.github/actions/upload-heapdumps
 
       - name: Surefire reports
+        if: always()
         uses: ./.github/actions/archive-surefire-reports
         with:
           job-id: unit-tests
@@ -116,6 +117,7 @@ jobs:
           job-name: Base IT
 
       - name: Surefire reports
+        if: always()
         uses: ./.github/actions/archive-surefire-reports
         with:
           job-id: base-integration-tests-${{ matrix.group }}
@@ -142,6 +144,7 @@ jobs:
         uses: ./.github/actions/upload-heapdumps
 
       - name: Surefire reports
+        if: always()
         uses: ./.github/actions/archive-surefire-reports
         with:
           job-id: quarkus-unit-tests
@@ -189,6 +192,7 @@ jobs:
         uses: ./.github/actions/upload-heapdumps
 
       - name: Surefire reports
+        if: always()
         uses: ./.github/actions/archive-surefire-reports
         with:
           job-id: quarkus-integration-tests-${{ matrix.os }}-${{ matrix.server }}
@@ -239,6 +243,7 @@ jobs:
           job-name: Java Distribution IT
 
       - name: Surefire reports
+        if: always()
         uses: ./.github/actions/archive-surefire-reports
         with:
           job-id: jdk-integration-tests-${{ matrix.os }}-${{ matrix.dist }}-${{ matrix.version }}
@@ -303,6 +308,7 @@ jobs:
           job-name: New Store IT
 
       - name: Surefire reports
+        if: always()
         uses: ./.github/actions/archive-surefire-reports
         with:
           job-id: new-store-integration-tests-${{ matrix.db }}
@@ -342,6 +348,7 @@ jobs:
           job-name: Legacy Store IT
 
       - name: Surefire reports
+        if: always()
         uses: ./.github/actions/archive-surefire-reports
         with:
           job-id: legacy-store-integration-tests-${{ matrix.db }}
@@ -374,6 +381,7 @@ jobs:
           job-name: Store Model Tests
 
       - name: Surefire reports
+        if: always()
         uses: ./.github/actions/archive-surefire-reports
         with:
           job-id: store-model-tests
@@ -408,6 +416,7 @@ jobs:
           job-name: Legacy Clustering IT
 
       - name: Surefire reports
+        if: always()
         uses: ./.github/actions/archive-surefire-reports
         with:
           job-id: clustering-integration-tests
@@ -438,6 +447,7 @@ jobs:
         uses: ./.github/actions/upload-heapdumps
 
       - name: Surefire reports
+        if: always()
         uses: ./.github/actions/archive-surefire-reports
         with:
           job-id: fips-unit-tests
@@ -484,6 +494,7 @@ jobs:
           job-name: FIPS IT
 
       - name: Surefire reports
+        if: always()
         uses: ./.github/actions/archive-surefire-reports
         with:
           job-id: fips-integration-tests-${{ matrix.mode }}
@@ -519,6 +530,7 @@ jobs:
           job-name: Account Console IT
 
       - name: Surefire reports
+        if: always()
         uses: ./.github/actions/archive-surefire-reports
         with:
           job-id: account-console-integration-tests-${{ matrix.browser }}
@@ -557,6 +569,7 @@ jobs:
           job-name: Forms IT
 
       - name: Surefire reports
+        if: always()
         uses: ./.github/actions/archive-surefire-reports
         with:
           job-id: forms-integration-tests-${{ matrix.browser }}
@@ -600,6 +613,7 @@ jobs:
           job-name: WebAuthn IT
 
       - name: Surefire reports
+        if: always()
         uses: ./.github/actions/archive-surefire-reports
         with:
           job-id: webauthn-integration-tests-${{ matrix.browser }}
@@ -636,6 +650,7 @@ jobs:
         run: .github/scripts/run-ipa.sh "${{ github.workspace }}"
 
       - name: Surefire reports
+        if: always()
         uses: ./.github/actions/archive-surefire-reports
         with:
           job-id: sssd-unit-tests
@@ -681,6 +696,7 @@ jobs:
           job-name: Migration Tests
           
       - name: Surefire reports
+        if: always()
         uses: ./.github/actions/archive-surefire-reports
         with:
           job-id: migration-tests-${{ matrix.old-version }}-${{ matrix.database }}