diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index f8cd0e7ba..9fa49644a 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -139,7 +139,7 @@ build container fb:
     - docker login -u $DOCKER_DEPLOY_USER -p $DOCKER_DEPLOY_TOKEN $CI_REGISTRY_IMAGE
   script:
     # - mv featurebase_linux_amd64 .gitlab/
-    - tag=$CI_REGISTRY_IMAGE/server:$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
+    - tag=$CI_REGISTRY_IMAGE/server:$CI_COMMIT_REF_SLUG_$CI_COMMIT_SHORT_SHA
     - docker build --build-arg GO_VERSION=$GOVERSION -t $tag -f .gitlab/Dockerfile .
     - docker push $tag
     - echo Created docker featurebase image with tag "$tag"