diff --git a/docker-compose.build.yml b/docker-compose.build.yml
new file mode 100644
index 0000000..62bfcb5
--- /dev/null
+++ b/docker-compose.build.yml
@@ -0,0 +1,64 @@
+services:
+  frontend:
+    build:
+      context: .
+      dockerfile: packages/frontend/Dockerfile
+    image: heavrnl/nexus-terminal-frontend:latest
+    container_name: nexus-terminal-frontend
+    ports:
+      - "18111:80"
+    depends_on:
+      - backend
+      - rdp
+    networks:
+      - nexus-terminal-network
+
+  backend:
+    build:
+      context: .
+      dockerfile: packages/backend/Dockerfile
+    env_file:
+      - .env
+    image: heavrnl/nexus-terminal-backend:latest
+    container_name: nexus-terminal-backend
+    ports:
+      - "3001:3001"
+    environment:
+      NODE_ENV: production
+      PORT: 3001
+      RDP_BACKEND_API_BASE: http://rdp:9090
+    volumes:
+      - ./data:/app/data
+    networks:
+      - nexus-terminal-network
+
+  rdp:
+    build:
+      context: .
+      dockerfile: packages/rdp/Dockerfile
+    image: heavrnl/nexus-terminal-rdp:latest
+    container_name: nexus-terminal-rdp
+    environment:
+      GUACD_HOST: guacd
+      GUACD_PORT: 4822
+      API_PORT: 9090
+      GUAC_WS_PORT: 8081
+      FRONTEND_URL: http://frontend
+      MAIN_BACKEND_URL: http://backend:3001
+      NODE_ENV: production
+    networks:
+      - nexus-terminal-network
+    depends_on:
+      - guacd
+      - backend
+
+  guacd:
+    image: guacamole/guacd:latest
+    container_name: nexus-terminal-guacd
+    networks:
+      - nexus-terminal-network
+    restart: unless-stopped
+
+networks:
+  nexus-terminal-network:
+    driver: bridge
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 62bfcb5..cfecc96 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,6 @@
 services:
   frontend:
-    build:
-      context: .
-      dockerfile: packages/frontend/Dockerfile
-    image: heavrnl/nexus-terminal-frontend:latest
+    image: heavrnl/nexus-terminal-frontend
     container_name: nexus-terminal-frontend
     ports:
       - "18111:80"
@@ -14,15 +11,10 @@ services:
       - nexus-terminal-network
 
   backend:
-    build:
-      context: .
-      dockerfile: packages/backend/Dockerfile
-    env_file:
-      - .env
-    image: heavrnl/nexus-terminal-backend:latest
+    image: heavrnl/nexus-terminal-backend
     container_name: nexus-terminal-backend
-    ports:
-      - "3001:3001"
+    env_file:
+      - .env    
     environment:
       NODE_ENV: production
       PORT: 3001
@@ -33,10 +25,7 @@ services:
       - nexus-terminal-network
 
   rdp:
-    build:
-      context: .
-      dockerfile: packages/rdp/Dockerfile
-    image: heavrnl/nexus-terminal-rdp:latest
+    image: heavrnl/nexus-terminal-rdp
     container_name: nexus-terminal-rdp
     environment:
       GUACD_HOST: guacd
@@ -61,4 +50,5 @@ services:
 
 networks:
   nexus-terminal-network:
-    driver: bridge
\ No newline at end of file
+    driver: bridge
+    name: nexus-terminal-network