diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 285aa0b5114b3e4e4fc24a110066e10a54365d28..38a824006c46867d65c3ca064923b3671cb7673a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,10 +16,10 @@ build:
   image: docker:latest
   stage: build
   script:
-    - if [ -n "$DOCKERHUB_USERNAME" ] && [ -n "$DOCKERHUB_PASSWORD" ]; then docker version; fi
+    - docker version
     - if [ -n "$DOCKERHUB_USERNAME" ] && [ -n "$DOCKERHUB_PASSWORD" ]; then docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD; fi
     - echo "Ignore warning! Cannot perform an interactive login from a non TTY device"
-    - if [ -n "$DOCKERHUB_USERNAME" ] && [ -n "$DOCKERHUB_PASSWORD" ]; then docker build -t $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA .; fi
+    - then docker build -t $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA .
     - if [ -n "$DOCKERHUB_USERNAME" ] && [ -n "$DOCKERHUB_PASSWORD" ]; then docker push $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA; fi
 
 lint:style: