diff --git a/Makefile b/Makefile
index 432efe885c..194d74cf6a 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,6 @@ export LOGIN_TEST_ACCEPTANCE_OIDCRP_TAG := login-test-acceptance-oidcrp:local
 export LOGIN_TEST_ACCEPTANCE_OIDCOP_TAG := login-test-acceptance-oidcop:local
 export LOGIN_TEST_ACCEPTANCE_SAMLSP_TAG := login-test-acceptance-samlsp:local
 export LOGIN_TEST_ACCEPTANCE_SAMLIDP_TAG := login-test-acceptance-samlidp:local
-export LOGIN_CLIENT_TAG := login-client:local
 export POSTGRES_TAG := postgres:17.0-alpine3.19
 export GOLANG_TAG := golang:1.24-alpine
 # TODO: use ghcr.io/zitadel/zitadel:latest
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 945dc9b073..4d3fcbd066 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -39,17 +39,12 @@ target "login-lint" {
   tags = ["${LOGIN_LINT_TAG}"]
 }
 
-variable "LOGIN_CLIENT_TAG" {
-  default = "login-client:local"
-}
-
 target "login-client" {
   dockerfile = "dockerfiles/login-client.Dockerfile"
   contexts = {
     login-pnpm              = "target:login-pnpm"
     typescript-proto-client = "target:typescript-proto-client"
   }
-  tags = ["${LOGIN_CLIENT_TAG}"]
 }
 
 target "typescript-proto-client" {
@@ -78,6 +73,7 @@ target "core-mock" {
   contexts = {
     protos = "target:proto-files"
   }
+  output = ["type=docker"]
   tags = ["${CORE_MOCK_TAG}"]
 }
 
@@ -118,4 +114,5 @@ target "login-standalone" {
     login-client = "target:login-client"
   }
   tags = ["${LOGIN_TAG}"]
+  output = ["type=docker"]
 }