diff --git a/.github/workflows/reusable-ci-build-test.yml b/.github/workflows/reusable-ci-build-test.yml
index fb8188682c85..9e25eeea83c7 100644
--- a/.github/workflows/reusable-ci-build-test.yml
+++ b/.github/workflows/reusable-ci-build-test.yml
@@ -539,8 +539,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build-jdk11,linux-jvm-tests,linux-integration-tests,linux-postman-tests]
     if: |
-      (success() || failure()) &&
-      (github.repository == 'dotCMS/core') &&
+      (always() && !cancelled()) &&
       (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
     steps:
       - uses: actions/checkout@v4
@@ -592,7 +591,7 @@ jobs:
       - name: SonarQube Quality Gate check
         id: sonarqube-quality-gate-check
         if: |
-          (success() || failure()) &&
+          (success() || !cancelled()) &&
           (github.repository == 'dotCMS/core') &&
           (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
         uses: sonarsource/sonarqube-quality-gate-action@master