diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed811019fe741e9de4de44a489d4e3f496ed0f75..f5261f92c261ee0e883de67d1d7d04a8e03ffc6a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,27 +1,25 @@
-image: registry-gitlab.pasteur.fr/dsi-tools/docker-images/docker:latest
-
-services:
-    - registry-gitlab.pasteur.fr/dsi-tools/docker-images/docker:dind
 stages:
-    - build
+  - step1
+  - step2
 
-docker:
-  stage: build
+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
   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:latest" -t "$CI_REGISTRY_IMAGE:$MY_TIME" .  -f Dockerfile
+    - 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" .
     - docker push "$CI_REGISTRY_IMAGE"
 
-singularity:
-  stage: build
+singularity-build-push:
+  stage: step2
+  needs: ["docker-build-push"]
   image:
-    name: quay.io/singularity/singularity:v3.11.0
+    name: quay.io/singularity/singularity:v3.10.0
     entrypoint: [""]
   script:
     - singularity build singularity.sif Singularity
-    - ls -lh singularity.sif
-    - singularity push --docker-username "${CI_REGISTRY_USER}" --docker-password "${CI_REGISTRY_PASSWORD}" singularity.sif oras://"$CI_REGISTRY_IMAGE":latest
-  artifacts:
-    paths:
-    - singularity.sif
+    - singularity push --docker-username "${CI_REGISTRY_USER}" --docker-password "${CI_REGISTRY_PASSWORD}" singularity.sif oras://"$CI_REGISTRY_IMAGE":"latest"