diff --git a/apps/login/turbo.json b/apps/login/turbo.json
new file mode 100644
index 00000000000..402871d1f32
--- /dev/null
+++ b/apps/login/turbo.json
@@ -0,0 +1,24 @@
+{
+    "extends": [
+        "//"
+    ],
+    "pipeline": {
+        "test": {
+            "dependsOn": [
+                "@zitadel/server#build"
+            ]
+        },
+        "test:watch": {
+            "dependsOn": [
+                "@zitadel/server#build"
+            ]
+        }
+    },
+    "globalDependencies": [
+        "**/.env.*local"
+    ],
+    "globalEnv": [
+        "ZITADEL_API_URL",
+        "ZITADEL_SERVICE_USER_TOKEN"
+    ]
+}
\ No newline at end of file
diff --git a/turbo.json b/turbo.json
index 613c6420a81..87ffbce0efe 100644
--- a/turbo.json
+++ b/turbo.json
@@ -14,8 +14,8 @@
         "!.next/cache/**"
       ],
       "dependsOn": [
-        "generate",
         "lint",
+        "generate",
         "^build"
       ]
     },
@@ -27,8 +27,7 @@
     "test:watch": {
       "dependsOn": [
         "generate"
-      ],
-      "cache": false
+      ]
     },
     "lint": {},
     "dev": {
@@ -44,6 +43,11 @@
   ],
   "globalEnv": [
     "ZITADEL_API_URL",
-    "ZITADEL_SERVICE_USER_TOKEN"
+    "ZITADEL_SERVICE_USER_TOKEN",
+    "ZITADEL_SYSTEM_API_URL",
+    "ZITADEL_SYSTEM_API_USERID",
+    "ZITADEL_SYSTEM_API_KEY",
+    "ZITADEL_ISSUER",
+    "ZITADEL_ADMIN_TOKEN"
   ]
 }
\ No newline at end of file