diff --git a/.env b/.env
index 86078c5..dea5dd0 100644
--- a/.env
+++ b/.env
@@ -1,7 +1,7 @@
 
 MONGO_URI=mongodb://mongo/
 MONGO_USER=admin
-MONGO_PASSWORD=admin321
+MONGO_PASSWORD=dwinzo_v0
 MONGO_AUTH_DB=admin
 
 API_PORT=4999
diff --git a/compose.yaml b/compose.yaml
index 7d7a0cc..f15c466 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,36 +1,50 @@
-version: '3.8'
 
 services:
   api-server:
-    build:
-      context: ./
-      dockerfile: src/api-server/Dockerfile 
+    build:  
+     context: ./  
+     dockerfile: src/api-server/Dockerfile 
     container_name: DwinzoApi_V0_end
     environment:
       NODE_ENV: development
-      MONGO_URI: mongodb://mongo-Dwinzocontainer:27017/dwinzodb
     ports:
-      - "4999:4999"
+      - "4999:4999"  
     expose:
       - 4999
+    depends_on:
+      - mongo
     networks:
       - DwinzoMajor
 
   socket-server:
-    build:
-      context: ./
+    build:   
+      context: ./  
       dockerfile: src/socket-server/Dockerfile 
     container_name: DwinzoSocket_V0_end
     environment:
       NODE_ENV: development
-      MONGO_URI: mongodb://mongo-Dwinzocontainer:27017/dwinzodb
     ports:
-      - "7999:7999"
+      - "7999:7999"  
     expose:
       - 7999
+    depends_on:
+      - mongo
     networks:
-      - DwinzoMajor
+      - DwinzoMajor  
 
+  mongo:
+    image: mongo:latest
+    container_name: mongo_V0-Dwinzocontainer
+    ports:
+      - "27022:27017"
+    volumes:
+      - mongo-data:/data/db
+    networks:
+      - DwinzoMajor  
+
+
+volumes:
+  mongo-data:  
 networks:
   DwinzoMajor:
-    external: true
\ No newline at end of file
+    driver: bridge