diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9cd71a9fe5f8f74d7c02697a84cc2a49f615a190..9dbdf0cea5db8c017fd4b5e146dcafa528bd40dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -167,7 +167,7 @@ version:
   extends: .build
   script:
     - docker buildx build --push
-        --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}
+        --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${CI_COMMIT_REF_NAME}
         ${EXPORT_TAG:+
           ${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${EXPORT_TAG}}
           ${DH_PUSH:+--tag ${DH_REGISTRY}/${DH_REGISTRY_USER}/${BUILD_IMAGE}:${EXPORT_TAG}}
@@ -191,7 +191,7 @@ dind-build:
   extends: .dind
   variables:
     BUILD_IMAGE: dind
-    EXPORT_TAG: ""
+    EXPORT_TAG: ${CI_COMMIT_REF_NAME}
 
 dind-publish:
   image: ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${CI_COMMIT_REF_NAME}
@@ -200,6 +200,7 @@ dind-publish:
   extends: .dind
   variables:
     BUILD_IMAGE: dind
+    EXPORT_TAG: ${CI_COMMIT_REF_NAME}
 
 dind-default:
   image: ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${CI_COMMIT_REF_NAME}