diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a77c9590cb521c2fb05e0e1602fd2d7751cd45a..ba5edd5d4545d4a6a643bac1e6b1e05ba0ddf1d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -65,6 +65,54 @@ info:
     - echo "$CI_REGISTRY_IMAGE_BASE"
     - echo "$CPPINTTEST_REGISTRY_IMAGE"
     - echo "$CPPINTTEST_IMAGE_CACHE"
+    - if [[ "$CAOSDB_TAG" == "" ]] ; then
+        echo "here1";
+      else
+        echo "Load deploy images with tag $CAOSDB_TAG ..."
+        echo "Load deploy images with tag $CAOSDB_TAG ... success"
+      fi
+    - if [[ "$CAOSDB_TAG" == "" ]] ; then
+        if echo "$F_BRANCH" | grep -c "^f-" ; then
+          CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH}-latest;
+          echo "Load deploy images with tag $CAOSDB_TAG ..."
+        else
+          CAOSDB_TAG=${DEPLOY_REF}-latest ;
+          echo "Load deploy images with tag $CAOSDB_TAG ..."
+          docker pull "${CI_REGISTRY}/caosdb/src/caosdb-deploy:${CAOSDB_TAG}" ;
+          echo "Load deploy images with tag $CAOSDB_TAG ... success"
+        fi;
+      else
+        echo "Load deploy images with tag $CAOSDB_TAG ..."
+        docker pull "${CI_REGISTRY}/caosdb/src/caosdb-deploy:${CAOSDB_TAG}" ;
+        echo "Load deploy images with tag $CAOSDB_TAG ... success"
+      fi
+    - if ! docker pull "${CI_REGISTRY}/caosdb/src/caosdb-deploy:${CAOSDB_TAG}" ; then
+        echo "Load deploy images with tag $CAOSDB_TAG ... error. Try another" ;
+        echo "Load deploy images with tag $CAOSDB_TAG ..."
+        echo "Load deploy images with tag $CAOSDB_TAG ... success"
+      fi ;
+    - if [[ "$CAOSDB_TAG" == "" ]] ; then
+        if echo "$F_BRANCH" | grep -c "^f-" ; then
+          CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH}-latest;
+          echo "Load deploy images with tag $CAOSDB_TAG ..."
+          if ! docker pull "${CI_REGISTRY}/caosdb/src/caosdb-deploy:${CAOSDB_TAG}" ; then
+            echo "Load deploy images with tag $CAOSDB_TAG ... error. Try another" ;
+            CAOSDB_TAG=${DEPLOY_REF}-latest ;
+            echo "Load deploy images with tag $CAOSDB_TAG ..."
+            docker pull "${CI_REGISTRY}/caosdb/src/caosdb-deploy:${CAOSDB_TAG}" ;
+            echo "Load deploy images with tag $CAOSDB_TAG ... success"
+          fi ;
+        else
+          CAOSDB_TAG=${DEPLOY_REF}-latest ;
+          echo "Load deploy images with tag $CAOSDB_TAG ..."
+          docker pull "${CI_REGISTRY}/caosdb/src/caosdb-deploy:${CAOSDB_TAG}" ;
+          echo "Load deploy images with tag $CAOSDB_TAG ... success"
+        fi;
+      else
+        echo "Load deploy images with tag $CAOSDB_TAG ..."
+        docker pull "${CI_REGISTRY}/caosdb/src/caosdb-deploy:${CAOSDB_TAG}" ;
+        echo "Load deploy images with tag $CAOSDB_TAG ... success"
+      fi
 
 
 # Build a docker image in which tests for this repository can run
@@ -138,27 +186,28 @@ test:
   script:
       - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
 
-      - if [[ "$CAOSDB_TAG" == "" ]]; then
+
+      - if [[ "$CAOSDB_TAG" == "" ]] ; then
           if echo "$F_BRANCH" | grep -c "^f-" ; then
-            CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH}-latest;
-            echo "Load deploy images with tag $CAOSDB_TAG ..."
+            CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH}-latest ;
+            echo "Load deploy images with tag $CAOSDB_TAG ..." ;
             if ! docker pull "${CI_REGISTRY}/caosdb/src/caosdb-deploy:${CAOSDB_TAG}" ; then
               echo "Load deploy images with tag $CAOSDB_TAG ... error. Try another" ;
               CAOSDB_TAG=${DEPLOY_REF}-latest ;
-              echo "Load deploy images with tag $CAOSDB_TAG ..."
+              echo "Load deploy images with tag $CAOSDB_TAG ..." ;
               docker pull "${CI_REGISTRY}/caosdb/src/caosdb-deploy:${CAOSDB_TAG}" ;
-              echo "Load deploy images with tag $CAOSDB_TAG ... success"
+              echo "Load deploy images with tag $CAOSDB_TAG ... success" ;
             fi ;
           else
             CAOSDB_TAG=${DEPLOY_REF}-latest ;
-            echo "Load deploy images with tag $CAOSDB_TAG ..."
+            echo "Load deploy images with tag $CAOSDB_TAG ..." ;
             docker pull "${CI_REGISTRY}/caosdb/src/caosdb-deploy:${CAOSDB_TAG}" ;
-            echo "Load deploy images with tag $CAOSDB_TAG ... success"
+            echo "Load deploy images with tag $CAOSDB_TAG ... success" ;
           fi;
         else
-          echo "Load deploy images with tag $CAOSDB_TAG ..."
+          echo "Load deploy images with tag $CAOSDB_TAG ..." ;
           docker pull "${CI_REGISTRY}/caosdb/src/caosdb-deploy:${CAOSDB_TAG}" ;
-          echo "Load deploy images with tag $CAOSDB_TAG ... success"
+          echo "Load deploy images with tag $CAOSDB_TAG ... success" ;
         fi
 
       - docker load < /image-cache/${CPPINTTEST_IMAGE_CACHE} || true