diff --git a/.github/workflows/check_diffs.yml b/.github/workflows/check_diffs.yml
index 7769b3df61d85..d93dca4d96db5 100644
--- a/.github/workflows/check_diffs.yml
+++ b/.github/workflows/check_diffs.yml
@@ -129,20 +129,17 @@ jobs:
   ci_success:
     name: "CI Success"
     needs: [build, lint, test, compile-integration-tests, dependencies, extended-tests]
+    if: |
+      always()
     runs-on: ubuntu-latest
+    env:
+      JOBS_JSON: ${{ toJSON(needs) }}
+      RESULTS_JSON: ${{ toJSON(needs.*.result) }}
+      EXIT_CODE: ${{!contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') && '0' || '1'}}
     steps:
       - name: "CI Success"
         run: |
-          echo "Success"
-          exit 0
-  # this one is just for visibility, where CI success step gets skipped
-  ci_failure:
-    name: "CI Failure"
-    needs: [build, lint, test, compile-integration-tests, dependencies, extended-tests]
-    if: ${{ !success() }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: "CI Failure"
-        run: |
-          echo "Failure"
-          exit 1
+          echo $JOBS_JSON
+          echo $RESULTS_JSON
+          echo "Exiting with $EXIT_CODE"
+          exit $EXIT_CODE