diff --git a/jafner-tools/config/joplin/docker-compose.yml b/jafner-tools/config/joplin/docker-compose.yml
index 5b6bf79..7799b43 100644
--- a/jafner-tools/config/joplin/docker-compose.yml
+++ b/jafner-tools/config/joplin/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
   joplin:
     image: joplin/server:2.6-beta
-    container_name: joplin
+    container_name: joplin_server
     restart: unless-stopped
     env_file:
       - .env 
diff --git a/jafner-tools/config/traefik/docker-compose.yml b/jafner-tools/config/traefik/docker-compose.yml
index dc35a2d..f89738a 100644
--- a/jafner-tools/config/traefik/docker-compose.yml
+++ b/jafner-tools/config/traefik/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   traefik:
-    container_name: traefik
+    container_name: traefik_traefik
     image: traefik:latest
     restart: always
     networks:
diff --git a/jafner-tools/config/uptime-kuma/docker-compose.yml b/jafner-tools/config/uptime-kuma/docker-compose.yml
index 731b17c..f56a23c 100644
--- a/jafner-tools/config/uptime-kuma/docker-compose.yml
+++ b/jafner-tools/config/uptime-kuma/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.3'
 services:
     uptime-kuma:
         image: louislam/uptime-kuma
-        container_name: uptime-kuma
+        container_name: uptime-kuma_uptime-kuma
         restart: always
         volumes:
             - $DOCKER_DATA/data:/app/data
diff --git a/jafner-tools/config/vaultwarden/docker-compose.yml b/jafner-tools/config/vaultwarden/docker-compose.yml
index 15b59ca..05fc9a5 100644
--- a/jafner-tools/config/vaultwarden/docker-compose.yml
+++ b/jafner-tools/config/vaultwarden/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
   vaultwarden:
     image: vaultwarden/server:latest
-    container_name: vaultwarden
+    container_name: vaultwarden_vaultwarden
     restart: unless-stopped
     env_file:
       - .env
diff --git a/seedbox/config/deluge/emp/docker-compose.yml b/seedbox/config/deluge/emp/docker-compose.yml
index 38f32ff..b4e16eb 100644
--- a/seedbox/config/deluge/emp/docker-compose.yml
+++ b/seedbox/config/deluge/emp/docker-compose.yml
@@ -3,7 +3,7 @@ version: "2.1"
 services:
   deluge-emp0:
     image: linuxserver/deluge
-    container_name: deluge-emp0
+    container_name: deluge_emp0
     restart: "no"
     env_file:
       - .env
diff --git a/seedbox/config/deluge/ggn/docker-compose.yml b/seedbox/config/deluge/ggn/docker-compose.yml
index d44d4a8..fd7d2b2 100644
--- a/seedbox/config/deluge/ggn/docker-compose.yml
+++ b/seedbox/config/deluge/ggn/docker-compose.yml
@@ -3,7 +3,7 @@ version: "2.1"
 services:
   deluge-ggn0:
     image: linuxserver/deluge
-    container_name: deluge-ggn0
+    container_name: deluge_ggn0
     restart: "no"
     env_file:
       - .env
diff --git a/seedbox/config/deluge/mam/docker-compose.yml b/seedbox/config/deluge/mam/docker-compose.yml
index 6e2a5ff..da8d7ea 100644
--- a/seedbox/config/deluge/mam/docker-compose.yml
+++ b/seedbox/config/deluge/mam/docker-compose.yml
@@ -3,7 +3,7 @@ version: "2.1"
 services:
   deluge-mam0:
     image: linuxserver/deluge:amd64-2.0.0-0201906082034ubuntu18.04.1-ls23
-    container_name: deluge-mam0
+    container_name: deluge_mam0
     restart: "no"
     env_file:
       - .env
diff --git a/seedbox/config/deluge/pub/docker-compose.yml b/seedbox/config/deluge/pub/docker-compose.yml
index 3fe191b..7250318 100644
--- a/seedbox/config/deluge/pub/docker-compose.yml
+++ b/seedbox/config/deluge/pub/docker-compose.yml
@@ -3,7 +3,7 @@ version: "2.1"
 services:
   deluge-pub:
     image: linuxserver/deluge
-    container_name: deluge-pub
+    container_name: deluge_pub
     restart: "no"
     env_file:
       - .env
diff --git a/server/config/grafana-stack/docker-compose.yml b/server/config/grafana-stack/docker-compose.yml
index 89822ad..56616a9 100644
--- a/server/config/grafana-stack/docker-compose.yml
+++ b/server/config/grafana-stack/docker-compose.yml
@@ -38,7 +38,7 @@ services:
 
   grafana:
     image: mbarmem/grafana-render:latest
-    container_name: grafana+grafana
+    container_name: grafana_grafana
     restart: unless-stopped
     depends_on:
       - influxdb