diff --git a/backend/src/routes/tasks.ts b/backend/src/routes/tasks.ts
index b7a30ab..70a5243 100644
--- a/backend/src/routes/tasks.ts
+++ b/backend/src/routes/tasks.ts
@@ -5,7 +5,7 @@ import { eq, asc, desc, sql, inArray, or } from "drizzle-orm";
 import { auth } from "../lib/auth";
 
 const BEARER_TOKEN = process.env.API_BEARER_TOKEN || "hammer-dev-token";
-const CLAWDBOT_HOOK_URL = process.env.CLAWDBOT_HOOK_URL || "https://hooks.hammer.donovankelly.xyz/hooks/agent";
+const CLAWDBOT_HOOK_URL = process.env.CLAWDBOT_HOOK_URL || "https://hammer.donovankelly.xyz/hooks/agent";
 const CLAWDBOT_HOOK_TOKEN = process.env.CLAWDBOT_HOOK_TOKEN || "";
 
 // Fire webhook to Clawdbot when a task is activated
diff --git a/docker-compose.dokploy.yml b/docker-compose.dokploy.yml
index dfdd6ac..d9c90dc 100644
--- a/docker-compose.dokploy.yml
+++ b/docker-compose.dokploy.yml
@@ -23,7 +23,7 @@ services:
       BETTER_AUTH_SECRET: ${BETTER_AUTH_SECRET}
       BETTER_AUTH_URL: https://dash.donovankelly.xyz
       COOKIE_DOMAIN: .donovankelly.xyz
-      CLAWDBOT_HOOK_URL: ${CLAWDBOT_HOOK_URL:-https://hooks.hammer.donovankelly.xyz/hooks/agent}
+      CLAWDBOT_HOOK_URL: ${CLAWDBOT_HOOK_URL:-https://hammer.donovankelly.xyz/hooks/agent}
       CLAWDBOT_HOOK_TOKEN: ${CLAWDBOT_HOOK_TOKEN}
       PORT: "3100"
     depends_on:
@@ -35,7 +35,7 @@ services:
       context: ./frontend
       dockerfile: Dockerfile
       args:
-        VITE_WS_URL: ${VITE_WS_URL:-wss://ws.hammer.donovankelly.xyz}
+        VITE_WS_URL: ${VITE_WS_URL:-wss://hammer.donovankelly.xyz}
         VITE_WS_TOKEN: ${VITE_WS_TOKEN}
     ports:
       - "80"
diff --git a/frontend/src/pages/ChatPage.tsx b/frontend/src/pages/ChatPage.tsx
index f4ea229..ebdff18 100644
--- a/frontend/src/pages/ChatPage.tsx
+++ b/frontend/src/pages/ChatPage.tsx
@@ -1,8 +1,8 @@
 import { useState, useEffect, useRef, useCallback } from "react";
 import { GatewayClient } from "../lib/gateway";
 
-const WS_URL = import.meta.env.VITE_WS_URL || `wss://${window.location.hostname.replace("dash.", "ws.hammer.")}`;
-const WS_TOKEN = import.meta.env.VITE_WS_TOKEN || "";
+const WS_URL = import.meta.env.VITE_WS_URL || "wss://hammer.donovankelly.xyz";
+const WS_TOKEN = import.meta.env.VITE_WS_TOKEN || import.meta.env.VITE_GATEWAY_TOKEN || "";
 
 interface ChatMessage {
   role: "user" | "assistant" | "system";