diff --git a/.templates/deconz/service_conbee.yml b/.templates/deconz/service_conbee.yml
index c23a9a84c..58236535f 100644
--- a/.templates/deconz/service_conbee.yml
+++ b/.templates/deconz/service_conbee.yml
@@ -1,5 +1,5 @@
   deconz:
-    image: marthoc/deconz
+    image: deconzcommunity/deconz
     container_name: deconz
     restart: unless-stopped
     ports:
@@ -7,7 +7,7 @@
       - '443:443'
       - '5901:5900'
     volumes:
-      - ./volumes/deconz/:/root/.local/share/dresden-elektronik/deCONZ
+      - ./volumes/deconz/:/opt/deCONZ
     devices:
       #ConBee:
       - /dev/ttyUSB0
diff --git a/.templates/deconz/service_conbee_II.yml b/.templates/deconz/service_conbee_II.yml
index da9d99e6d..fc1651532 100644
--- a/.templates/deconz/service_conbee_II.yml
+++ b/.templates/deconz/service_conbee_II.yml
@@ -1,5 +1,5 @@
   deconz:
-    image: marthoc/deconz
+    image: deconzcommunity/deconz
     container_name: deconz
     restart: unless-stopped
     ports:
@@ -7,7 +7,7 @@
       - '443:443'
       - '5901:5900'
     volumes:
-      - ./volumes/deconz/:/root/.local/share/dresden-elektronik/deCONZ
+      - ./volumes/deconz/:/opt/deCONZ
     devices:
       #ConBee II:
       - /dev/ttyACM0
diff --git a/.templates/deconz/service_raspbee.yml b/.templates/deconz/service_raspbee.yml
index 4aedca66b..e9df13a70 100644
--- a/.templates/deconz/service_raspbee.yml
+++ b/.templates/deconz/service_raspbee.yml
@@ -1,5 +1,5 @@
   deconz:
-    image: marthoc/deconz
+    image: deconzcommunity/deconz
     container_name: deconz
     restart: unless-stopped
     ports:
@@ -7,7 +7,7 @@
       - '443:443'
       - '5901:5900'
     volumes:
-      - ./volumes/deconz/:/root/.local/share/dresden-elektronik/deCONZ
+      - ./volumes/deconz/:/opt/deCONZ
     devices:
       #RaspBee:
       - /dev/ttyAMA0