diff --git a/.github/workflows/login-container.yml b/.github/workflows/login-container.yml
index d934a93ca8..15b0733c1b 100644
--- a/.github/workflows/login-container.yml
+++ b/.github/workflows/login-container.yml
@@ -85,7 +85,11 @@ jobs:
               },
               ".artifacts/login-build-cache-mount/turbo":{
                 "id":"turbo",
-                "target":"/build/.turbo"
+                "target":"/build/.turbo/cache"
+              },
+              ".artifacts/login-build-cache-mount/next":{
+                "id":"next",
+                "target":"/build/apps/login/.next/cache"
               }
             }
           dockerfile: build/login/Dockerfile
diff --git a/apps/login/next-env-vars.d.ts b/apps/login/next-env-vars.d.ts
index b7a525858c..e7f8289ad4 100644
--- a/apps/login/next-env-vars.d.ts
+++ b/apps/login/next-env-vars.d.ts
@@ -27,6 +27,8 @@ declare namespace NodeJS {
     /**
      * Optional: custom request headers to be added to every request
      * Split by comma, key value pairs separated by colon
+     * For example: to call the Zitadel API at an internal address, you can set:
+     * `CUSTOM_REQUEST_HEADERS=Host:http://zitadel-internal:8080`
      */
     CUSTOM_REQUEST_HEADERS?: string;
   }
diff --git a/build/login/Dockerfile b/build/login/Dockerfile
index 79654e61a4..c1ce2b9d63 100644
--- a/build/login/Dockerfile
+++ b/build/login/Dockerfile
@@ -27,7 +27,8 @@ WORKDIR /build
 COPY --from=installer /install/ .
 COPY --from=pruner /prune/out/full/ .
 COPY proto ./proto
-RUN --mount=type=cache,id=turbo,target=/build/.turbo \
+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
 
 FROM scratch AS build-out