diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 777a0fa1af3cf5db75fcf7b2d938a42ddf7e3747..b59de4ea06a8b9b1dcca517fb3ae4670c5409fb4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -149,8 +149,6 @@ version:
 .dind:
   stage: dind
   extends: .build
-  variables:
-  - BUILD_IMAGE: dind
   script:
     - docker buildx build --push
         --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}
@@ -176,12 +174,14 @@ version:
 dind-build:
   extends: .dind
   variables:
+    BUILD_IMAGE: dind
     EXPORT_TAG:
 
 dind-publish:
   image: ${CI_REGISTRY}/${CI_PROJECT_PATH}/dind:${INTERNAL_TAG}
   extends: .dind
   variables:
+    BUILD_IMAGE: dind
     EXPORT_TAG: ${EXPORT_TAG}
 
 dind-default:
@@ -189,6 +189,7 @@ dind-default:
   extends: .dind
   when: manual
   variables:
+    BUILD_IMAGE: dind
     EXPORT_TAG: master
 
 base: