diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index ab20a0788ba2a70d2770af5863826d7b674e7db5..74a00dc343db24bd4fe28f6f02eab732d20f83da 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     networks:
       - caosnet
   caosdb-server:
-    image: "$CI_REGISTRY/caosdb:$CAOSDB_TAG"
+    image: "$CI_REGISTRY_INDISCALE/caosdb/src/caosdb-deploy:$CAOSDB_TAG"
     user: 999:999
     depends_on:
       - sqldb
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b49a3176f4dee19bef6ec06a76d5e9ea777c7582..91e1b84c7d96d49836d603dcca2be82d838824e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 variables:
-   CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-advanced-testenv
+   CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/caosdb-advanced-user-tools/testenv
    # When using dind, it's wise to use the overlayfs driver for
    # improved performance.
 
@@ -44,7 +44,8 @@ test:
       - time docker load < /image-cache/caosdb-advanced-testenv.tar || true
       - time docker load < /image-cache/mariadb.tar || true
       - time docker load < /image-cache/caosdb.tar || true
-      - docker login -u indiscale -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+      - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+      - docker login -u $INDISCALE_USER -p $INDISCALE_TOKEN $CI_REGISTRY_INDISCALE
       - time docker pull $CI_REGISTRY_IMAGE:latest
       - time docker pull mariadb:10.4
       - time docker pull $CI_REGISTRY/caosdb:$CAOSDB_TAG