diff --git a/calibre/compose.yml b/calibre/compose.yml
index 2d886d2..4e14c3a 100644
--- a/calibre/compose.yml
+++ b/calibre/compose.yml
@@ -1,7 +1,7 @@
 services:
   calibre-web-automated:
     image: crocodilestick/calibre-web-automated:latest
-    container_name: calibre-web-automated
+    container_name: calibre-interface
     environment:
       - PUID=1000
       - PGID=1000
@@ -24,6 +24,7 @@ services:
 
   calibre-web-automated-book-downloader:
     image: ghcr.io/calibrain/calibre-web-automated-book-downloader:latest
+    container_name: calibre-downloader
     environment:
       FLASK_PORT: 8084
       FLASK_DEBUG: false
diff --git a/cf-tunnel/compose.yml b/cf-tunnel/compose.yml
index ad1f25a..6030981 100644
--- a/cf-tunnel/compose.yml
+++ b/cf-tunnel/compose.yml
@@ -1,6 +1,7 @@
 services:
   cloudflared-public:
     image: cloudflare/cloudflared:latest
+    container_name: cf-tunnel-public
     restart: always 
     command: tunnel --no-autoupdate run
     environment:
@@ -11,6 +12,7 @@ services:
       - "com.centurylinklabs.watchtower.enable=false"
   cloudflared-internal:
     image: cloudflare/cloudflared:latest
+    container_name: cf-tunnel-internal
     restart: always
     command: tunnel --no-autoupdate run
     environment: