diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fb43267..fcce77b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -152,7 +152,7 @@ jobs:
 set-tag:
   name: Set Tag Name
   needs: [detect-project, build]
-  if: ${{ !failure() && !cancelled() && github.event_name != 'pull_request' }}
+  #if: ${{ !failure() && !cancelled() && github.event_name != 'pull_request' }}
   runs-on: ubuntu-latest
   outputs:
     tag_name: ${{ steps.set_tag.outputs.tag_name }}
@@ -211,11 +211,11 @@ set-tag:
   docker-build:
     name: Build and Push Docker Image
     needs: [detect-project, build, set-tag]
-    #if: |
-    #  always() && 
-    #  needs.detect-project.result == 'success' && 
-    #  needs.build.result == 'success' &&
-    #  github.event_name != 'pull_request'
+    if: | 
+      needs.detect-project.result == 'success' && 
+      needs.build.result == 'success' &&
+      needs.set-tag.outputs.should_tag == 'true' &&
+      github.event_name != 'pull_request'
     runs-on: ubuntu-latest
     environment: production
     steps: