diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 396a29b7bf0d8d282e37416b1224ec6d592170da..982ae95df5f08829f806e744f5105218dc2ab572 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -103,12 +103,13 @@ test:
       - echo $CI_REGISTRY_IMAGE
 
       - docker login -u gitlab+deploy-token-ci-pull -p $TOKEN_CI_PULL $CI_REGISTRY_INDISCALE
-      - time docker load < /image-cache/caosdb-${F_BRANCH}.tar || true
       - if [[ "$CAOSDB_TAG" == "" ]]; then
           if echo "$F_BRANCH" | grep -c "^f-" ; then
+            time docker load < /image-cache/caosdb-${DEPLOY_REF}_F_${F_BRANCH}.tar || true
             CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH}-latest;
             docker pull $CI_REGISTRY_INDISCALE/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=${DEPLOY_REF}-latest ;
           else
+            time docker load < /image-cache/caosdb-${DEPLOY_REF}.tar || true
             CAOSDB_TAG=${DEPLOY_REF}-latest;
           fi;
         fi