diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e01f2d9..808d8f5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ stages:
   - build
 
 before_script:
-  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.pztrn.name
+  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
   - docker info
 
 build-local-registry-latest:
@@ -42,7 +42,7 @@ build-dockerhub-latest:
   tags:
     - docker
   script:
-    - docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
+    - docker login -u $DOCKERHUB_USER -p "$DOCKERHUB_PASSWORD"
     - docker build --pull -t $DOCKERHUB_IMAGE_LATEST .
     - docker push $DOCKERHUB_IMAGE_LATEST
 
@@ -51,7 +51,7 @@ build-dockerhub-version:
   tags:
     - docker
   script:
-    - docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD
+    - docker login -u $DOCKERHUB_USER -p "$DOCKERHUB_PASSWORD"
     - docker build --pull -t $DOCKERHUB_IMAGE_TAGGED .
     - docker push $DOCKERHUB_IMAGE_TAGGED
   only: