diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3cff298e707c63cc945e7b6a71c26501194a2e4f..1687247432512927d66920b83c6990aa396da497 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,20 +1,15 @@
-image: registry-gitlab.pasteur.fr/dsi-tools/docker-images/docker:latest
-
-services:
-    - registry-gitlab.pasteur.fr/dsi-tools/docker-images/docker:dind
-stages:
-    - build
-
 build:
+  image: docker:24
   stage: build
+  before_script:
+    - i=0; while [ "$i" -lt 12 ]; do docker info && break; sleep 5; i=$(( i + 1 )) ; done
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   script:
-    - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" registry-gitlab.pasteur.fr
-    - docker build --pull -f Dockerfile -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" .
+    - export MY_TIME=`date +"%F-%H%M"`
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" -t "$CI_REGISTRY_IMAGE:latest" -t "$CI_REGISTRY_IMAGE:$MY_TIME" --build-arg="BUILD_OPTIONS=$OPTIONS" -f ./Dockerfile .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
-    - docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
-    - docker tag  "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"  "$CI_REGISTRY_IMAGE:latest"
     - docker push "$CI_REGISTRY_IMAGE:latest"
-    - export   MY_TIME=`date +"%F-%H%M"`
-    - docker tag  "$CI_REGISTRY_IMAGE:latest" "$CI_REGISTRY_IMAGE:$MY_TIME" 
+    - docker push "$CI_REGISTRY_IMAGE:main"
     - docker push "$CI_REGISTRY_IMAGE:$MY_TIME"
+