diff --git a/intern/docker_esphome/templates/config/esphome_hauptraum.yaml b/intern/docker_esphome/templates/config/esphome_hauptraum.yaml
index bd6e2067b867994943d599a8f3c7e0dd003bf208..6531752b33745ac76a6c4ee883ec07ea92336d2f 100644
--- a/intern/docker_esphome/templates/config/esphome_hauptraum.yaml
+++ b/intern/docker_esphome/templates/config/esphome_hauptraum.yaml
@@ -15,7 +15,7 @@ i2c:
 
 # Sensor configs
 sensor:
-  - platform: bme280
+  - platform: bme280_i2c
     temperature:
       name: "Temp"
       oversampling: 16x
diff --git a/intern/docker_esphome/templates/config/esphome_kuehlschrank.yaml b/intern/docker_esphome/templates/config/esphome_kuehlschrank.yaml
index f15c7268ce99271f973da9694a9d185f2a40a216..b362afeda9fa9990c03518919dd66e56da98c797 100644
--- a/intern/docker_esphome/templates/config/esphome_kuehlschrank.yaml
+++ b/intern/docker_esphome/templates/config/esphome_kuehlschrank.yaml
@@ -220,12 +220,17 @@ light:
           add_led_interval: 100ms
           reverse: False
 
+i2s_audio:
+  - id: i2s_out
+    i2s_lrclk_pin: GPIO21
+    i2s_bclk_pin: GPIO19
+
+
 media_player:
   - platform: i2s_audio
     name: ESPHome I2S Media Player
     id: speaker
     dac_type: external
-    i2s_lrclk_pin: GPIO21
+    i2s_audio_id: i2s_out
     i2s_dout_pin: GPIO18
-    i2s_bclk_pin: GPIO19
     mode: mono
diff --git a/intern/docker_esphome/templates/config/esphome_popcorn.yaml b/intern/docker_esphome/templates/config/esphome_popcorn.yaml
index d3b855f24512c2e2caa4cf20a1c1c678bdc2e980..58cf3e9d9321a8be149a2c1ee055741a91a00d18 100644
--- a/intern/docker_esphome/templates/config/esphome_popcorn.yaml
+++ b/intern/docker_esphome/templates/config/esphome_popcorn.yaml
@@ -168,7 +168,7 @@ sensor:
   - platform: pid
     name: "PID HEAT Result"
     type: HEAT
-  - platform: bme280
+  - platform: bme280_i2c
     temperature:
       name: "Temp"
       oversampling: 16x
@@ -339,7 +339,7 @@ color:
     blue: 0%
 
 display:
-  - platform: ili9341
+  - platform: ili9xxx
     model: TFT 2.4
     spi_id: spi_display
     cs_pin: GPIO5
@@ -349,23 +349,23 @@ display:
     pages:
       - id: page1
         lambda: |-
-          it.printf(160,120,id(text),TextAlign::CENTER,"Booting");
+          it.printf(160,120,id(text_small),TextAlign::CENTER,"Booting");
       - id: page3
         lambda: |-
           it.printf(160,120,id(temp),TextAlign::CENTER,"%.0f°C",id(pid_heater).current_temperature);
           if ((id(pid_heater).action) == 0) {
-            it.printf(0,10,id(text),TextAlign::TOP_LEFT,"PID: OFF");
+            it.printf(0,10,id(text_small),TextAlign::TOP_LEFT,"PID: OFF");
           }
           else if ((id(pid_heater).action) == 3) {
-            it.printf(0,10,id(text),TextAlign::TOP_LEFT,"PID: HEATING");
+            it.printf(0,10,id(text_small),TextAlign::TOP_LEFT,"PID: HEATING");
           }
           else if ((id(pid_heater).action) == 4) {
-            it.printf(0,10,id(text),TextAlign::TOP_LEFT,"PID: IDLE");
+            it.printf(0,10,id(text_small),TextAlign::TOP_LEFT,"PID: IDLE");
           }
           else {
-            it.printf(0,10,id(text),TextAlign::TOP_LEFT,"PID: ERROR %d",id(pid_heater).action);
+            it.printf(0,10,id(text_small),TextAlign::TOP_LEFT,"PID: ERROR %d",id(pid_heater).action);
           };
-          it.printf(0,230,id(text),TextAlign::BOTTOM_LEFT,"Target: %.1f°C",id(pid_heater).target_temperature);
+          it.printf(0,230,id(text_small),TextAlign::BOTTOM_LEFT,"Target: %.1f°C",id(pid_heater).target_temperature);
 
 time:
   - platform: sntp