diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b89cffbf81e4bf3f49f2e1df0be1ade47bf0e49..798145643e0b33521373065e71b5cbdfd453cbcc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -115,13 +115,13 @@ test:
       - time docker load < /image-cache/caosdb-${F_BRANCH}.tar || true
       - if [[ "$CAOSDB_TAG" == "" ]]; then
           if echo "$F_BRANCH" | grep -c "^f-" ; then
-            CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH}-latest;
-            docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=${DEPLOY_REF}-latest ;
+            CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH};
+            docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=${DEPLOY_REF} ;
           else
-            CAOSDB_TAG=${DEPLOY_REF}-latest;
+            CAOSDB_TAG=${DEPLOY_REF};
           fi;
         fi
-      - docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=dev-latest ;
+      - docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=dev ;
       - echo $CAOSDB_TAG
 
       - time docker load < /image-cache/caosdb-pyint-testenv-${CI_COMMIT_REF_NAME}.tar || true