diff --git a/.github/workflows/login-container.yml b/.github/workflows/login-container.yml
index 00011635e1..d934a93ca8 100644
--- a/.github/workflows/login-container.yml
+++ b/.github/workflows/login-container.yml
@@ -77,6 +77,17 @@ jobs:
         with:
           builder: ${{ steps.setup-buildx.outputs.name }}
           cache-dir: .artifacts/login-build-cache-mount
+          cache-map: |
+            {
+              ".artifacts/login-build-cache-mount/pnpm":{
+                "id":"pnpm",
+                "target":"/pnpm/store"
+              },
+              ".artifacts/login-build-cache-mount/turbo":{
+                "id":"turbo",
+                "target":"/build/.turbo"
+              }
+            }
           dockerfile: build/login/Dockerfile
           skip-extraction: ${{ steps.cache.outputs.cache-hit }}        
       - name: Bake login multi-arch
diff --git a/build/login/Dockerfile b/build/login/Dockerfile
index 5920bf6575..79654e61a4 100644
--- a/build/login/Dockerfile
+++ b/build/login/Dockerfile
@@ -32,8 +32,8 @@ RUN --mount=type=cache,id=turbo,target=/build/.turbo \
 
 FROM scratch AS build-out
 COPY /apps/login/public ./apps/login/public
-COPY --from=builder /app/apps/login/.next/standalone ./
-COPY --from=builder /app/apps/login/.next/static ./apps/login/.next/static
+COPY --from=builder /build/apps/login/.next/standalone ./
+COPY --from=builder /build/apps/login/.next/static ./apps/login/.next/static
 
 FROM runtime AS login-standalone
 WORKDIR /runtime