diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts
index a302bcc..f468a41 100644
--- a/apps/api/src/main.ts
+++ b/apps/api/src/main.ts
@@ -4,7 +4,13 @@ import { AppModule } from './app.module';
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
-  app.enableCors();
+  app.enableCors({
+    origin: [
+      'https://dev.reckue.com',
+      'http://localhost:3000',
+    ],
+    credentials: true,
+  });
   app.useGlobalPipes(new ValidationPipe({ whitelist: true, transform: true }));
   app.setGlobalPrefix('api');
   await app.listen(process.env.PORT ?? 3001);
diff --git a/apps/web/src/lib/api.ts b/apps/web/src/lib/api.ts
index 59fcdd1..fdbda7e 100644
--- a/apps/web/src/lib/api.ts
+++ b/apps/web/src/lib/api.ts
@@ -1,4 +1,4 @@
-const API_URL = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:3001/api';
+const API_URL = process.env.NEXT_PUBLIC_API_URL || (typeof window !== 'undefined' ? '/api' : 'http://localhost:3001/api');
 
 class ApiClient {
   private token: string | null = null;
diff --git a/apps/web/src/lib/socket.ts b/apps/web/src/lib/socket.ts
index 6a506cc..221c453 100644
--- a/apps/web/src/lib/socket.ts
+++ b/apps/web/src/lib/socket.ts
@@ -1,6 +1,6 @@
 import { io } from 'socket.io-client';
 
-const WS_URL = process.env.NEXT_PUBLIC_WS_URL || 'http://localhost:3001/ws';
+const WS_URL = process.env.NEXT_PUBLIC_WS_URL || (typeof window !== 'undefined' ? '/ws' : 'http://localhost:3001/ws');
 
 export const socket = io(WS_URL, {
   autoConnect: false,