diff --git a/docker-compose.yaml b/docker-compose.yaml
index fd44d83b90dc20fb9aa82712c37e5140b72a3cf0..4722ecd72a87f8174a09257cc7b8efb9d0f3662b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -17,44 +17,53 @@ services:
   server-john:
     build: ./
     links:
-      - redis
+      - redis-server
     expose:
       - "3601"
     environment:
       - NAME=john
       - PORT=3601
+    depends_on:
+      - redis-server
+    
 
   server-paul:
     build: ./
     links:
-      - redis
+      - redis-server
     expose:
       - "3602"
     environment:
       - NAME=paul
       - PORT=3602
+    depends_on:
+      - redis-server
 
   server-george:
     build: ./
     links:
-      - redis
+      - redis-server
     expose:
       - "3603"
     environment:
       - NAME=george
       - PORT=3603
+    depends_on:
+      - redis-server
 
   server-ringo:
     build: ./
     links:
-      - redis
+      - redis-server
     expose:
       - "3604"
     environment:
       - NAME=ringo
       - PORT=3604
+    depends_on:
+      - redis-server
 
-  redis:
+  redis-server:
     image: redis
     ports:
       - "6379:6379"
diff --git a/index.js b/index.js
index 1cb039397b41db78ef075d1abb8eda5442ccacb0..c93eefd7db40aa85426d233415f9c239b20a9886 100644
--- a/index.js
+++ b/index.js
@@ -34,10 +34,10 @@ const { resolve } = require('path');
 const User = require('./models/user');
 var port = process.env.PORT || 3000;
 const redis = require('socket.io-redis');
-const { createAdapter } = require('@socket.io/redis-adapter');
 const { createClient } = require('redis');
+const { createAdapter } = require('@socket.io/redis-adapter');
 
-const pubClient = createClient({ url: "redis://192.168.0.230:6379" });
+const pubClient = createClient({ host: 'host.docker.internal', port: 6379});
 const subClient = pubClient.duplicate();
 
 io.adapter(createAdapter(pubClient, subClient));
@@ -298,7 +298,7 @@ io.on('connection', (socket) => {
       console.log("Received Message: " + msg);
       messageCounterOut.inc(activeUsers.size);
 
-      io.emit('chat message', {
+     socket.emit('chat message', {
         msg : msg,
         name : name,
         dateTime: dateTime