diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bfc88460629d3ddb1796ece28537af5dbe34c598..92204200ce36f43d7b6a43c9b3070092d8a62934 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,19 +102,13 @@ spotbugs:
       - ./$JAVA_PROJECT_NAME/**/*
       - ./application-kafkastreams-commons/**/*
       if:
-      - $DOCKERHUB_ORG
-      - $DOCKERHUB_ID
-      - $DOCKERHUB_PW
-      - $IMAGE_NAME
-      - $JAVA_PROJECT_NAME
+      - "$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
+    - when: manual
 
 deploy-uc1-kstreams-app:
   extends: .deploy