diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c5ef115bafa2f4f243d7f256717d46d3024285d6..4b89cffbf81e4bf3f49f2e1df0be1ade47bf0e49 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,10 +100,13 @@ test:
       - echo $F_BRANCH
       - echo $CAOSDB_TAG
       - echo $CI_COMMIT_REF_NAME
-      - if ! echo "$F_BRANCH" | grep -c "^f-" ; then
+      - if echo "$F_BRANCH" | grep -c "^f-.*$"; then
+          REFTAG="${REFTAG}_F_${F_BRANCH}";
+        elif [ "$F_BRANCH" == "main" ]; then
+          F_BRANCH=main;
+        else
           F_BRANCH=dev;
         fi
-
       - echo $F_BRANCH
       - echo $CI_COMMIT_REF_NAME
       - echo $CI_REGISTRY_IMAGE
@@ -225,6 +228,6 @@ store-version:
   allow_failure: true
   only:
     - dev
-    - master
+    - main
     - web