diff --git a/docker-bake.hcl b/docker-bake.hcl
index 3e740bf796..945dc9b073 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -20,7 +20,6 @@ variable "LOGIN_TEST_UNIT_TAG" {
 target "login-test-unit" {
   dockerfile = "dockerfiles/login-test-unit.Dockerfile"
   contexts = {
-    login-dev-base = "target:login-dev-base"
     login-client   = "target:login-client"
   }
   output = ["type=docker"]
diff --git a/dockerfiles/login-client.Dockerfile b/dockerfiles/login-client.Dockerfile
index 1d949b6a00..c43c5543cf 100644
--- a/dockerfiles/login-client.Dockerfile
+++ b/dockerfiles/login-client.Dockerfile
@@ -1,7 +1,8 @@
 FROM typescript-proto-client AS login-client
+COPY packages/zitadel-tsconfig packages/zitadel-tsconfig
+COPY packages/zitadel-proto packages/zitadel-proto
 COPY packages/zitadel-client/package.json ./packages/zitadel-client/
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
-    pnpm install --frozen-lockfile
-COPY packages/zitadel-tsconfig packages/zitadel-tsconfig
+    pnpm install --frozen-lockfile --workspace-root --filter ./packages/zitadel-client
 COPY packages/zitadel-client packages/zitadel-client
 RUN pnpm build:client:standalone
diff --git a/dockerfiles/login-dev-base.Dockerfile b/dockerfiles/login-dev-base.Dockerfile
index f2f36af652..fe34bbba7e 100644
--- a/dockerfiles/login-dev-base.Dockerfile
+++ b/dockerfiles/login-dev-base.Dockerfile
@@ -4,6 +4,6 @@ COPY \
   .npmrc \
   package.json \
   ./
-COPY apps/login/package.json ./apps/login/
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
-    pnpm install --frozen-lockfile --filter .
+    pnpm install --frozen-lockfile --workspace-root --filter .
+
diff --git a/dockerfiles/login-lint.Dockerfile b/dockerfiles/login-lint.Dockerfile
index b4b69dd17d..1935981ee9 100644
--- a/dockerfiles/login-lint.Dockerfile
+++ b/dockerfiles/login-lint.Dockerfile
@@ -3,4 +3,7 @@ COPY .prettierrc .prettierignore ./
 COPY packages/zitadel-tsconfig packages/zitadel-tsconfig
 COPY packages/zitadel-prettier-config packages/zitadel-prettier-config
 COPY packages/zitadel-eslint-config packages/zitadel-eslint-config
+COPY apps/login/package.json apps/login/
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
+    pnpm install --frozen-lockfile --workspace-root --filter zitadel-login
 COPY apps/login apps/login
diff --git a/dockerfiles/login-test-unit.Dockerfile b/dockerfiles/login-test-unit.Dockerfile
index de8ddc9983..6f8070a266 100644
--- a/dockerfiles/login-test-unit.Dockerfile
+++ b/dockerfiles/login-test-unit.Dockerfile
@@ -1,2 +1,5 @@
-FROM login-client AS login-standalone-builder
-COPY --from=login-dev-base /build/apps/login apps/login
+FROM login-client AS login-test-unit
+COPY apps/login/package.json ./apps/login/
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
+    pnpm install --frozen-lockfile --workspace-root --filter zitadel-client
+COPY apps/login ./apps/login
diff --git a/dockerfiles/typescript-proto-client.Dockerfile b/dockerfiles/typescript-proto-client.Dockerfile
index b3046bbf5a..79ee83c413 100644
--- a/dockerfiles/typescript-proto-client.Dockerfile
+++ b/dockerfiles/typescript-proto-client.Dockerfile
@@ -1,6 +1,6 @@
 FROM login-pnpm AS typescript-proto-client
 COPY packages/zitadel-proto/package.json ./packages/zitadel-proto/
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
-    pnpm install --frozen-lockfile
+    pnpm install --frozen-lockfile --workspace-root --filter zitadel-proto
 COPY packages/zitadel-proto packages/zitadel-proto
 RUN pnpm generate
diff --git a/packages/zitadel-client/package.json b/packages/zitadel-client/package.json
index 2badbb41cc..298f54f088 100644
--- a/packages/zitadel-client/package.json
+++ b/packages/zitadel-client/package.json
@@ -64,6 +64,7 @@
   },
   "devDependencies": {
     "@bufbuild/protocompile": "^0.0.1",
+    "@bufbuild/buf": "^1.53.0",
     "@zitadel/tsconfig": "workspace:*",
     "@zitadel/eslint-config": "workspace:*"
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3e883ac0b5..6cf5d9d6ac 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -268,6 +268,9 @@ importers:
         specifier: ^5.3.0
         version: 5.8.0
     devDependencies:
+      '@bufbuild/buf':
+        specifier: ^1.53.0
+        version: 1.53.0
       '@bufbuild/protocompile':
         specifier: ^0.0.1
         version: 0.0.1(@bufbuild/buf@1.53.0)