diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0965f122b5..e2d58e6860 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -40,6 +40,5 @@ jobs:
         with:
           push: false
           builder: ${{ steps.buildx.outputs.name }}
-          load: true
       - name: Run
         run: make login-lint
diff --git a/dockerfiles/login-dev-base.Dockerfile b/dockerfiles/login-dev-base.Dockerfile
index b1e457ad4a..9f77f0703d 100644
--- a/dockerfiles/login-dev-base.Dockerfile
+++ b/dockerfiles/login-dev-base.Dockerfile
@@ -1,4 +1,4 @@
 FROM login-pnpm AS login-dev-base
-RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
-    pnpm install --frozen-lockfile --workspace-root --filter .
+RUN --mount=type=cache,target=${PNPM_HOME} \
+    pnpm install --frozen-lockfile --prefer-offline --workspace-root --filter .
 
diff --git a/dockerfiles/login-lint.Dockerfile b/dockerfiles/login-lint.Dockerfile
index 1935981ee9..7094712fa9 100644
--- a/dockerfiles/login-lint.Dockerfile
+++ b/dockerfiles/login-lint.Dockerfile
@@ -4,6 +4,6 @@ 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
+RUN --mount=type=cache,target=${PNPM_HOME} \
+    pnpm install --frozen-lockfile --prefer-offline --workspace-root --filter zitadel-login
 COPY apps/login apps/login
diff --git a/dockerfiles/login-pnpm.Dockerfile b/dockerfiles/login-pnpm.Dockerfile
index 23bb4d84fa..596f376b3f 100644
--- a/dockerfiles/login-pnpm.Dockerfile
+++ b/dockerfiles/login-pnpm.Dockerfile
@@ -1,10 +1,14 @@
-FROM node:20-bookworm AS login-base
+FROM node:20-bookworm AS login-pnpm
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable
 RUN apt-get update && apt-get install -y --no-install-recommends && \
     rm -rf /var/lib/apt/lists/*
 WORKDIR /build
+
+RUN  --mount=type=cache,target=${PNPM_HOME} \
+  pnpm config set store-dir ${PNPM_HOME}
+
 COPY \
   turbo.json \
   .npmrc \