diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7c1425ea544a0a80221496db6b7703e29f68c2e..e4fbbe43c3577aae3f4d100e8b12f296c92a1493 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -139,13 +139,13 @@ test:
 
     - 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 ;
 
     - docker load < /image-cache/${CPPINTTEST_IMAGE_CACHE} || true
     - docker pull $CPPINTTEST_REGISTRY_IMAGE