diff --git a/docker-compose.yaml b/docker-compose.yaml
index c254467..db0d7f4 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,7 +1,7 @@
 services:
   joplin:
     image: joplin/server:latest
-    container_name: server
+    container_name: joplin-server
     restart: always
     environment:
       APP_PORT: 8030
@@ -20,7 +20,7 @@ services:
     image: gri38/django-joplin-vieweb:latest
     container_name: vieweb
     depends_on:
-      - terminal-xapi
+      - joplin-terminal-xapi
     environment:
       ORIGINS: "'https://joplin.adamoutler.com','https://server.joplin.adamoutler.com', 'http://192.168.1.115:8083','http://192.168.1.115:8088','http://192.168.1.115:8089'"
       CERT_DOMAIN: joplin.adamoutler.com
@@ -34,7 +34,7 @@ services:
     networks:
       - joplin-net
   terminal-xapi:
-    container_name: terminal-xapi
+    container_name: joplin-terminal-xapi
     image: gri38/joplin-terminal-xapi:latest
     restart: unless-stopped
     environment: