diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 045e9c1..ba8670f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -256,7 +256,7 @@ deploy_stage:
       agent: esv/bsf/bsf-integration/orchard/orchard-mvp:orchard-stage
   rules:
     - if: '$CI_COMMIT_BRANCH == "main"'
-      when: always
+      when: on_success
 
 # Deploy feature branch to dev namespace
 deploy_feature:
@@ -295,7 +295,7 @@ deploy_feature:
       agent: esv/bsf/bsf-integration/orchard/orchard-mvp:orchard
   rules:
     - if: '$CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != "main"'
-      when: always
+      when: on_success
 
 # Cleanup feature branch deployment
 cleanup_feature: