diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e519c27..a7abcf07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,5 +8,5 @@ build_image:
     - echo $CI_REGISTRY_USER
     - echo $CI_REGISTRY
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker build --no-cache -t $CI_REGISTRY/jafner/calibre-web/calibre-web:$CI_COMMIT_SHORT_SHA -t $CI_REGISTRY/jafner/calibre-web/calibre-web:latest .
+    - docker build --no-cache -t $CI_REGISTRY/jafner/calibre-web/calibre-web:$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA -t $CI_REGISTRY/jafner/calibre-web/calibre-web:$CI_COMMIT_BRANCH-latest .
     - docker push $CI_REGISTRY/jafner/calibre-web/calibre-web --all-tags