diff --git a/heimdall/docker-compose.yaml b/dashboard/docker-compose.yaml
similarity index 88%
rename from heimdall/docker-compose.yaml
rename to dashboard/docker-compose.yaml
index 60dd0cd..03698e1 100644
--- a/heimdall/docker-compose.yaml
+++ b/dashboard/docker-compose.yaml
@@ -16,7 +16,7 @@ services:
       - web
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.heimdall.rule=Host(`heimdall.${DOMAIN}`)"
+      - "traefik.http.routers.heimdall.rule=Host(`dashboard.${DOMAIN}`)"
       - "traefik.http.routers.heimdall.entrypoints=web"
       - "traefik.http.services.heimdall.loadbalancer.server.port=80"
       - "docker.group=selfhost"
diff --git a/portainer/docker-compose.yaml b/portainer/docker-compose.yaml
index a5f0725..c85dcd1 100644
--- a/portainer/docker-compose.yaml
+++ b/portainer/docker-compose.yaml
@@ -14,7 +14,7 @@ services:
       - web
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.portainer.rule=Host(`portainer.${DOMAIN}`)"
+      - "traefik.http.routers.portainer.rule=Host(`portainer.${HOSTNAME}`)"
       - "traefik.http.routers.portainer.entrypoints=web"
       - "traefik.http.services.portainer.loadbalancer.server.port=9000"
       - "docker.group=selfhost"
diff --git a/proxy/.gitignore b/proxy/.gitignore
new file mode 100644
index 0000000..a41a8d8
--- /dev/null
+++ b/proxy/.gitignore
@@ -0,0 +1 @@
+extraProviders/
diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml
index 66ff6df..1be2b11 100644
--- a/proxy/docker-compose.yaml
+++ b/proxy/docker-compose.yaml
@@ -16,7 +16,7 @@ services:
       - "$PWD/extraProviders/:/extraProviders:ro"
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.traefik.rule=Host(`traefik.${DOMAIN}`)"
+      - "traefik.http.routers.traefik.rule=Host(`traefik.${HOSTNAME}`)"
       - "traefik.http.routers.traefik.entrypoints=web"
       - "traefik.http.services.traefik.loadbalancer.server.port=8080"
       - "docker.group=proxy"
diff --git a/proxy/extraProviders/pihole.yaml b/proxy/extraProviders/pihole.yaml
deleted file mode 100644
index 77ed268..0000000
--- a/proxy/extraProviders/pihole.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-http:
-  routers:
-    pihole:
-      rule: "Host(`pihole.lan`) || Host(`pi.hole`)"
-      service: pihole
-  services:
-    pihole:
-      loadbalancer: 
-        servers:
-          - url: "http://192.168.16.5:8081/admin/"
diff --git a/smartHome/docker-compose.yaml b/smartHome/docker-compose.yaml
index e0f5fe9..b4a829d 100644
--- a/smartHome/docker-compose.yaml
+++ b/smartHome/docker-compose.yaml
@@ -18,12 +18,12 @@ services:
       - "docker.group=smartHome"
 
   deconz:
-    image: marthoc/deconz
+    image: deconzcommunity/deconz:stable
     network_mode: host
     privileged: true
     restart: unless-stopped
     volumes:
-      - ${VOLUMES_PATH}/deCONZ:/root/.local/share/dresden-elektronik/deCONZ
+      - ${VOLUMES_PATH}/deCONZ:/opt/deCONZ
       - /etc/localtime:/etc/localtime:ro
     devices:
       - /dev/ttyACM0