diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 307ed9d..c94e20a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,8 +9,8 @@ build:ci-image:
     - docker:20.10.16-dind
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker build -t $CI_REGISTRY/TECHNOFAB/nix-gitlab-ci/nix-gitlab-ci:latest .
-    - docker push $CI_REGISTRY/TECHNOFAB/nix-gitlab-ci/nix-gitlab-ci:latest
+    - docker build -t $CI_REGISTRY/technofab/nix-gitlab-ci/nix-gitlab-ci:latest -t $CI_REGISTRY/technofab/nix-gitlab-ci/nix-gitlab-ci:${CI_COMMIT_SHORT_SHA} .
+    - docker push $CI_REGISTRY/technofab/nix-gitlab-ci/nix-gitlab-ci --all-tags
 
 build:daemon:
   image: docker:20.10.16
@@ -19,5 +19,5 @@ build:daemon:
     - docker:20.10.16-dind
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker build -t $CI_REGISTRY/TECHNOFAB/nix-gitlab-ci/nix-ci-daemon:latest .
-    - docker push $CI_REGISTRY/TECHNOFAB/nix-gitlab-ci/nix-ci-daemon:latest
+    - docker build -t $CI_REGISTRY/technofab/nix-gitlab-ci/nix-ci-daemon:latest -t $CI_REGISTRY/technofab/nix-gitlab-ci/nix-ci-daemon:${CI_COMMIT_SHORT_SHA} .
+    - docker push $CI_REGISTRY/technofab/nix-gitlab-ci/nix-ci-daemon --all-tags