diff --git a/apps/login/turbo.json b/apps/login/turbo.json
new file mode 100644
index 00000000000..601cd33efbc
--- /dev/null
+++ b/apps/login/turbo.json
@@ -0,0 +1,40 @@
+{
+  "extends": [
+    "//"
+  ],
+  "pipeline": {
+    "build": {
+      "outputs": [
+        "dist/**",
+        ".next/**",
+        "!.next/cache/**"
+      ],
+      "dependsOn": [
+        "^build"
+      ]
+    },
+    "test": {
+      "dependsOn": [
+        "@zitadel/server#build",
+        "@zitadel/react#build"
+      ]
+    },
+    "test:integration": {
+      "dependsOn": [
+        "@zitadel/server#build",
+        "@zitadel/react#build"
+      ]
+    },
+    "test:unit": {
+      "dependsOn": [
+        "@zitadel/server#build"
+      ]
+    },
+    "test:watch": {
+      "dependsOn": [
+        "@zitadel/server#build",
+        "@zitadel/react#build"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/zitadel-client/turbo.json b/packages/zitadel-client/turbo.json
new file mode 100644
index 00000000000..6a06c80fa1e
--- /dev/null
+++ b/packages/zitadel-client/turbo.json
@@ -0,0 +1,12 @@
+{
+  "extends": [
+    "//"
+  ],
+  "pipeline": {
+    "generate": {
+      "outputs": [
+        "src/proto/**"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/zitadel-server/turbo.json b/packages/zitadel-server/turbo.json
new file mode 100644
index 00000000000..6a06c80fa1e
--- /dev/null
+++ b/packages/zitadel-server/turbo.json
@@ -0,0 +1,12 @@
+{
+  "extends": [
+    "//"
+  ],
+  "pipeline": {
+    "generate": {
+      "outputs": [
+        "src/proto/**"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/turbo.json b/turbo.json
index 9e9b027dca9..b082f5491ab 100644
--- a/turbo.json
+++ b/turbo.json
@@ -12,7 +12,9 @@
     "test": {},
     "test:unit": {},
     "test:integration": {},
-    "test:watch": {},
+    "test:watch": {
+      "persistent": true
+    },
     "lint": {},
     "lint:fix": {},
     "dev": {
@@ -21,49 +23,6 @@
     },
     "clean": {
       "cache": false
-    },
-    "@zitadel/server#generate": {
-      "outputs": [
-        "src/proto/**"
-      ]
-    },
-    "@zitadel/client#generate": {
-      "outputs": [
-        "src/proto/**"
-      ]
-    },
-    "@zitadel/login#build": {
-      "outputs": [
-        "dist/**",
-        ".next/**",
-        "!.next/cache/**"
-      ],
-      "dependsOn": [
-        "^build"
-      ]
-    },
-    "@zitadel/login#test": {
-      "dependsOn": [
-        "@zitadel/server#build",
-        "@zitadel/react#build"
-      ]
-    },
-    "@zitadel/login#test:integration": {
-      "dependsOn": [
-        "@zitadel/server#build",
-        "@zitadel/react#build"
-      ]
-    },
-    "@zitadel/login#test:unit": {
-      "dependsOn": [
-        "@zitadel/server#build"
-      ]
-    },
-    "@zitadel/login#test:watch": {
-      "dependsOn": [
-        "@zitadel/server#build",
-        "@zitadel/react#build"
-      ]
     }
   },
   "globalDependencies": [