diff --git a/airrohr.yaml b/airrohr.yaml
index c1f085d..be344c2 100644
--- a/airrohr.yaml
+++ b/airrohr.yaml
@@ -11,7 +11,7 @@ wifi:
   password: !secret wifi_password
 
 ota:
-  safe_mode: true
+  platform: esphome
   password: !secret ota_password
 
 logger:
diff --git a/climatehub.yaml b/climatehub.yaml
index 8e58e68..19b8a94 100644
--- a/climatehub.yaml
+++ b/climatehub.yaml
@@ -12,14 +12,15 @@ wifi:
   reboot_timeout: 3min
 
 ota:
-  safe_mode: true
+  platform: esphome
   password: !secret ota_password
 
 mqtt:
   broker: !secret mqtt_server
 
-dallas:
-  - pin: 2
+one_wire:
+  - platform: gpio
+    pin: 2
 
 text_sensor:
   - platform: version
@@ -34,12 +35,12 @@ sensor:
     state_topic: esphome/climatehub/wifi_signal
     retain: false
 
-  - platform: dallas
+  - platform: dallas_temp
     name: "DS18B20 Plafond"
     address: 0x89051660b683ff28
     state_topic: sensors/climatehub-plafond/temperature
     retain: false
-  - platform: dallas
+  - platform: dallas_temp
     name: "DS18B20 Vloer"
     address: 0xf5041664269fff28
     state_topic: sensors/climatehub-vloer/temperature
diff --git a/plafond-co2.yaml b/plafond-co2.yaml
index 04fe9a6..9342a3b 100644
--- a/plafond-co2.yaml
+++ b/plafond-co2.yaml
@@ -11,7 +11,7 @@ wifi:
   password: !secret wifi_password
 
 ota:
-  safe_mode: true
+  platform: esphome
   password: !secret ota_password
 
 logger:
diff --git a/shabadge.yaml b/shabadge.yaml
index 14f1e97..279e3de 100644
--- a/shabadge.yaml
+++ b/shabadge.yaml
@@ -11,7 +11,7 @@ wifi:
   password: !secret wifi_password
 
 ota:
-  safe_mode: true
+  platform: esphome
   password: !secret ota_password
 
 logger:
@@ -20,13 +20,6 @@ mqtt:
   broker: !secret mqtt_server
   discovery: false
 
-external_components:
-  - source:
-      type: git
-      url: https://github.com/polyfloyd/esphome
-      ref: mpr-121-gpio
-    components: [ mpr121 ]
-
 spi:
   clk_pin: 18
   mosi_pin: 5
@@ -103,7 +96,7 @@ output:
   - id: led_and_mhz19_power
     platform: gpio
     pin:
-      mpr121_id: mpr121_component
+      mpr121: mpr121_component
       number: 10
       mode: OUTPUT
       inverted: true
diff --git a/spacestate-switch.yaml b/spacestate-switch.yaml
index e877d6e..ec1a851 100644
--- a/spacestate-switch.yaml
+++ b/spacestate-switch.yaml
@@ -11,7 +11,7 @@ wifi:
   password: !secret wifi_password
 
 ota:
-  safe_mode: true
+  platform: esphome
   password: !secret ota_password
 
 logger: