diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0324b9326ac8e91112a3eaec46748b4dfcd3764d..07f72610a0165bb0c221671c922a0ce9232bfbe3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 variables:
-   CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-webui-testenv
+   CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/caosdb-webui/testenv
    # When using dind, it's wise to use the overlayfs driver for
    # improved performance.
 
@@ -78,7 +78,7 @@ build-testenv:
   stage: setup
   script: 
     - cd test/docker
-    - docker login -u indiscale -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
       # use here general latest or specific branch latest...
     - docker pull $CI_REGISTRY_IMAGE:latest || true
     - docker build