diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 142ef864e707dd902b2f37fcd55eee06fbb319f8..b885dc69cdd4ccc88069808590e2a82842ce8ad3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -125,18 +125,20 @@ test:
     - if [[ "$CAOSDB_TAG" == "" ]]; then
         if echo "$F_BRANCH" | grep -c "^f-" ; then
           CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH};
-          docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG="${DEFAULT_CAOSDB_TAG}_F_dev" ;
+          docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG="${DEFAULT_CAOSDB_TAG}" ;
         elif [ "$F_BRANCH" == "main" ] ; then
-          CAOSDB_TAG=${DEFAULT_CAOSDB_TAG}_F_main ;
+          CAOSDB_TAG=main ;
+        elif [ "$F_BRANCH" == "dev" ] ; then
+          CAOSDB_TAG=dev ;
         else
-          CAOSDB_TAG="${DEFAULT_CAOSDB_TAG}_F_dev" ;
+          CAOSDB_TAG="${DEFAULT_CAOSDB_TAG}" ;
         fi;
       fi
     - echo "F_BRANCH = $F_BRANCH"
     - echo "CAOSDB_TAG = $CAOSDB_TAG"
     - echo "DEPLOY_REF = $DEPLOY_REF"
     - docker load < /image-cache/caosdb-${F_BRANCH}.tar || true
-    - docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=${DEFAULT_CAOSDB_TAG}_F_dev ;
+    - docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG="${DEFAULT_CAOSDB_TAG}" ;
     - echo "CAOSDB_TAG = $CAOSDB_TAG"
 
     - docker load < /image-cache/${CPPINTTEST_IMAGE_CACHE} || true