diff --git a/ci-templates/000_3.6.gitlab-ci.yml b/ci-templates/000_3.6.gitlab-ci.yml
index 8515214..1985bba 100644
--- a/ci-templates/000_3.6.gitlab-ci.yml
+++ b/ci-templates/000_3.6.gitlab-ci.yml
@@ -5,6 +5,8 @@
 Build_36:
   stage: build
   needs: ["Build_Base"]
+  rules:
+    - when: always
   script:
     - docker pull nest/nest-simulator:3.6 || true
     - docker build
@@ -19,7 +21,8 @@ Build_36:
 Deploy_36:
   stage: deploy
   needs: ["Build_36"]
-  when: never
+  rules:
+    - when: on_success
   script:    
     - echo -n $DOCKERHUB_REGISTRY_TOKEN | docker login -u $DOCKERHUB_REGISTRY_USER --password-stdin
     - docker push nest/nest-simulator:3.6
diff --git a/ci-templates/000_dev.gitlab-ci.yml b/ci-templates/000_dev.gitlab-ci.yml
index 0d60298..8d2b3ab 100644
--- a/ci-templates/000_dev.gitlab-ci.yml
+++ b/ci-templates/000_dev.gitlab-ci.yml
@@ -21,6 +21,8 @@ Build_Dev:
 Deploy_Dev:
   stage: deploy
   needs: ["Build_Dev"]
+  rules:
+    when: on_success
   script:
     - echo -n $DOCKERHUB_REGISTRY_TOKEN | docker login -u $DOCKERHUB_REGISTRY_USER --password-stdin
     - docker push nest/nest-simulator:dev