diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97b6330d51b556b270106d10377576429b4399f7..a6e0354facbfef58c20f3e201978b837d7d10c27 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,7 +54,7 @@ run tests:
   stage: test
   image: nexus.engageska-portugal.pt/ska-docker/tango-builder:latest
   before_script:
-  - docker login -u $DOCKER_REGISTRY_USER_LOGIN -p $CI_REGISTRY_PASS_LOGIN $CI_NX_REGISTRY
+  - docker login -u $DOCKER_REGISTRY_USERNAME -p $DOCKER_REGISTRY_PASSWORD $DOCKER_REGISTRY_HOST
   tags:
     - docker-executor
   script:
@@ -85,7 +85,7 @@ publish to nexus:
 pages:
   image: nexus.engageska-portugal.pt/ska-docker/tango-builder:latest
   before_script:
-  - docker login -u $DOCKER_REGISTRY_USER_LOGIN -p $CI_REGISTRY_PASS_LOGIN $CI_NX_REGISTRY
+  - docker login -u $DOCKER_REGISTRY_USERNAME -p $DOCKER_REGISTRY_PASSWORD $DOCKER_REGISTRY_HOST
   tags:
     - docker-executor
   stage: pages