diff --git a/intern/docker_esphome/templates/config/esphome_display02.yaml b/intern/docker_esphome/templates/config/esphome_display02.yaml
index f9d76f0d851e18ee2166e8cc1b414cec3589c242..e2e9b62b48aa82a1ccb6c31eb591db9a636dd258 100644
--- a/intern/docker_esphome/templates/config/esphome_display02.yaml
+++ b/intern/docker_esphome/templates/config/esphome_display02.yaml
@@ -17,7 +17,6 @@ external_components:
     refresh: 0s
 {% include "/includes/common.inc.yaml" %}
 
-
   on_message:
     - topic: ESPHome/{{ devicename }}/state/command
       payload: "ON"
diff --git a/intern/docker_esphome/templates/config/esphome_plug01.yaml b/intern/docker_esphome/templates/config/esphome_plug01.yaml
index b2f06f8eb640a89a08ee654062c8a3864e749830..a3ec409d823d1d6ec65d00c53baf9d8dd0592e4f 100644
--- a/intern/docker_esphome/templates/config/esphome_plug01.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug01.yaml
@@ -2,8 +2,10 @@
 
 {% include "/includes/ansible.inc.yaml" %}
 {% include "/includes/board.esp01_1m.inc.yaml" %}
+
+  comment: Starroof Lounge
 {% include "/includes/common.inc.yaml" %}
-# force newline
+
   on_message:
     - topic: ESPHome/{{ devicename }}/state/command
       payload: "ON"
diff --git a/intern/docker_esphome/templates/config/esphome_plug02.yaml b/intern/docker_esphome/templates/config/esphome_plug02.yaml
index 2684a64f37667c92511d265c93e230ff78e54eda..0bad6f3dbbb296446aa9fbd491f309f96de4109d 100644
--- a/intern/docker_esphome/templates/config/esphome_plug02.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug02.yaml
@@ -2,8 +2,10 @@
 
 {% include "/includes/ansible.inc.yaml" %}
 {% include "/includes/board.esp01_1m.inc.yaml" %}
+
+  comment: LED Theke
 {% include "/includes/common.inc.yaml" %}
-# force newline
+
   on_message:
     - topic: ESPHome/{{ devicename }}/state/command
       payload: "ON"
diff --git a/intern/docker_esphome/templates/config/esphome_plug03.yaml b/intern/docker_esphome/templates/config/esphome_plug03.yaml
index 89c95ce91493930877932d989ba7b103cf0bca5e..0048c0c3bdf333ad9e3fc5819579a85ef103b29f 100644
--- a/intern/docker_esphome/templates/config/esphome_plug03.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug03.yaml
@@ -2,8 +2,10 @@
 
 {% include "/includes/ansible.inc.yaml" %}
 {% include "/includes/board.esp01_1m.inc.yaml" %}
+
+  comment: Fernseher Lounge
 {% include "/includes/common.inc.yaml" %}
-# force newline
+
   on_message:
     - topic: ESPHome/{{ devicename }}/state/command
       payload: "ON"
diff --git a/intern/docker_esphome/templates/config/esphome_plug04.yaml b/intern/docker_esphome/templates/config/esphome_plug04.yaml
index c31210bd9d28df9f9d941cdb467deec371c7d203..e1471832dfb1af716bb2d8abddf4958bd08a2dc5 100644
--- a/intern/docker_esphome/templates/config/esphome_plug04.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug04.yaml
@@ -2,8 +2,10 @@
 
 {% include "/includes/ansible.inc.yaml" %}
 {% include "/includes/board.esp01_1m.inc.yaml" %}
+
+  comment: Halogen Lounge
 {% include "/includes/common.inc.yaml" %}
-# force newline
+
   on_message:
     - topic: ESPHome/{{ devicename }}/state/command
       payload: "ON"
diff --git a/intern/docker_esphome/templates/config/esphome_plug05.yaml b/intern/docker_esphome/templates/config/esphome_plug05.yaml
index b6cd479286528b1d19e19b6ae6e59867d2b02414..b32bad334db71afe137ae06fdc8b3012079bc7b0 100644
--- a/intern/docker_esphome/templates/config/esphome_plug05.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug05.yaml
@@ -2,8 +2,10 @@
 
 {% include "/includes/ansible.inc.yaml" %}
 {% include "/includes/board.esp01_1m.inc.yaml" %}
+
+  comment: Propaganda Bildschirm
 {% include "/includes/common.inc.yaml" %}
-# force newline
+
   on_message:
     - topic: ESPHome/{{ devicename }}/state/command
       payload: "ON"
diff --git a/intern/docker_esphome/templates/config/esphome_plug06.yaml b/intern/docker_esphome/templates/config/esphome_plug06.yaml
index 95e2dafad337cb39cb0861c7660d42a82f4d590e..c6cb37bf52450f0d8dd29bb9939f35cd5d795ef7 100644
--- a/intern/docker_esphome/templates/config/esphome_plug06.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug06.yaml
@@ -2,8 +2,10 @@
 
 {% include "/includes/ansible.inc.yaml" %}
 {% include "/includes/board.esp01_1m.inc.yaml" %}
+
+  comment: Pixelflut Server Rack
 {% include "/includes/common.inc.yaml" %}
-# force newline
+
   on_message:
     - topic: ESPHome/{{ devicename }}/state/command
       payload: "ON"
diff --git a/intern/docker_esphome/templates/config/esphome_plug07.yaml b/intern/docker_esphome/templates/config/esphome_plug07.yaml
index 7ad6bbc23b2a98869f5a06fbb44377f83d74e639..6155b29f92b7a22f4895d8d62f13e31b7fc40d29 100644
--- a/intern/docker_esphome/templates/config/esphome_plug07.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug07.yaml
@@ -2,8 +2,10 @@
 
 {% include "/includes/ansible.inc.yaml" %}
 {% include "/includes/board.esp01_1m.inc.yaml" %}
+
+  comment: Bullhorn Kuhhorn Muuuuh!
 {% include "/includes/common.inc.yaml" %}
-# force newline
+
   on_message:
     - topic: ESPHome/{{ devicename }}/state/command
       payload: "ON"
diff --git a/intern/docker_esphome/templates/config/esphome_plug08.yaml b/intern/docker_esphome/templates/config/esphome_plug08.yaml
index 424337350e9860eb61082a859999e9c70dae4d12..de646e6b2f8e00734e96ecc969001bee794ea421 100644
--- a/intern/docker_esphome/templates/config/esphome_plug08.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug08.yaml
@@ -2,8 +2,10 @@
 
 {% include "/includes/ansible.inc.yaml" %}
 {% include "/includes/board.esp01_1m.inc.yaml" %}
+
+  comment: 3D Drucker Prusanet
 {% include "/includes/common.inc.yaml" %}
-# force newline
+
   on_message:
     - topic: ESPHome/{{ devicename }}/state/command
       payload: "ON"