diff --git a/app/server/modules/agents/controller/server.ts b/app/server/modules/agents/controller/server.ts
index d503441f..63b3f1d4 100644
--- a/app/server/modules/agents/controller/server.ts
+++ b/app/server/modules/agents/controller/server.ts
@@ -121,8 +121,8 @@ export function createAgentManagerRuntime() {
 			Bun.serve<AgentConnectionData>({
 				port: 3001,
 				async fetch(req, srv) {
-					const url = new URL(req.url);
-					const token = url.searchParams.get("token");
+					const authorizationHeader = req.headers.get("authorization");
+					const token = authorizationHeader?.slice("Bearer ".length);
 
 					if (!token) {
 						return new Response("Missing token", { status: 401 });
diff --git a/apps/agent/src/index.ts b/apps/agent/src/index.ts
index 1b545406..f9e08b6d 100644
--- a/apps/agent/src/index.ts
+++ b/apps/agent/src/index.ts
@@ -35,9 +35,11 @@ class Agent {
 		}
 
 		const url = new URL(controllerUrl);
-		url.searchParams.set("token", agentToken);
-
-		this.ws = new WebSocket(url.toString());
+		this.ws = new WebSocket(url.toString(), {
+			headers: {
+				authorization: `Bearer ${agentToken}`,
+			},
+		});
 		this.controllerSession = createControllerSession(this.ws);
 
 		this.ws.onopen = () => {
diff --git a/apps/agent/tsconfig.json b/apps/agent/tsconfig.json
index a39e28eb..e30ff81c 100644
--- a/apps/agent/tsconfig.json
+++ b/apps/agent/tsconfig.json
@@ -2,12 +2,12 @@
 	"compilerOptions": {
 		"plugins": [{ "name": "@effect/language-service" }],
 		// Environment setup & latest features
-		"lib": ["DOM", "ESNext"],
+		"lib": ["ESNext"],
 		"target": "ESNext",
 		"module": "Preserve",
 		"moduleDetection": "force",
 		"jsx": "react-jsx",
-		"types": ["bun", "node"],
+		"types": ["node", "bun"],
 		"allowJs": true,
 
 		// Bundler mode