diff --git a/apps/login/src/lib/self.ts b/apps/login/src/lib/self.ts
index c67005a346..0328adfaff 100644
--- a/apps/login/src/lib/self.ts
+++ b/apps/login/src/lib/self.ts
@@ -1,6 +1,6 @@
 "use server";
 
-import { createServerTransport } from "@zitadel/client";
+import { createServerTransport } from "@zitadel/client/node";
 import { createUserServiceClient } from "@zitadel/client/v2";
 import { getSessionCookieById } from "./cookies";
 import { getSession } from "./zitadel";
diff --git a/apps/login/src/lib/server/password.ts b/apps/login/src/lib/server/password.ts
index 2a1b646c27..76bb1f4482 100644
--- a/apps/login/src/lib/server/password.ts
+++ b/apps/login/src/lib/server/password.ts
@@ -14,7 +14,8 @@ import {
   setPassword,
   setUserPassword,
 } from "@/lib/zitadel";
-import { create, createServerTransport } from "@zitadel/client";
+import { create } from "@zitadel/client";
+import { createServerTransport } from "@zitadel/client/node";
 import { createUserServiceClient } from "@zitadel/client/v2";
 import {
   Checks,
diff --git a/apps/login/src/lib/zitadel.ts b/apps/login/src/lib/zitadel.ts
index 4ab0377847..687d277fc3 100644
--- a/apps/login/src/lib/zitadel.ts
+++ b/apps/login/src/lib/zitadel.ts
@@ -1,4 +1,4 @@
-import { createServerTransport } from "@zitadel/client";
+import { createServerTransport } from "@zitadel/client/node";
 import {
   createIdpServiceClient,
   createOIDCServiceClient,
diff --git a/packages/zitadel-client/package.json b/packages/zitadel-client/package.json
index fac78870ca..1ed9f5ff73 100644
--- a/packages/zitadel-client/package.json
+++ b/packages/zitadel-client/package.json
@@ -27,6 +27,11 @@
       "types": "./dist/v3alpha.d.ts",
       "import": "./dist/v3alpha.js",
       "require": "./dist/v3alpha.cjs"
+    },
+    "./node": {
+      "types": "./dist/node.d.ts",
+      "import": "./dist/node.js",
+      "require": "./dist/node.cjs"
     }
   },
   "files": [
diff --git a/packages/zitadel-client/src/index.ts b/packages/zitadel-client/src/index.ts
index 978279cb53..7cf14163bf 100644
--- a/packages/zitadel-client/src/index.ts
+++ b/packages/zitadel-client/src/index.ts
@@ -5,5 +5,3 @@ export { NewAuthorizationBearerInterceptor } from "./interceptors";
 export { create, fromJson, toJson } from "@bufbuild/protobuf";
 export { TimestampSchema, timestampDate, timestampFromDate, timestampFromMs, timestampMs } from "@bufbuild/protobuf/wkt";
 export type { Duration, Timestamp } from "@bufbuild/protobuf/wkt";
-
-export { createServerTransport, newSystemToken } from "./grpc";
diff --git a/packages/zitadel-client/src/grpc.ts b/packages/zitadel-client/src/node.ts
similarity index 100%
rename from packages/zitadel-client/src/grpc.ts
rename to packages/zitadel-client/src/node.ts
diff --git a/packages/zitadel-client/tsup.config.ts b/packages/zitadel-client/tsup.config.ts
index 0293f4f242..bb1644b766 100644
--- a/packages/zitadel-client/tsup.config.ts
+++ b/packages/zitadel-client/tsup.config.ts
@@ -1,7 +1,7 @@
 import { defineConfig, Options } from "tsup";
 
 export default defineConfig((options: Options) => ({
-  entry: ["src/index.ts", "src/v1.ts", "src/v2.ts", "src/v3alpha.ts"],
+  entry: ["src/index.ts", "src/v1.ts", "src/v2.ts", "src/v3alpha.ts", "src/node.ts"],
   format: ["esm", "cjs"],
   treeshake: false,
   splitting: true,