diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 67f092a93e0408b6e65a72e5235fa4044acc090c..9c14a3be68ba58c057401f3ba4fdad76be20b3a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,15 +4,17 @@ stages:
 
 docker-build-push:
   stage: step1
-  image:
-    name: registry-gitlab.pasteur.fr/dsi-tools/docker-images/docker:latest
-  services:
-    - registry-gitlab.pasteur.fr/dsi-tools/docker-images/docker:dind
+  image: docker:24
+  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
-    - 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:main" -t "$CI_REGISTRY_IMAGE:$MY_TIME" .
-    - docker push "$CI_REGISTRY_IMAGE"
+    - 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:$MY_TIME" --build-arg="BUILD_OPTIONS=$OPTIONS" -f ./Dockerfile .
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
+    - docker push "$CI_REGISTRY_IMAGE:main"
+    - docker push "$CI_REGISTRY_IMAGE:$MY_TIME"
 
 singularity-build-push:
   stage: step2