diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5e310362c11e86cb410800db61e7114b25b7ea6..d2031a972b87c32956ba11deb8ab3dc06cb12769 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,8 +37,8 @@ docker:
     - docker load < `ls c8-docker-base-*.tar.xz` | tee load
     - export IMAGENAME=$(sed -e 's/Loaded image:\ \([[:alnum:]_\.\-]\+\).*/\1/g' load)
     - export VERSION="${IMAGENAME/c8-docker-base-/}"
-    - docker tag "${IMAGENAME}" "${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${VERSION}"
-    - docker push "${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${VERSION}"
+    - docker tag "${IMAGENAME}" "${CI_REGISTRY_IMAGE}:${VERSION}"
+    - docker push "${CI_REGISTRY_IMAGE}:${VERSION}"
   artifacts:
     paths:
       - "load"
@@ -55,12 +55,12 @@ tag_latest:
     - export IMAGENAME=$(sed -z -e 's/Loaded image:\ \([[:alnum:]_\.\-]\+\).*/\1/g' load)
     - export VERSION="${IMAGENAME/c8-docker-base-/}"
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-    - docker pull "${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${VERSION}"
-    - docker tag "${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${VERSION}" "${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:latest"
-    - docker push "${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:latest"
+    - docker pull "${CI_REGISTRY_IMAGE}:${VERSION}"
+    - docker tag "${CI_REGISTRY_IMAGE}:${VERSION}" "${CI_REGISTRY_IMAGE}:latest"
+    - docker push "${CI_REGISTRY_IMAGE}:latest"
     - echo "${DOCKER_PWD}" | docker login -u "$DOCKER_USER" --password-stdin
-    - docker tag "${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${VERSION}" "cern/${CI_PROJECT_NAME}:${VERSION}"
-    - docker tag "${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${VERSION}" "cern/${CI_PROJECT_NAME}:latest"
+    - docker tag "${CI_REGISTRY_IMAGE}:${VERSION}" "cern/${CI_PROJECT_NAME}:${VERSION}"
+    - docker tag "${CI_REGISTRY_IMAGE}:${VERSION}" "cern/${CI_PROJECT_NAME}:latest"
     - docker push "cern/${CI_PROJECT_NAME}:${VERSION}"
     - docker push "cern/${CI_PROJECT_NAME}:latest"
   when: manual