diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 527d368..f8a3a9c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,12 +12,12 @@ build:
   stage: build
   variables:
     IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-    D_IMAGE_TAG: egon0/flarum-multiarch:$CI_COMMIT_REF_SLUG
-    D_LATEST_TAG: egon0/flarum-multiarch:latest
+    D_IMAGE_TAG: $DOCKER_LOGINflarum-multiarch:$CI_COMMIT_REF_SLUG
+    D_LATEST_TAG: $DOCKER_LOGIN/flarum-multiarch:latest
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
     - git clone https://github.com/mondediefr/docker-flarum.git
     - cd docker-flarum
     - docker buildx create --use --name A$CI_COMMIT_SHORT_SHA
-    - docker buildx build --platform $BUILD_PLATFORMS --push -t $IMAGE_TAG -t $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME-$(date +%Y-%m-%d) -t $D_IMAGE_TAG -t $D_LATEST_TAG -t egon0/flarum-multiarch:$CI_COMMIT_REF_NAME-$(date +%Y-%m-%d) .
+    - docker buildx build --platform $BUILD_PLATFORMS --push -t $IMAGE_TAG -t $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME-$(date +%Y-%m-%d) -t $D_IMAGE_TAG -t $D_LATEST_TAG -t $DOCKER_LOGIN/flarum-multiarch:$CI_COMMIT_REF_NAME-$(date +%Y-%m-%d) .