diff --git a/esphome/aussensensor.yaml b/esphome/aussensensor.yaml
index 902bc3d..0398e64 100644
--- a/esphome/aussensensor.yaml
+++ b/esphome/aussensensor.yaml
@@ -1,12 +1,25 @@
+substitutions:
+  name: "aussensensor"
+  friendly_name: "Außensensor"
+
 esphome:
-  name: aussensensor
-  platform: ESP32
+  name: ${name}
+  friendly_name: ${friendly_name}
+  name_add_mac_suffix: false
+  project:
+    name: sensor.outdoor
+    version: "0.8"
+  min_version: 2022.1.0
+
+esp32:
   board: nodemcu-32s
+  framework:
+    type: arduino
 
 wifi:
   ssid: "Voltage-legacy"
   password: !secret voltage_legacy_psk
-  use_address: aussensensor.home  
+  use_address: ${name}.home  
   power_save_mode: high
   fast_connect: on
 
diff --git a/esphome/epaperframe.yaml b/esphome/epaperframe.yaml
index f98692b..069867f 100644
--- a/esphome/epaperframe.yaml
+++ b/esphome/epaperframe.yaml
@@ -1,7 +1,16 @@
-esphome:
+substitutions:
   name: epaperframe
-  platform: ESP32
-  board: nodemcu-32s
+  friendly_name: "Info-Dashboard"
+
+esphome:
+  name: ${name}
+  friendly_name: ${friendly_name}
+  name_add_mac_suffix: false
+  project:
+    name: dashboard.epaper
+    version: "1.0"
+  min_version: 2022.4.0
+
   on_boot:
     priority: -10
     then:
@@ -9,6 +18,11 @@ esphome:
       - display.page.show: power # temporary for power page dev
       - component.update: epaper
 
+esp32:
+  board: nodemcu-32s
+  framework:
+    type: arduino
+
 wifi:
   ssid: "Voltage-legacy"
   password: !secret voltage_legacy_psk
diff --git a/esphome/geigercounter.yaml b/esphome/geigercounter.yaml
index 42b5203..aa3ff8a 100644
--- a/esphome/geigercounter.yaml
+++ b/esphome/geigercounter.yaml
@@ -1,12 +1,25 @@
+substitutions:
+  name: "geigercounter"
+  friendly_name: "Geigerzähler"
+  
 esphome:
-  name: geigercounter
-  platform: ESP32
+  name: ${name}
+  friendly_name: ${friendly_name}
+  name_add_mac_suffix: false
+  project:
+    name: sensor.radiation
+    version: "1.0"
+  min_version: 2022.11.0
+
+esp32:
   board: nodemcu-32s
+  framework:
+    type: arduino
 
 wifi:
   ssid: "Voltage-legacy"
   password: !secret voltage_legacy_psk
-  use_address: geigercounter.home  
+  use_address: ${name}.home  
   power_save_mode: high
   fast_connect: on
 
diff --git a/esphome/livingroom.yaml b/esphome/livingroom.yaml
index 67fa10c..127f5ab 100644
--- a/esphome/livingroom.yaml
+++ b/esphome/livingroom.yaml
@@ -1,8 +1,16 @@
+substitutions:
+  name: "livingroom"
+  friendly_name: "Luftqualität Wohnzimmer"
+
 esphome:
-  name: livingroom
-  platform: ESP32
-  board: nodemcu-32s
-  
+  name: ${name}
+  friendly_name: ${friendly_name}
+  name_add_mac_suffix: false
+  project:
+    name: sensor.${name}
+    version: "1.1"
+  min_version: 2021.9.0
+
   on_boot:
     then:
       - light.turn_on:
@@ -41,10 +49,15 @@ esphome:
           id: pm25_warn
           state: "grün"
 
+esp32:
+  board: nodemcu-32s
+  framework:
+    type: arduino
+
 wifi:
   ssid: "Voltage-legacy"
   password: !secret voltage_legacy_psk
-  use_address: livingroom.home  
+  use_address: ${name}.home  
   power_save_mode: high
   fast_connect: on
 
diff --git a/esphome/m5stack-atom-echo.yaml b/esphome/m5stack-atom-echo.yaml
index ab55f55..da17c7d 100644
--- a/esphome/m5stack-atom-echo.yaml
+++ b/esphome/m5stack-atom-echo.yaml
@@ -26,7 +26,7 @@ ota:
 wifi:
   ssid: Voltage-legacy
   password: !secret voltage_legacy_psk
-  use_address: m5stack-atom-echo.home
+  use_address: ${name}.home
   power_save_mode: high
   fast_connect: on
   # Enable fallback hotspot (captive portal) in case wifi connection fails
diff --git a/esphome/raspiaudio-muse-luxe.yaml b/esphome/raspiaudio-muse-luxe.yaml
index 0a7ee08..a17dcf7 100644
--- a/esphome/raspiaudio-muse-luxe.yaml
+++ b/esphome/raspiaudio-muse-luxe.yaml
@@ -12,7 +12,7 @@ ota:
 wifi:
   ssid: Voltage-legacy
   password: !secret voltage_legacy_psk
-  use_address: raspiaudio-muse-luxe.home
+  use_address: ${name}.home
   power_save_mode: high
   fast_connect: on
   # Enable fallback hotspot (captive portal) in case wifi connection fails
diff --git a/esphome/serverroom.yaml b/esphome/serverroom.yaml
index 088ad94..2921577 100644
--- a/esphome/serverroom.yaml
+++ b/esphome/serverroom.yaml
@@ -1,5 +1,6 @@
 esphome:
   name: serverroom
+  friendly_name: "Serverraum Luft"
   platform: ESP32
   board: nodemcu-32s
 
diff --git a/esphome/sleepingroom.yaml b/esphome/sleepingroom.yaml
index 80c175f..f785094 100644
--- a/esphome/sleepingroom.yaml
+++ b/esphome/sleepingroom.yaml
@@ -1,8 +1,15 @@
+substitutions:
+  name: "sleepingroom"
+  friendly_name: "Luftqualität Schlafzimmer"
+
 esphome:
-  name: sleepingroom
-  platform: ESP32
-  board: nodemcu-32s
-  
+  name: ${name}
+  friendly_name: ${friendly_name}
+  name_add_mac_suffix: false
+  project:
+    name: sensor.${name}
+    version: "1.0"
+  min_version: 2021.9.0
   on_boot:
     then:
       - light.turn_on:
@@ -41,10 +48,15 @@ esphome:
           id: pm25_warn
           state: "grün"
 
+esp32:
+  board: nodemcu-32s
+  framework:
+    type: arduino
+
 wifi:
   ssid: "Voltage-legacy"
   password: !secret voltage_legacy_psk
-  use_address: sleepingroom.home  
+  use_address: ${name}.home  
   power_save_mode: high
   fast_connect: on