diff --git a/intern/docker_esphome/templates/config/esphome_display02.yaml b/intern/docker_esphome/templates/config/esphome_display02.yaml
index 549c0697c3e162a6527f377e30969c2df911c8da..a57b4fc12a8a995575e30e19fda19c5c1b28dc09 100644
--- a/intern/docker_esphome/templates/config/esphome_display02.yaml
+++ b/intern/docker_esphome/templates/config/esphome_display02.yaml
@@ -27,6 +27,10 @@ external_components:
       payload: "OFF"
       then:
         - light.turn_off: matrix_light
+    - topic: warpzone/door/status
+      payload: "CLOSED"
+      then:
+        - light.turn_off: matrix_light
 
 light:
   - platform: monochromatic
diff --git a/intern/docker_esphome/templates/config/esphome_kuehlschrank.yaml b/intern/docker_esphome/templates/config/esphome_kuehlschrank.yaml
index 954529f8ecc39b55aae44926acde47c9e2219e77..3f30d3ecdb9b7a1e65e79583f80ba8a6dfe35b62 100644
--- a/intern/docker_esphome/templates/config/esphome_kuehlschrank.yaml
+++ b/intern/docker_esphome/templates/config/esphome_kuehlschrank.yaml
@@ -28,8 +28,8 @@
 {% include "/includes/common.inc.yaml" %}
 
   on_message:
-    - topic: ESPHome/{{ devicename }}/state/command
-      payload: "ON"
+    - topic: warpzone/status/door
+      payload: "OPEN"
       then:
         - light.turn_on: 
             id: logo_led
@@ -39,8 +39,8 @@
             id: kuehl_led
             effect: "Rainbow"
             brightness: 100%
-    - topic: ESPHome/{{ devicename }}/state/command
-      payload: "OFF"
+    - topic: warpzone/door/status
+      payload: "CLOSED"
       then:
         - light.turn_off: logo_led
         - light.turn_off: kuehl_led
diff --git a/intern/docker_esphome/templates/config/esphome_plug01.yaml b/intern/docker_esphome/templates/config/esphome_plug01.yaml
index 4345033c4a2d64ed1e38fb84989ea066bac36292..efffc1d98834113d64728d3b50fd22dc430abdf6 100644
--- a/intern/docker_esphome/templates/config/esphome_plug01.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug01.yaml
@@ -15,6 +15,10 @@
       payload: "OFF"
       then:
         - switch.turn_off: relay
+    - topic: warpzone/door/status
+      payload: "CLOSED"
+      then:
+        - switch.turn_off: relay
 
 status_led:
   pin:
diff --git a/intern/docker_esphome/templates/config/esphome_plug02.yaml b/intern/docker_esphome/templates/config/esphome_plug02.yaml
index 0bad6f3dbbb296446aa9fbd491f309f96de4109d..c613318bf660449cfe0be546f739392eb6d5aab8 100644
--- a/intern/docker_esphome/templates/config/esphome_plug02.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug02.yaml
@@ -15,6 +15,10 @@
       payload: "OFF"
       then:
         - switch.turn_off: relay
+    - topic: warpzone/door/status
+      payload: "CLOSED"
+      then:
+        - switch.turn_off: relay
 
 status_led:
   pin:
diff --git a/intern/docker_esphome/templates/config/esphome_plug03.yaml b/intern/docker_esphome/templates/config/esphome_plug03.yaml
index 0048c0c3bdf333ad9e3fc5819579a85ef103b29f..07c62e6fffa956ea038aa5d3da54eb2d48d01eed 100644
--- a/intern/docker_esphome/templates/config/esphome_plug03.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug03.yaml
@@ -15,6 +15,10 @@
       payload: "OFF"
       then:
         - switch.turn_off: relay
+    - topic: warpzone/door/status
+      payload: "CLOSED"
+      then:
+        - switch.turn_off: relay
 
 status_led:
   pin:
diff --git a/intern/docker_esphome/templates/config/esphome_plug04.yaml b/intern/docker_esphome/templates/config/esphome_plug04.yaml
index e1471832dfb1af716bb2d8abddf4958bd08a2dc5..04ecaa88b5924626b31540544824ff4d3992610a 100644
--- a/intern/docker_esphome/templates/config/esphome_plug04.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug04.yaml
@@ -15,6 +15,10 @@
       payload: "OFF"
       then:
         - switch.turn_off: relay
+    - topic: warpzone/door/status
+      payload: "CLOSED"
+      then:
+        - switch.turn_off: relay
 
 status_led:
   pin:
diff --git a/intern/docker_esphome/templates/config/esphome_plug05.yaml b/intern/docker_esphome/templates/config/esphome_plug05.yaml
index 9608a94e91eae257278cfafce9e0018078cc1d71..9ba0939d86fdfa81e81b8861ca6880aa42376ce5 100644
--- a/intern/docker_esphome/templates/config/esphome_plug05.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug05.yaml
@@ -15,6 +15,10 @@
       payload: "OFF"
       then:
         - switch.turn_off: relay
+    - topic: warpzone/door/status
+      payload: "CLOSED"
+      then:
+        - switch.turn_off: relay
         
 substitutions:
   plug_name: {{ devicename }}
diff --git a/intern/docker_esphome/templates/config/esphome_plug06.yaml b/intern/docker_esphome/templates/config/esphome_plug06.yaml
index 595a4dbf96ce2737302078ec4337e20b710653a0..2940f952ca5af296d6daf0bf9099b42adb3708a0 100644
--- a/intern/docker_esphome/templates/config/esphome_plug06.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug06.yaml
@@ -15,6 +15,10 @@
       payload: "OFF"
       then:
         - switch.turn_off: relay
+    - topic: warpzone/door/status
+      payload: "CLOSED"
+      then:
+        - switch.turn_off: relay
         
 substitutions:
   plug_name: {{ devicename }}
diff --git a/intern/docker_esphome/templates/config/esphome_plug07.yaml b/intern/docker_esphome/templates/config/esphome_plug07.yaml
index cc47304b00a075009d88016c4362a6edb77ebc48..a2d482abf18ce9780563b4f8c7b19b0f95e51264 100644
--- a/intern/docker_esphome/templates/config/esphome_plug07.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug07.yaml
@@ -15,6 +15,10 @@
       payload: "OFF"
       then:
         - switch.turn_off: relay
+    - topic: warpzone/door/status
+      payload: "CLOSED"
+      then:
+        - switch.turn_off: relay
         
 substitutions:
   plug_name: {{ devicename }}
diff --git a/intern/docker_esphome/templates/config/esphome_plug08.yaml b/intern/docker_esphome/templates/config/esphome_plug08.yaml
index 5c118347681cf3e9c33bcc00bafe9d4dc6c8d106..78daa4fb7b31665d4fa95c7321ca87100e842385 100644
--- a/intern/docker_esphome/templates/config/esphome_plug08.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug08.yaml
@@ -15,6 +15,10 @@
       payload: "OFF"
       then:
         - switch.turn_off: relay
+    - topic: warpzone/door/status
+      payload: "CLOSED"
+      then:
+        - switch.turn_off: relay
         
 substitutions:
   plug_name: {{ devicename }}