diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7483ab68e0d7350ec241326dbd0f43c088662eab..407b7386dffd54877a4c7f4bcc8d87c32cb7e046 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,16 +48,19 @@ rights-engine-docker-build:
   script:
     - |
       if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
-        tag=""
+        tag="latest"
         echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
+      elif [[ -n "$CI_COMMIT_TAG" ]]; then
+        tag="$CI_COMMIT_TAG"
+        echo "Running on tag '$CI_COMMIT_TAG': tag = $tag"
       else
-        tag=":$CI_COMMIT_REF_SLUG"
+        tag="$CI_COMMIT_REF_SLUG"
         echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
       fi
-  # Build Backend Docker Container
-    - echo "$CI_REGISTRY_IMAGE${tag}/rights-engine"
-    - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}/rights-engine" ./src
-    - docker push "$CI_REGISTRY_IMAGE${tag}/rights-engine"
+    - image_name="$CI_REGISTRY_IMAGE:rights-engine-$tag"
+    - echo "Docker image name: $image_name"
+    - docker build --pull -t "$image_name" ./src
+    - docker push "$image_name"
 
 pages:
   image: python:3.8-buster