diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 802d4a68c8d956ddfac19b30cdff5773bea0ff45..8af4af1421a53b7e10faaaadf24050928a84f037 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -115,6 +115,10 @@ deploy-uc1-kstreams-app:
     - changes:
       - uc1-application/**/*
       - application-kafkastreams-commons/**/*
+      if: "$DOCKERHUB_ORG && $DOCKERHUB_ID && $DOCKERHUB_PW && $IMAGE_NAME && $JAVA_PROJECT_NAME"
+      when: always
+    - if: "$DOCKERHUB_ORG && $DOCKERHUB_ID && $DOCKERHUB_PW && $IMAGE_NAME && $JAVA_PROJECT_NAME"
+      when: manual
 
 deploy-uc2-kstreams-app:
   extends: .deploy
@@ -125,6 +129,10 @@ deploy-uc2-kstreams-app:
     - changes:
       - uc2-application/**/*
       - application-kafkastreams-commons/**/*
+      if: "$DOCKERHUB_ORG && $DOCKERHUB_ID && $DOCKERHUB_PW && $IMAGE_NAME && $JAVA_PROJECT_NAME"
+      when: always
+    - if: "$DOCKERHUB_ORG && $DOCKERHUB_ID && $DOCKERHUB_PW && $IMAGE_NAME && $JAVA_PROJECT_NAME"
+      when: manual
 
 deploy-uc3-kstreams-app:
   extends: .deploy
@@ -135,6 +143,10 @@ deploy-uc3-kstreams-app:
     - changes:
       - uc3-application/**/*
       - application-kafkastreams-commons/**/*
+      if: "$DOCKERHUB_ORG && $DOCKERHUB_ID && $DOCKERHUB_PW && $IMAGE_NAME && $JAVA_PROJECT_NAME"
+      when: always
+    - if: "$DOCKERHUB_ORG && $DOCKERHUB_ID && $DOCKERHUB_PW && $IMAGE_NAME && $JAVA_PROJECT_NAME"
+      when: manual
 
 deploy-uc4-kstreams-app:
   extends: .deploy
@@ -145,3 +157,7 @@ deploy-uc4-kstreams-app:
     - changes:
       - uc4-application/**/*
       - application-kafkastreams-commons/**/*
+      if: "$DOCKERHUB_ORG && $DOCKERHUB_ID && $DOCKERHUB_PW && $IMAGE_NAME && $JAVA_PROJECT_NAME"
+      when: always
+    - if: "$DOCKERHUB_ORG && $DOCKERHUB_ID && $DOCKERHUB_PW && $IMAGE_NAME && $JAVA_PROJECT_NAME"
+      when: manual