diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30232b4..339378b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,7 +102,7 @@ integration_test_stage:
     BASE_URL: https://orchard-stage.common.global.bsf.tools
   rules:
     - if: '$CI_COMMIT_BRANCH == "main"'
-      when: always
+      when: on_success
 
 # Integration tests for feature deployment
 integration_test_feature:
@@ -112,7 +112,7 @@ integration_test_feature:
     BASE_URL: https://orchard-$CI_COMMIT_REF_SLUG.common.global.bsf.tools
   rules:
     - if: '$CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != "main"'
-      when: always
+      when: on_success
 
 # Run Python backend tests
 python_tests: