diff --git a/docker/publish.gitlab-ci.yaml b/docker/publish.gitlab-ci.yaml
index c9a7915..ba6481b 100644
--- a/docker/publish.gitlab-ci.yaml
+++ b/docker/publish.gitlab-ci.yaml
@@ -107,7 +107,7 @@
         $CI_PIPELINE_SOURCE == "push"
       exists:
         - '{dockerfile, dockerfile.j2}'
-      when: always
+      when: on_success
 
     - if: # condition_dev_branch_push
         $CI_COMMIT_BRANCH == "development" && 
@@ -119,6 +119,6 @@
           - '{dockerfile, dockerfile.j2, includes/**}'
         compare_to: 'master'
       allow_failure: true
-      when: manual
+      when: on_success
 
     - when: never