diff --git a/docker-bake-ci.hcl b/docker-bake-ci.hcl
index d920c091c9..8d6f357a42 100644
--- a/docker-bake-ci.hcl
+++ b/docker-bake-ci.hcl
@@ -6,7 +6,7 @@ target "login-pnpm" {
     { "type": "registry", "ref": "${IMAGE_REGISTRY}/login-pnpm-buildcache:${BUILD_CACHE_KEY}", "mode": "max" }
   ]
   output = [
-    { "type" : "image", "name": "${IMAGE_REGISTRY}/login-pnpm-buildcache:${BUILD_CACHE_KEY}", push: true },
+    { "type" : "image", "name": "${IMAGE_REGISTRY}/login-pnpm:${BUILD_CACHE_KEY}", push: true },
   ]
 }
 
@@ -16,7 +16,7 @@ target "login-dev-base" {
     { "type": "registry", "ref": "${IMAGE_REGISTRY}/login-dev-base-buildcache:${BUILD_CACHE_KEY}", "mode": "max" }
   ]
   output = [
-    { "type" : "image", "name": "${IMAGE_REGISTRY}/login-dev-base-buildcache:${BUILD_CACHE_KEY}", push: true },
+    { "type" : "image", "name": "${IMAGE_REGISTRY}/login-dev-base:${BUILD_CACHE_KEY}", push: true },
   ]
 }
 
@@ -26,6 +26,6 @@ target "login-lint" {
     { "type": "registry", "ref": "${IMAGE_REGISTRY}/login-lint-buildcache:${BUILD_CACHE_KEY}", "mode": "max" }
   ]
   output = [
-    { "type" : "image", "name": "${IMAGE_REGISTRY}/login-lint-buildcache:${BUILD_CACHE_KEY}", push: true },
+    { "type" : "image", "name": "${IMAGE_REGISTRY}/login-lint:${BUILD_CACHE_KEY}", push: true },
   ]
 }