diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c27ccb097d6773b3b775b90c2940f30ffa311582..51cba8cda8c7c1bc2969c324edf3de933a143b88 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -165,6 +165,9 @@ version:
 .dind:
   stage: dind
   extends: .build
+  variables:
+    BUILD_IMAGE: dind
+    EXPORT_TAG: ${CI_COMMIT_REF_NAME}
   script:
     - docker buildx build --push
         --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${CI_COMMIT_REF_NAME}
@@ -189,24 +192,18 @@ version:
 ## Docker-in-docker image
 dind-build:
   extends: .dind
-  variables:
-    BUILD_IMAGE: dind
-    EXPORT_TAG: ${CI_COMMIT_REF_NAME}
 
-dind-publish:
+dind-confirm:
   image: ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${CI_COMMIT_REF_NAME}
+  extends: .dind
   needs:
     - dind-build
-  extends: .dind
-  variables:
-    BUILD_IMAGE: dind
-    EXPORT_TAG: ${CI_COMMIT_REF_NAME}
 
-dind-default:
+dind-deploy:
   image: ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${CI_COMMIT_REF_NAME}
-  needs: 
-    - dind-build
   extends: .dind
+  needs: 
+    - dind-confirm
   rules:
     - when: manual
   variables: