diff --git a/heimdall/docker-compose.yaml b/heimdall/docker-compose.yaml
index 60dd0cd..daf24f5 100644
--- a/heimdall/docker-compose.yaml
+++ b/heimdall/docker-compose.yaml
@@ -20,7 +20,6 @@ services:
       - "traefik.http.routers.heimdall.entrypoints=web"
       - "traefik.http.services.heimdall.loadbalancer.server.port=80"
       - "docker.group=selfhost"
-      - "docker.group=heimdall"
     restart: unless-stopped
 
 networks:
diff --git a/portainer/docker-compose.yaml b/portainer/docker-compose.yaml
index a69083a..2c281b5 100644
--- a/portainer/docker-compose.yaml
+++ b/portainer/docker-compose.yaml
@@ -18,7 +18,6 @@ services:
       - "traefik.http.routers.portainer.entrypoints=web"
       - "traefik.http.services.portainer.loadbalancer.server.port=9000"
       - "docker.group=selfhost"
-      - "docker.group=portainer"
     restart: unless-stopped
 
 networks:
diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml
index f7ae564..404d48b 100644
--- a/proxy/docker-compose.yaml
+++ b/proxy/docker-compose.yaml
@@ -22,7 +22,7 @@ services:
       - "traefik.http.routers.traefik.rule=Host(`traefik.${DOMAIN}`)"
       - "traefik.http.routers.traefik.entrypoints=web"
       - "traefik.http.services.traefik.loadbalancer.server.port=8080"
-      - "docker.group=proxy"
+      - "docker.group=selfhost"
     extra_hosts:
       - host.docker.internal:172.17.0.1
 
@@ -36,7 +36,7 @@ services:
       - "traefik.http.routers.whoami.rule=Host(`whoami.${DOMAIN}`)"
       - "traefik.http.routers.whoami.entrypoints=web"
       - "traefik.http.services.whoami.loadbalancer.server.port=80"
-      - "docker.group=proxy"
+      - "docker.group=selfhost"
     restart: unless-stopped
 
 
diff --git a/download/docker-compose.yaml b/pyload/docker-compose.yaml
similarity index 84%
rename from download/docker-compose.yaml
rename to pyload/docker-compose.yaml
index f1c0acf..ba39202 100644
--- a/download/docker-compose.yaml
+++ b/pyload/docker-compose.yaml
@@ -17,11 +17,10 @@ services:
       - web
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.pyload.rule=Host(`download.${DOMAIN}`)"
+      - "traefik.http.routers.pyload.rule=Host(`pyload.${DOMAIN}`)"
       - "traefik.http.routers.pyload.entrypoints=web"
       - "traefik.http.services.pyload.loadbalancer.server.port=8000"
       - "docker.group=selfhost"
-      - "docker.group=download"
     restart: unless-stopped
 
 
diff --git a/smartHome/docker-compose.yaml b/smartHome/docker-compose.yaml
index f1b89dd..ae7381e 100644
--- a/smartHome/docker-compose.yaml
+++ b/smartHome/docker-compose.yaml
@@ -15,7 +15,7 @@ services:
       - "traefik.http.routers.hassi.rule=Host(`hassi.${DOMAIN}`)"
       - "traefik.http.routers.hassi.entrypoints=web"
       - "traefik.http.services.hassi.loadbalancer.server.port=8123"
-      - "docker.group=smartHome"
+      - "docker.group=selfhost"
 
   deconz:
     image: marthoc/deconz
@@ -43,4 +43,4 @@ services:
       - "traefik.http.routers.deconz.rule=Host(`deconz.${DOMAIN}`)"
       - "traefik.http.routers.deconz.entrypoints=web"
       - "traefik.http.services.deconz.loadbalancer.server.port=8080"
-      - "docker.group=smartHome"
+      - "docker.group=selfhost"
diff --git a/torrent/docker-compose.yaml b/torrent/docker-compose.yaml
index c10d722..898746e 100644
--- a/torrent/docker-compose.yaml
+++ b/torrent/docker-compose.yaml
@@ -31,7 +31,7 @@ services:
       - "traefik.http.middlewares.torrentHeader.headers.customRequestHeaders.Referer="
       - "traefik.http.middlewares.torrentHeader.headers.customRequestHeaders.Origin="
       - "traefik.http.routers.torrent.middlewares=torrentHeader" 
-      - "docker.group=torrent"
+      - "docker.group=selfhost"
     restart: unless-stopped
 
 #  transmission:
@@ -59,7 +59,7 @@ services:
 #      - "traefik.http.routers.torrent.rule=Host(`torrent.${DOMAIN}`)"
 #      - "traefik.http.routers.torrent.entrypoints=web"
 #      - "traefik.http.services.torrent.loadbalancer.server.port=9091"
-#      - "docker.group=torrent"
+#      - "docker.group=selfhost"
 #    restart: unless-stopped