diff --git a/docker-compose.yml b/docker-compose.yml
index 07830e8..377ad88 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,7 +20,7 @@ services:
       - .env # Load environment variables from .env file in the root
     container_name: nexus-terminal-backend
     ports:
-      - "18112:3001"
+      - "3001:3001"
     environment:
       NODE_ENV: production
       PORT: 3001
diff --git a/docker-compose.yml3 b/docker-compose.yml3
index 6fc9c46..fa85a4f 100644
--- a/docker-compose.yml3
+++ b/docker-compose.yml3
@@ -3,7 +3,7 @@ services:
     image: heavrnl/nexus-terminal-frontend
     container_name: nexus-terminal-frontend
     ports:
-      - "18111:80"
+      - "3001:80"
     depends_on:
       - backend
       - rdp # Added rdp dependency
@@ -14,7 +14,7 @@ services:
     image: heavrnl/nexus-terminal-backend
     container_name: nexus-terminal-backend
     ports:
-      - "18112:3001"
+      - "3001:3001"
     environment:
       NODE_ENV: production
       PORT: 3001
diff --git a/packages/backend/src/websocket.ts b/packages/backend/src/websocket.ts
index fdf4c97..1a96967 100644
--- a/packages/backend/src/websocket.ts
+++ b/packages/backend/src/websocket.ts
@@ -476,14 +476,17 @@ export const initializeWebSocket = async (server: http.Server, sessionParser: Re
             }
 
             // Determine RDP target URL based on deployment mode
-            const deploymentMode = process.env.DEPLOYMENT_MODE || 'docker'; // Default to docker mode
+            const deploymentMode = process.env.DEPLOYMENT_MODE; // Default to docker mode
             let rdpBaseUrl: string;
             if (deploymentMode === 'local') {
-                rdpBaseUrl = process.env.RDP_SERVICE_URL_LOCAL || 'ws://localhost:18114'; // Default for local
+                rdpBaseUrl = process.env.RDP_SERVICE_URL_LOCAL || 'ws://localhost:8081'; // Default for local, fallback to localhost:3001
                 console.log(`[WebSocket RDP Proxy] Using LOCAL deployment mode. RDP Target Base: ${rdpBaseUrl}`);
-            } else {
-                rdpBaseUrl = process.env.RDP_SERVICE_URL_DOCKER || 'ws://rdp:8081'; // Default for docker
+            } else if (deploymentMode === 'docker') { // Explicitly check for docker mode
+                rdpBaseUrl = process.env.RDP_SERVICE_URL_DOCKER || 'ws://rdp:8081'; // Default for docker, fallback to localhost:3001
                 console.log(`[WebSocket RDP Proxy] Using DOCKER deployment mode. RDP Target Base: ${rdpBaseUrl}`);
+            } else { // Handle unknown modes
+                rdpBaseUrl = 'ws://localhost:8081'; // Fallback to a safe default for unknown modes
+                console.warn(`[WebSocket RDP Proxy] Unknown deployment mode '${deploymentMode}'. Defaulting to safe fallback RDP Target Base: ${rdpBaseUrl}`);
             }
 
             // Ensure base URL doesn't end with a slash before appending query params
diff --git a/packages/frontend/src/components/RemoteDesktopModal.vue b/packages/frontend/src/components/RemoteDesktopModal.vue
index 7004676..592c044 100644
--- a/packages/frontend/src/components/RemoteDesktopModal.vue
+++ b/packages/frontend/src/components/RemoteDesktopModal.vue
@@ -40,8 +40,7 @@ const MIN_MODAL_HEIGHT = 768;
 
 // Dynamically construct WebSocket URL based on environment
 let backendBaseUrl: string;
-// const LOCAL_BACKEND_URL = 'ws://localhost:18112'
-const LOCAL_BACKEND_URL = 'ws://localhost:8081'
+const LOCAL_BACKEND_URL = 'ws://localhost:3001'
 
 // Determine WebSocket URL based on hostname
 if (window.location.hostname === 'localhost') {