diff --git a/Makefile b/Makefile
index c1280810bc..e7b863dc72 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export LOGIN_TEST_ACCEPTANCE_SAMLIDP_TAG := login-test-acceptance-samlidp:${DOCK
 export POSTGRES_TAG := postgres:17.0-alpine3.19
 export GOLANG_TAG := golang:1.24-alpine
 export ZITADEL_TAG ?= ghcr.io/zitadel/zitadel:latest
-export CORE_MOCK_TAG := login-core-mock:${DOCKER_METADATA_OUTPUT_VERSION}
+export LOGIN_CORE_MOCK_TAG := login-core-mock:${DOCKER_METADATA_OUTPUT_VERSION}
 
 login_help:
 	@echo "Makefile for the login service"
diff --git a/apps/login/package.json b/apps/login/package.json
index 49c06d8c3a..f498b912c2 100644
--- a/apps/login/package.json
+++ b/apps/login/package.json
@@ -5,6 +5,7 @@
   "scripts": {
     "dev": "pnpm next dev --turbopack",
     "test:unit": "pnpm vitest",
+    "test:unit:standalone": "pnpm test:unit",
     "test:unit:watch": "pnpm test:unit --watch",
     "lint": "pnpm exec next lint && pnpm exec prettier --check .",
     "lint:fix": "pnpm exec prettier --write .",
diff --git a/apps/login/turbo.json b/apps/login/turbo.json
index 030d45d581..bc63a2dbc4 100644
--- a/apps/login/turbo.json
+++ b/apps/login/turbo.json
@@ -14,6 +14,7 @@
     "test:unit": {
       "dependsOn": ["@zitadel/client#build"]
     },
+    "test:unit:standalone": {},
     "test:watch": {
       "dependsOn": ["@zitadel/client#build"]
     }
diff --git a/docker-bake.hcl b/docker-bake.hcl
index b5f3ea7406..3d98c09b2c 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -82,7 +82,7 @@ target "login-client" {
 }
 
 variable "LOGIN_CORE_MOCK_TAG" {
-  default = "core-mock:local"
+  default = "login-core-mock:local"
 }
 
 # the core-mock context must not be overwritten, so we don't prefix it with login-.
diff --git a/dockerfiles/login-client.Dockerfile b/dockerfiles/login-client.Dockerfile
index 783bc92062..107c9e1846 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-client/package.json ./packages/zitadel-client/
+RUN ls -la
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
     pnpm install --frozen-lockfile --workspace-root --filter ./packages/zitadel-client
-COPY packages/zitadel-client packages/zitadel-client
+COPY packages/zitadel-client ./packages/zitadel-client
 RUN pnpm build:client:standalone
diff --git a/dockerfiles/login-test-unit.Dockerfile b/dockerfiles/login-test-unit.Dockerfile
index b0cfdbd086..d456a4fac4 100644
--- a/dockerfiles/login-test-unit.Dockerfile
+++ b/dockerfiles/login-test-unit.Dockerfile
@@ -3,4 +3,4 @@ COPY apps/login/package.json ./apps/login/
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
     pnpm install --frozen-lockfile --workspace-root --filter ./apps/login
 COPY apps/login ./apps/login
-RUN cd apps/login && pnpm test:unit
+RUN pnpm test:unit:standalone
diff --git a/package.json b/package.json
index 8b33aee194..ce844c4b2c 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "start": "pnpm exec turbo run start",
     "start:built": "pnpm exec turbo run start:built",
     "test:unit": "pnpm exec turbo run test:unit -- --passWithNoTests",
+    "test:unit:standalone": "pnpm exec turbo run test:unit:standalone -- --passWithNoTests",
     "test:integration": "cd apps/login-test-integration && pnpm test:integration",
     "test:integration:setup": "NODE_ENV=test pnpm exec turbo run test:integration:setup",
     "test:acceptance": "cd apps/login-test-acceptance && pnpm test:acceptance",