diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 1ee7167e0..da9e5a566 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -19,6 +19,8 @@ jobs:
 
   create-deploy-env:
     runs-on: ubuntu-latest
+    needs:
+      - release
     outputs:
       deploy-env: ${{ steps.output-deploy-env.outputs.deploy-env }}
 
@@ -54,6 +56,7 @@ jobs:
       aws-ecr-repo-name: ${{ secrets.AWS_ECR_REPO_NAME }}
 
   stg:
+    if: ${{ !needs.release.outputs.created }}
     needs:
       - create-deploy-env
       - release
@@ -68,8 +71,8 @@ jobs:
     if: ${{ needs.release.outputs.created }}
     needs:
       - create-deploy-env
+      - build
       - release
-      - stg
     uses: ./.github/workflows/_deploy.yaml
     with:
       image-tag: ${{ needs.release.outputs.tag_name }}