diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df8aa92a..c68e73d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -90,7 +90,7 @@ docker image:
     - export IMAGETAG_CORE_VERSION=$IMAGETAG_BASE:core-$CORE_VERSION
     - export IMAGETAG_VERSION=$IMAGETAG_BASE:$VERSION
     - export IMAGETAG_LATEST=$IMAGETAG_BASE:latest
-    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
     - docker build -t $IMAGETAG_LATEST -t $IMAGETAG_VERSION -t $IMAGETAG_CORE_VERSION .
     - docker push $IMAGETAG_BASE
   tags:
@@ -110,9 +110,9 @@ branch image:
   services:
     - docker:dind
   script:
-    - export IMAGETAG_BASE=$CI_REGISTRY_IMAGE/$REGISTRY_BRANCH/cli
+    - export IMAGETAG_BASE=$CI_REGISTRY_IMAGE/cli
     - export IMAGETAG_BRANCH=$IMAGETAG_BASE:$CI_COMMIT_REF_SLUG
-    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
     - docker build -t $IMAGETAG_BRANCH .
     - docker push $IMAGETAG_BASE
   except: