diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9bc432f03a59798c9649b47f18bc57d9fc9c7d1b..a3dbf030d314a58666cd7bd86308650873452a3a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ test_build_image:
 
 build_image:
   tags:
-  - axiom-dev
+  - docker
   script:
     - docker pull "$CI_REGISTRY_IMAGE:latest" || true
     - docker build --cache-from "$CI_REGISTRY_IMAGE:latest" --pull -t "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG" .
@@ -24,11 +24,12 @@ build_image:
     - docker tag $CI_REGISTRY_IMAGE:$CI_BUILD_TAG $CI_REGISTRY_IMAGE:latest
     - docker push "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG"
     - docker push "$CI_REGISTRY_IMAGE:latest"
-    - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWD"
-    - docker tag $CI_REGISTRY_IMAGE:$CI_BUILD_TAG dunitrust/dunitrust-env-build:$CI_BUILD_TAG
-    - docker push "dunitrust/dunitrust-env-build:$CI_BUILD_TAG"
-    - docker tag $CI_REGISTRY_IMAGE:$CI_BUILD_TAG dunitrust/dunitrust-env-build:latest
-    - docker push "dunitrust/dunitrust-env-build:latest"
+    - docker login -u "librelois" -p "$DOCKER_HUB_PASSWD"
+    - docker tag "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG" dunitrust/dunitrust-env-build:"$CI_BUILD_TAG"
+    - docker push dunitrust/dunitrust-env-build:"$CI_BUILD_TAG"
+    - docker tag "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG" dunitrust/dunitrust-env-build:latest
+    - docker push dunitrust/dunitrust-env-build:latest
+
 
   only:
     - tags