diff --git a/.github/workflows/login-container.yml b/.github/workflows/login-container.yml
index e49aa65d27..e93490c1ed 100644
--- a/.github/workflows/login-container.yml
+++ b/.github/workflows/login-container.yml
@@ -78,6 +78,6 @@ jobs:
           targets: login-standalone
           files: |
             ./apps/login/docker-bake.hcl
-            ./apps/login/docker-bake-release.hcl
+            ${{ github.event_name == 'workflow_dispatch' && './apps/login/docker-bake-release.hcl' || '' }}
             ./docker-bake.hcl
             cwd://${{ steps.login-meta.outputs.bake-file }}
diff --git a/build/login/Dockerfile b/build/login/Dockerfile
index c1ce2b9d63..35be59513c 100644
--- a/build/login/Dockerfile
+++ b/build/login/Dockerfile
@@ -27,9 +27,10 @@ WORKDIR /build
 COPY --from=installer /install/ .
 COPY --from=pruner /prune/out/full/ .
 COPY proto ./proto
+ENV CI=true
 RUN --mount=type=cache,id=turbo,target=/build/.turbo/cache \
     --mount=type=cache,id=next,target=/build/apps/login/.next/cache \
-    pnpm turbo build:login:standalone
+    pnpm turbo build:login:standalone --cache-dir=/build/.turbo/cache
 
 FROM scratch AS build-out
 COPY /apps/login/public ./apps/login/public