diff --git a/Dockers/socket-broker/Dockerfile b/Dockers/socket-broker/Dockerfile
index 0ea2cef..0e6ba9b 100644
--- a/Dockers/socket-broker/Dockerfile
+++ b/Dockers/socket-broker/Dockerfile
@@ -21,11 +21,10 @@ RUN chown -R nodejs:nodejs /app
 USER nodejs
 
 # Expose ports
-EXPOSE 3000 8080
+EXPOSE 3000
 
 # Set default environment variables
 ENV WS_PORT=3000
-ENV API_PORT=8080
 ENV API_KEY=default-api-key-change-me
 
 # Health check
diff --git a/Dockers/socket-broker/index.js b/Dockers/socket-broker/index.js
index 2f0a231..0cacd75 100644
--- a/Dockers/socket-broker/index.js
+++ b/Dockers/socket-broker/index.js
@@ -245,18 +245,15 @@ app.post('/publish/:topic', authenticateApiKey, (req, res) => {
 
 // Start servers
 const WS_PORT = process.env.WS_PORT || 3000;
-const API_PORT = process.env.API_PORT || 8080;
+const API_PORT = process.env.WS_PORT || 3000; // Use same port for both
 
-// Start WebSocket server
-io.listen(WS_PORT);
-console.log(`WebSocket server running on port ${WS_PORT}`);
-
-// Start HTTP API server
-app.listen(API_PORT, () => {
-    console.log(`HTTP API server running on port ${API_PORT}`);
+// Start HTTP API server (Socket.IO will be served on the same port)
+server.listen(API_PORT, () => {
+    console.log(`HTTP API and WebSocket server running on port ${API_PORT}`);
     console.log(`Health check: http://localhost:${API_PORT}/health`);
     console.log(`Topics: http://localhost:${API_PORT}/topics`);
     console.log(`Publish: POST http://localhost:${API_PORT}/publish`);
+    console.log(`WebSocket connections: ws://localhost:${API_PORT}`);
     console.log(`API Key configured: ${API_KEY !== 'default-api-key-change-me' ? 'Yes' : 'No (using default)'}`);
     if (API_KEY === 'default-api-key-change-me') {
         console.log(`⚠️  WARNING: Using default API key. Set API_KEY environment variable for production!`);