diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8924164133b59bf633ede1568f21c4b8dca605d..fdc538aa999f2afb8f5e1addf9785dffff5bc284 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,7 @@ config:unstable:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_BRANCH != "develop"'
       when: manual
     - if: '$CI_COMMIT_BRANCH == "develop"'
-      when: always
+      when: on_success
   needs: ["builder:unstable"]
   script:
     - bash containers/release/configure_release.sh unstable
@@ -90,7 +90,7 @@ release:unstable:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_BRANCH != "develop"'
       when: manual
     - if: '$CI_COMMIT_BRANCH == "develop"'
-      when: always
+      when: on_success
   needs: ["config:unstable"]
   script:
      - cp config/Dockerfile containers/release/Dockerfile
@@ -105,7 +105,7 @@ release:singularity:
      - silicon
   rules:
     - if: '$CI_COMMIT_TAG'
-      when: always
+      when: on_success
     - if: '$CI_COMMIT_BRANCH == "master"'
       when: manual
   needs: ["release:stable"]