diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e92ed91373ee267b2705e8121ac6f4d4eb61d1f..40d1b0caf88042de528847a90dda2b49ca3ce930 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -277,12 +277,10 @@ jug_xl:nightly:
     - ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${NIGHTLY_TAG} 
                                  -n $DOCKER_NTRIES -t $DOCKER_WAIT_TIME
                                  ${NIGHTLY_TAG} ${PUSH_FLAG}
-    - |
-      if [ -z "${PUSH_FLAG}" ]; then
-        ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${NIGHTLY_TAG} 
-                                   -n $DOCKER_NTRIES -t $DOCKER_WAIT_TIME
-                                   ${NIGHTLY_TAG}-$(date +%Y-%m-%d) --dockerhub
-      fi
+    - test -z "${PUSH_FLAG}" && ./gitlab-ci/docker_push.sh
+                                 -i ${BUILD_IMAGE} -l ${NIGHTLY_TAG} 
+                                 -n $DOCKER_NTRIES -t $DOCKER_WAIT_TIME
+                                 ${NIGHTLY_TAG}-$(date +%Y-%m-%d) --dockerhub
 
 jug_xl:feature:
   extends: .build
@@ -320,12 +318,10 @@ jug_xl:feature:
     - ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${INTERNAL_TAG}-${DETECTOR}-${DETECTOR_BRANCH}
                                  -n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
                                  ${FEATURE_EXPORT_TAG} ${PUSH_FLAG}
-    - |
-      if [ -z "${PUSH_FLAG}" ]; then
-        ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${INTERNAL_TAG}-${DETECTOR}-${DETECTOR_BRANCH}
-                                   -n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
-                                   ${FEATURE_EXPORT_TAG}-$(date +%Y-%m-%d) --dockerhub
-      fi
+    - test -z "${PUSH_FLAG}" && ./gitlab-ci/docker_push.sh
+                                 -i ${BUILD_IMAGE} -l ${INTERNAL_TAG}-${DETECTOR}-${DETECTOR_BRANCH}
+                                 -n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
+                                 ${FEATURE_EXPORT_TAG}-$(date +%Y-%m-%d) --dockerhub
 
 .singularity:
   stage: deploy