diff --git a/apps/login/next-env-vars.d.ts b/apps/login/next-env-vars.d.ts
index 773986a7c95..be266fd5a04 100644
--- a/apps/login/next-env-vars.d.ts
+++ b/apps/login/next-env-vars.d.ts
@@ -23,11 +23,11 @@ declare namespace NodeJS {
     /**
      * Self hosting: The service user id
      */
-    ZITADEL_USER_ID: string;
+    ZITADEL_SERVICE_USER_ID: string;
     /**
      * Self hosting: The service user token
      */
-    ZITADEL_USER_TOKEN: string;
+    ZITADEL_SERVICE_USER_TOKEN: string;
 
     /**
      * Optional: wheter a user must have verified email
diff --git a/turbo.json b/turbo.json
index 65e46030812..003d6c11cc7 100644
--- a/turbo.json
+++ b/turbo.json
@@ -10,9 +10,8 @@
     "SYSTEM_USER_ID",
     "SYSTEM_USER_PRIVATE_KEY",
     "ZITADEL_API_URL",
-    "ZITADEL_USER_ID",
-    "ZITADEL_USER_TOKEN",
-    "ZITADEL_SYSTEM_API_USERID"
+    "ZITADEL_SERVICE_USER_ID",
+    "ZITADEL_SERVICE_USER_TOKEN"
   ],
   "tasks": {
     "generate": {