diff --git a/config/urls.js b/config/urls.js
index 0631516..da980ec 100644
--- a/config/urls.js
+++ b/config/urls.js
@@ -6,14 +6,14 @@
 // ========================================
 // LIVE PRODUCTION URLS (Currently Active)
 // ========================================
-// const FRONTEND_URL = 'https://dashboard.codenuk.com';
-// const BACKEND_URL = 'https://backend.codenuk.com';
+const FRONTEND_URL = 'https://dashboard.codenuk.com';
+const BACKEND_URL = 'https://backend.codenuk.com';
 
 // ========================================
 // LOCAL DEVELOPMENT URLS
 // ========================================
-const FRONTEND_URL = 'http://192.168.1.17:3001';
-const BACKEND_URL = 'http://192.168.1.17:8000';
+// const FRONTEND_URL = 'http://192.168.1.17:3001';
+// const BACKEND_URL = 'http://192.168.1.17:8000';
 
 // ========================================
 // CORS CONFIGURATION (Auto-generated)
diff --git a/services/api-gateway/.env .prod b/services/api-gateway/.env .prod
index 51f650b..6d6003b 100644
--- a/services/api-gateway/.env .prod	
+++ b/services/api-gateway/.env .prod	
@@ -2,16 +2,16 @@
 NODE_ENV=development
 PORT=8000
 
-# Service Targets (for local gateway, Docker services)
-USER_AUTH_URL=http://localhost:8011
-TEMPLATE_MANAGER_URL=http://localhost:8009
-REQUIREMENT_PROCESSOR_URL=http://localhost:8001
-TECH_STACK_SELECTOR_URL=http://localhost:8002
-ARCHITECTURE_DESIGNER_URL=http://localhost:8003
-CODE_GENERATOR_URL=http://localhost:8004
-TEST_GENERATOR_URL=http://localhost:8005
-DEPLOYMENT_MANAGER_URL=http://localhost:8006
-DASHBOARD_URL=http://localhost:8008
+# Service Targets (for Docker services)
+USER_AUTH_URL=http://user-auth:8011
+TEMPLATE_MANAGER_URL=http://template-manager:8009
+REQUIREMENT_PROCESSOR_URL=http://requirement-processor:8001
+TECH_STACK_SELECTOR_URL=http://tech-stack-selector:8002
+ARCHITECTURE_DESIGNER_URL=http://architecture-designer:8003
+CODE_GENERATOR_URL=http://code-generator:8004
+TEST_GENERATOR_URL=http://test-generator:8005
+DEPLOYMENT_MANAGER_URL=http://deployment-manager:8006
+DASHBOARD_URL=http://dashboard:8008
 
 # Infrastructure
 REDIS_HOST=redis
@@ -28,10 +28,10 @@ RABBITMQ_USER=pipeline_admin
 RABBITMQ_PASSWORD=secure_rabbitmq_password
 
 # CORS
-FRONTEND_URL=http://192.168.1.17:3001
+FRONTEND_URL=https://dashboard.codenuk.com
 
 # CORS Configuration
-CORS_ORIGIN=http://192.168.1.17:3001
+CORS_ORIGIN=https://dashboard.codenuk.com
 CORS_METHODS=GET,POST,PUT,DELETE,PATCH,OPT
 IONS
 CORS_CREDENTIALS=true
\ No newline at end of file
diff --git a/services/api-gateway/src/server.js b/services/api-gateway/src/server.js
index 9162b07..6f2846f 100644
--- a/services/api-gateway/src/server.js
+++ b/services/api-gateway/src/server.js
@@ -55,7 +55,7 @@ global.io = io;
 // Service targets configuration
 const serviceTargets = {
   USER_AUTH_URL: process.env.USER_AUTH_URL || 'http://localhost:8011',
-  TEMPLATE_MANAGER_URL: process.env.TEMPLATE_MANAGER_URL || 'http://192.168.1.17:8009',
+  TEMPLATE_MANAGER_URL: process.env.TEMPLATE_MANAGER_URL || 'http://template-manager:8009',
   GIT_INTEGRATION_URL: process.env.GIT_INTEGRATION_URL || 'http://localhost:8012',
   REQUIREMENT_PROCESSOR_URL: process.env.REQUIREMENT_PROCESSOR_URL || 'http://localhost:8001',
   TECH_STACK_SELECTOR_URL: process.env.TECH_STACK_SELECTOR_URL || 'http://localhost:8002',
diff --git a/services/user-auth/env.example b/services/user-auth/env.example
index 8c3a53a..7891d21 100644
--- a/services/user-auth/env.example
+++ b/services/user-auth/env.example
@@ -16,8 +16,8 @@ GMAIL_APP_PASSWORD=your-app-password
 # Service Configuration
 PORT=8011
 NODE_ENV=development
-FRONTEND_URL=http://localhost:3000
-AUTH_PUBLIC_URL=http://localhost:8011
+FRONTEND_URL=https://dashboard.codenuk.com
+AUTH_PUBLIC_URL=https://backend.codenuk.com
 
 # Database Configuration
 POSTGRES_HOST=postgres