diff --git a/.github/workflows/build-dev-release.yml b/.github/workflows/build-dev-release.yml
index 8b31e25..eddbc4f 100644
--- a/.github/workflows/build-dev-release.yml
+++ b/.github/workflows/build-dev-release.yml
@@ -103,9 +103,7 @@ jobs:
     needs:
       - build-and-publish-grpc-java
       - changes
-    if: |
-      always() &&
-      (needs.changes.outputs.core == 'true' || needs.changes.outputs.grpc == 'true')
+    if: (needs.changes.outputs.core == 'true' || needs.changes.outputs.grpc == 'true') && !cancelled()
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK 'zulu' '11'
@@ -149,8 +147,7 @@ jobs:
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
   owasp-scan:
-    needs:
-      - build-and-publish-core-java
+    if: "!cancelled()"
     uses: th2-net/.github/.github/workflows/owasp-gradle-scan.yml@main
     with:
       multiproject: true
@@ -163,8 +160,8 @@ jobs:
       - app-version
       - changes
     if: |
-      always() &&
       (needs.changes.outputs.app == 'true' || needs.changes.outputs.grpc == 'true' || needs.changes.outputs.core == 'true' || needs.changes.outputs.oracle == 'true')
+      && !cancelled()
     uses: th2-net/.github/.github/workflows/compaund-java-docker-push.yml@main
     with:
       docker-username: ${{ github.actor }}
@@ -177,6 +174,7 @@ jobs:
       docker-password: ${{ secrets.GITHUB_TOKEN }}
   trivy-docker-scan:
     name: Scan Docker image for vulnerabilities
+    if: needs.publish-docker.result == 'success' && !cancelled()
     needs:
       - publish-docker
       - app-version
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 2a8504a..2afa998 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -69,7 +69,7 @@ jobs:
     needs:
       - changes
       - build-and-publish-grpc-java
-    if: ${{ needs.changes.outputs.core == 'true' }}
+    if: (needs.changes.outputs.core == 'true' || needs.changes.outputs.grpc == 'true') && !cancelled()
     uses: th2-net/.github/.github/workflows/compaund-java-multi-project-build-release.yml@main
     with:
       projectPath: core
@@ -97,8 +97,7 @@ jobs:
       sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
       sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
   owasp-scan:
-    needs:
-      - build-and-publish-core-java
+    if: "!cancelled()"
     uses: th2-net/.github/.github/workflows/owasp-gradle-scan.yml@main
     with:
       multiproject: true
@@ -107,8 +106,8 @@ jobs:
   publish-docker:
     name: Build and publish docker image
     if: |
-      always() &&
       (needs.changes.outputs.app == 'true' || needs.changes.outputs.grpc == 'true' || needs.changes.outputs.core == 'true' || needs.changes.outputs.oracle == 'true')
+      && !cancelled()
     needs:
       - build-and-publish-grpc-python
       - build-and-publish-grpc-java
@@ -127,6 +126,7 @@ jobs:
       docker-password: ${{ secrets.GITHUB_TOKEN }}
   trivy-docker-scan:
     name: Scan Docker image for vulnerabilities
+    if: needs.publish-docker.result == 'success' && !cancelled()
     needs:
       - publish-docker
       - app-version
diff --git a/.github/workflows/build-sanpshot.yml b/.github/workflows/build-sanpshot.yml
index 18f8a0b..832b695 100644
--- a/.github/workflows/build-sanpshot.yml
+++ b/.github/workflows/build-sanpshot.yml
@@ -67,6 +67,7 @@ jobs:
       sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
       sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
   owasp-scan:
+    if: "!cancelled()"
     uses: th2-net/.github/.github/workflows/owasp-gradle-scan.yml@main
     with:
       multiproject: true