diff --git a/services/adguardhome/docker-compose.yml b/services/adguardhome/docker-compose.yml
index ecdcd96..a523646 100644
--- a/services/adguardhome/docker-compose.yml
+++ b/services/adguardhome/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/audiobookshelf/docker-compose.yml b/services/audiobookshelf/docker-compose.yml
index 589a815..5b58c1b 100644
--- a/services/audiobookshelf/docker-compose.yml
+++ b/services/audiobookshelf/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/bazarr/docker-compose.yml b/services/bazarr/docker-compose.yml
index b0ffa67..0583043 100644
--- a/services/bazarr/docker-compose.yml
+++ b/services/bazarr/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/beszel/agent/docker-compose.yml b/services/beszel/agent/docker-compose.yml
index f974d04..795972d 100644
--- a/services/beszel/agent/docker-compose.yml
+++ b/services/beszel/agent/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/beszel/hub/docker-compose.yml b/services/beszel/hub/docker-compose.yml
index 9e65e0c..61ba8c1 100644
--- a/services/beszel/hub/docker-compose.yml
+++ b/services/beszel/hub/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/changedetection/docker-compose.yml b/services/changedetection/docker-compose.yml
index 6295725..7888b4f 100644
--- a/services/changedetection/docker-compose.yml
+++ b/services/changedetection/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/clipcascade/docker-compose.yml b/services/clipcascade/docker-compose.yml
index 58c2e56..082e02e 100644
--- a/services/clipcascade/docker-compose.yml
+++ b/services/clipcascade/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/cyberchef/docker-compose.yml b/services/cyberchef/docker-compose.yml
index dbdec66..24cc2a6 100644
--- a/services/cyberchef/docker-compose.yml
+++ b/services/cyberchef/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/ddns-updater/docker-compose.yml b/services/ddns-updater/docker-compose.yml
index 3b77438..57234fb 100644
--- a/services/ddns-updater/docker-compose.yml
+++ b/services/ddns-updater/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/dozzle/docker-compose.yml b/services/dozzle/docker-compose.yml
index e565764..7554209 100644
--- a/services/dozzle/docker-compose.yml
+++ b/services/dozzle/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/excalidraw/docker-compose.yml b/services/excalidraw/docker-compose.yml
index 4671d60..2d4b2ab 100644
--- a/services/excalidraw/docker-compose.yml
+++ b/services/excalidraw/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/gokapi/docker-compose.yml b/services/gokapi/docker-compose.yml
index 3c71b6e..5af2622 100644
--- a/services/gokapi/docker-compose.yml
+++ b/services/gokapi/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/homarr/docker-compose.yml b/services/homarr/docker-compose.yml
index 327ef2d..b320af0 100644
--- a/services/homarr/docker-compose.yml
+++ b/services/homarr/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/isley/docker-compose.yml b/services/isley/docker-compose.yml
index dc39efb..8227898 100644
--- a/services/isley/docker-compose.yml
+++ b/services/isley/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/it-tools/docker-compose.yml b/services/it-tools/docker-compose.yml
index dbdec66..24cc2a6 100644
--- a/services/it-tools/docker-compose.yml
+++ b/services/it-tools/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/jellyfin/docker-compose.yml b/services/jellyfin/docker-compose.yml
index 8dc0acc..22149c1 100644
--- a/services/jellyfin/docker-compose.yml
+++ b/services/jellyfin/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/languagetool/docker-compose.yml b/services/languagetool/docker-compose.yml
index 7ebe51f..585675d 100644
--- a/services/languagetool/docker-compose.yml
+++ b/services/languagetool/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/linkding/docker-compose.yml b/services/linkding/docker-compose.yml
index 288d603..16648aa 100644
--- a/services/linkding/docker-compose.yml
+++ b/services/linkding/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/nextcloud/docker-compose.yml b/services/nextcloud/docker-compose.yml
index 2869b84..94ab51f 100644
--- a/services/nextcloud/docker-compose.yml
+++ b/services/nextcloud/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/nodered/docker-compose.yml b/services/nodered/docker-compose.yml
index 5e2ae51..b9cf1ae 100644
--- a/services/nodered/docker-compose.yml
+++ b/services/nodered/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/pihole/docker-compose.yml b/services/pihole/docker-compose.yml
index 18d9103..ad39f5f 100644
--- a/services/pihole/docker-compose.yml
+++ b/services/pihole/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/pingvin-share/docker-compose.yml b/services/pingvin-share/docker-compose.yml
index f7faab6..9697d89 100644
--- a/services/pingvin-share/docker-compose.yml
+++ b/services/pingvin-share/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/plex/docker-compose.yml b/services/plex/docker-compose.yml
index 3189e99..78db5f0 100644
--- a/services/plex/docker-compose.yml
+++ b/services/plex/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/portainer/docker-compose.yml b/services/portainer/docker-compose.yml
index a5c54b5..b3bdd9c 100644
--- a/services/portainer/docker-compose.yml
+++ b/services/portainer/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/qbittorrent/docker-compose.yml b/services/qbittorrent/docker-compose.yml
index e356587..f3b3acd 100644
--- a/services/qbittorrent/docker-compose.yml
+++ b/services/qbittorrent/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/radarr/docker-compose.yml b/services/radarr/docker-compose.yml
index 5d757ac..a25c932 100644
--- a/services/radarr/docker-compose.yml
+++ b/services/radarr/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/resilio-sync/docker-compose.yml b/services/resilio-sync/docker-compose.yml
index 6404970..7d62ba0 100644
--- a/services/resilio-sync/docker-compose.yml
+++ b/services/resilio-sync/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/searxng/docker-compose.yml b/services/searxng/docker-compose.yml
index 52c94ee..1e1edd0 100644
--- a/services/searxng/docker-compose.yml
+++ b/services/searxng/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/slink/docker-compose.yml b/services/slink/docker-compose.yml
index 6bb026c..27db5f4 100644
--- a/services/slink/docker-compose.yml
+++ b/services/slink/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/sonarr/docker-compose.yml b/services/sonarr/docker-compose.yml
index a1cca00..ec9de5b 100644
--- a/services/sonarr/docker-compose.yml
+++ b/services/sonarr/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/stirlingpdf/docker-compose.yml b/services/stirlingpdf/docker-compose.yml
index bc82222..83c9fc8 100644
--- a/services/stirlingpdf/docker-compose.yml
+++ b/services/stirlingpdf/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/tailscale-exit-node/docker-compose.yml b/services/tailscale-exit-node/docker-compose.yml
index c07fdf8..80a7a72 100644
--- a/services/tailscale-exit-node/docker-compose.yml
+++ b/services/tailscale-exit-node/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/tautulli/docker-compose.yml b/services/tautulli/docker-compose.yml
index 702a408..798e19c 100644
--- a/services/tautulli/docker-compose.yml
+++ b/services/tautulli/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/technitium/docker-compose.yml b/services/technitium/docker-compose.yml
index b86bdb5..23a8985 100644
--- a/services/technitium/docker-compose.yml
+++ b/services/technitium/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/traefik/docker-compose.yml b/services/traefik/docker-compose.yml
index 9721d41..9b55356 100644
--- a/services/traefik/docker-compose.yml
+++ b/services/traefik/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/uptime-kuma/docker-compose.yml b/services/uptime-kuma/docker-compose.yml
index 962b787..c1b36eb 100644
--- a/services/uptime-kuma/docker-compose.yml
+++ b/services/uptime-kuma/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/services/vaultwarden/docker-compose.yml b/services/vaultwarden/docker-compose.yml
index bcb166a..efc4f67 100644
--- a/services/vaultwarden/docker-compose.yml
+++ b/services/vaultwarden/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
diff --git a/templates/service-template/docker-compose.yml b/templates/service-template/docker-compose.yml
index 9983c86..0b78f6a 100644
--- a/templates/service-template/docker-compose.yml
+++ b/templates/service-template/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   # Tailscale Sidecar Configuration
   tailscale:
     image: tailscale/tailscale:latest # Image to be used
-    container_name: ${SERVICE} # Name for local container management
+    container_name: tailscale-${SERVICE} # Name for local container management
     hostname: ${SERVICE} # Name used within your Tailscale environment
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}