diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b85fea8..3406765 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ image: jdrouet/docker-with-buildx:stable
 variables:
   DOCKER_HOST: tcp://docker:2375
   DOCKER_DRIVER: overlay2
+  IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
 
 services:
   - docker:dind
@@ -10,8 +11,8 @@ services:
 build:
   stage: build
   script:
-    - echo $DOCKER_PASSWORD | docker login dockeregistry.ahmza.com -u "$DOCKER_USERNAME" --password-stdin
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker buildx create --use
-    - docker buildx build --no-cache --platform linux/arm64,linux/amd64 -t dockeregistry.ahmza.com/blog:latest --push .
+    - docker buildx build --no-cache --platform linux/arm64,linux/amd64 -t $IMAGE_TAG --push .
   only:
     - main