diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6492723ff81aa464cd34126d945807259f57d2af..b0932044937a76a1a67afdd4d10f964618632047 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -157,7 +157,7 @@ version:
 ## oneapi_runtime + jug_xl --> oneapi_prod 
 
 ## Docker-in-docker image
-dind:
+dind-build:
   parallel:
     matrix:
       - BUILD_IMAGE: dind
@@ -165,6 +165,22 @@ dind:
   stage: dind
   needs:
     - version
+  script:
+    - docker buildx build --push
+        --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}     
+        --file containers/dind/Dockerfile
+        containers/dind
+
+dind-publish:
+  image: ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}
+  parallel:
+    matrix:
+      - BUILD_IMAGE: dind
+  extends: .build
+  stage: dind
+  needs:
+    - version
+    - dind-build
   script:
     - docker buildx build --push
         --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}