diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 487a885..e5def2a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,11 +15,13 @@ build_image:
   image: docker
   services:
     - docker
+  variables:
+    CONTAINER_NAME: ${CI_REGISTRY_IMAGE}/facturio
   script:
-    - docker build -t ${CI_REGISTRY_IMAGE}/facturio:${CI_COMMIT_REF_NAME} .
-    - docker push ${CI_REGISTRY_IMAGE}/facturio:${CI_COMMIT_REF_NAME}
+    - docker build -t ${CONTAINER_NAME}:${CI_COMMIT_REF_NAME} .
+    - docker push ${CONTAINER_NAME}:${CI_COMMIT_REF_NAME}
     - |
-      if [[ -z "${CI_COMMIT_TAG}" ]]; then
-        docker tag ${CI_REGISTRY_IMAGE}/facturio:${CI_COMMIT_REF_NAME} ${CI_REGISTRY_IMAGE}/facturio:${CI_COMMIT_TAG}
-        docker push ${CI_REGISTRY_IMAGE}/facturio:${CI_COMMIT_TAG}
+      if [[ -n "${CI_COMMIT_TAG}" ]]; then
+        docker tag ${CONTAINER_NAME}:${CI_COMMIT_REF_NAME} ${CONTAINER_NAME}:${CI_COMMIT_TAG}
+        docker push ${CONTAINER_NAME}:${CI_COMMIT_TAG}
       fi