diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d164a8..e0b9baf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,4 +14,10 @@ build_image:
   services:
     - docker
   script:
-    - docker build -t facturio .
+    - docker build -t ${CI_REGISTRY_IMAGE}/facturio:${CI_COMMIT_REF_NAME} .
+    - docker push ${CI_REGISTRY_IMAGE}/facturio:${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}
+      fi