diff --git a/Makefile b/Makefile
index e7b863dc72..3a8327a775 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ login_test_integration_cleanup:
 login_test_integration: login_test_integration_build
 	$(LOGIN_DIR)scripts/run_or_skip.sh login_test_integration_run \
 	"$(LOGIN_TAG) \
-	$(CORE_MOCK_TAG) \
+	$(LOGIN_CORE_MOCK_TAG) \
 	$(LOGIN_TEST_INTEGRATION_TAG)"
 
 login_test_acceptance_build_bake:
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 3d98c09b2c..e44ecbc4e4 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -6,14 +6,6 @@ variable "DOCKERFILES_DIR" {
   default = "dockerfiles/"
 }
 
-variable "UID" {
-  default = "1000"
-}
-
-variable "GID" {
-  default = "1000"
-}
-
 # typescript-proto-client is used to generate the client code for the login service.
 # It is not login-prefixed, so it is easily extendable.
 # To extend this bake-file.hcl, set the context of all login-prefixed targets to a different directory.
@@ -28,8 +20,10 @@ target "typescript-proto-client" {
 }
 
 target "typescript-proto-client-out" {
-  inherits = ["typescript-proto-client"]
-  target = "typescript-proto-client-out"
+  dockerfile = "${DOCKERFILES_DIR}typescript-proto-client-out.Dockerfile"
+  contexts = {
+    typescript-proto-client = "target:typescript-proto-client"
+  }
   output = [
     "type=local,dest=packages/zitadel-proto"
   ]
diff --git a/dockerfiles/typescript-proto-client-out.Dockerfile b/dockerfiles/typescript-proto-client-out.Dockerfile
new file mode 100644
index 0000000000..3aa3c9d7d6
--- /dev/null
+++ b/dockerfiles/typescript-proto-client-out.Dockerfile
@@ -0,0 +1,5 @@
+FROM scratch AS typescript-proto-client-out
+COPY --from=typescript-proto-client /build/packages/zitadel-proto/zitadel /zitadel
+COPY --from=typescript-proto-client /build/packages/zitadel-proto/google /google
+COPY --from=typescript-proto-client /build/packages/zitadel-proto/protoc-gen-openapiv2 /protoc-gen-openapiv2
+COPY --from=typescript-proto-client /build/packages/zitadel-proto/validate /validate
diff --git a/dockerfiles/typescript-proto-client-out.Dockerfile.dockerignore b/dockerfiles/typescript-proto-client-out.Dockerfile.dockerignore
new file mode 100644
index 0000000000..72e8ffc0db
--- /dev/null
+++ b/dockerfiles/typescript-proto-client-out.Dockerfile.dockerignore
@@ -0,0 +1 @@
+*
diff --git a/dockerfiles/typescript-proto-client.Dockerfile b/dockerfiles/typescript-proto-client.Dockerfile
index a04d9e0ede..ee0848f52d 100644
--- a/dockerfiles/typescript-proto-client.Dockerfile
+++ b/dockerfiles/typescript-proto-client.Dockerfile
@@ -4,11 +4,3 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
     pnpm install --frozen-lockfile --workspace-root --filter zitadel-proto
 COPY packages/zitadel-proto ./packages/zitadel-proto
 RUN pnpm generate
-
-FROM scratch AS typescript-proto-client-out
-COPY --from=typescript-proto-client /build/packages/zitadel-proto/zitadel /zitadel
-COPY --from=typescript-proto-client /build/packages/zitadel-proto/google /google
-COPY --from=typescript-proto-client /build/packages/zitadel-proto/protoc-gen-openapiv2 /protoc-gen-openapiv2
-COPY --from=typescript-proto-client /build/packages/zitadel-proto/validate /validate
-
-FROM typescript-proto-client
diff --git a/dockerfiles/typescript-proto-client.Dockerfile.dockerignore b/dockerfiles/typescript-proto-client.Dockerfile.dockerignore
index 0db4b8402e..e11d365847 100644
--- a/dockerfiles/typescript-proto-client.Dockerfile.dockerignore
+++ b/dockerfiles/typescript-proto-client.Dockerfile.dockerignore
@@ -1,2 +1,6 @@
 *
 !/packages/zitadel-proto/
+packages/zitadel-proto/google
+packages/zitadel-proto/zitadel
+packages/zitadel-proto/protoc-gen-openapiv2
+packages/zitadel-proto/validate