diff --git a/bluesmart-charger-esp32-example.yaml b/bluesmart-charger-esp32-example.yaml
index 6e94d48..0fb8ada 100644
--- a/bluesmart-charger-esp32-example.yaml
+++ b/bluesmart-charger-esp32-example.yaml
@@ -23,6 +23,8 @@ ota:
 logger:
   baud_rate: 0
 
+# If you use Home Assistant please remove this `mqtt` section and uncomment the `api` component!
+# The native API has many advantages over MQTT: https://esphome.io/components/api.html#advantages-over-mqtt
 mqtt:
   broker: !secret mqtt_host
   username: !secret mqtt_username
diff --git a/bluesmart-charger-esp8266-example.yaml b/bluesmart-charger-esp8266-example.yaml
index 5e1e0e0..c0f3430 100644
--- a/bluesmart-charger-esp8266-example.yaml
+++ b/bluesmart-charger-esp8266-example.yaml
@@ -21,6 +21,8 @@ ota:
 
 logger:
 
+# If you use Home Assistant please remove this `mqtt` section and uncomment the `api` component!
+# The native API has many advantages over MQTT: https://esphome.io/components/api.html#advantages-over-mqtt
 mqtt:
   broker: !secret mqtt_host
   username: !secret mqtt_username
diff --git a/debug-esp32-example.yaml b/debug-esp32-example.yaml
index 0edd694..6a11703 100644
--- a/debug-esp32-example.yaml
+++ b/debug-esp32-example.yaml
@@ -24,10 +24,11 @@ wifi:
 ota:
   platform: esphome
 
-api:
-
 logger:
 
+api:
+  reboot_timeout: 0s
+
 uart:
   id: uart_0
   baud_rate: 19200
diff --git a/debug-esp8266-example.yaml b/debug-esp8266-example.yaml
index 233225f..9ce8127 100644
--- a/debug-esp8266-example.yaml
+++ b/debug-esp8266-example.yaml
@@ -21,12 +21,13 @@ wifi:
 ota:
   platform: esphome
 
-api:
-
 logger:
   baud_rate: 0
   esp8266_store_log_strings_in_flash: false
 
+api:
+  reboot_timeout: 0s
+
 uart:
   id: uart_0
   baud_rate: 19200
diff --git a/multi-rs-esp8266-example.yaml b/multi-rs-esp8266-example.yaml
index 101a654..a9ce5c8 100644
--- a/multi-rs-esp8266-example.yaml
+++ b/multi-rs-esp8266-example.yaml
@@ -23,6 +23,8 @@ logger:
   baud_rate: 0
   esp8266_store_log_strings_in_flash: false
 
+# If you use Home Assistant please remove this `mqtt` section and uncomment the `api` component!
+# The native API has many advantages over MQTT: https://esphome.io/components/api.html#advantages-over-mqtt
 mqtt:
   broker: !secret mqtt_host
   username: !secret mqtt_username
diff --git a/phoenix-charger-esp8266-example.yaml b/phoenix-charger-esp8266-example.yaml
index 6d9946a..c52c44d 100644
--- a/phoenix-charger-esp8266-example.yaml
+++ b/phoenix-charger-esp8266-example.yaml
@@ -23,6 +23,8 @@ logger:
   baud_rate: 0
   esp8266_store_log_strings_in_flash: false
 
+# If you use Home Assistant please remove this `mqtt` section and uncomment the `api` component!
+# The native API has many advantages over MQTT: https://esphome.io/components/api.html#advantages-over-mqtt
 mqtt:
   broker: !secret mqtt_host
   username: !secret mqtt_username
diff --git a/phoenix-inverter-esp8266-example.yaml b/phoenix-inverter-esp8266-example.yaml
index 4936b63..10acfcb 100644
--- a/phoenix-inverter-esp8266-example.yaml
+++ b/phoenix-inverter-esp8266-example.yaml
@@ -23,6 +23,8 @@ logger:
   baud_rate: 0
   esp8266_store_log_strings_in_flash: false
 
+# If you use Home Assistant please remove this `mqtt` section and uncomment the `api` component!
+# The native API has many advantages over MQTT: https://esphome.io/components/api.html#advantages-over-mqtt
 mqtt:
   broker: !secret mqtt_host
   username: !secret mqtt_username
diff --git a/smartshunt-esp8266-example.yaml b/smartshunt-esp8266-example.yaml
index 2f4dee0..6ccc0ba 100644
--- a/smartshunt-esp8266-example.yaml
+++ b/smartshunt-esp8266-example.yaml
@@ -23,6 +23,8 @@ logger:
   baud_rate: 0
   esp8266_store_log_strings_in_flash: false
 
+# If you use Home Assistant please remove this `mqtt` section and uncomment the `api` component!
+# The native API has many advantages over MQTT: https://esphome.io/components/api.html#advantages-over-mqtt
 mqtt:
   broker: !secret mqtt_host
   username: !secret mqtt_username
diff --git a/smartsolar-mppt-esp8266-example-advanced.yaml b/smartsolar-mppt-esp8266-example-advanced.yaml
index 682d1b0..5b0df15 100644
--- a/smartsolar-mppt-esp8266-example-advanced.yaml
+++ b/smartsolar-mppt-esp8266-example-advanced.yaml
@@ -30,23 +30,27 @@ wifi:
 
 captive_portal:
 
+ota:
+  platform: esphome
+
 logger:
   baud_rate: 0
   # level: VERY_VERBOSE
   esp8266_store_log_strings_in_flash: false
 
-# Enable Home Assistant API
-api:
-  reboot_timeout: 0s
-
-ota:
-  platform: esphome
+# If you use Home Assistant please remove this `mqtt` section and uncomment the `api` component!
+# The native API has many advantages over MQTT: https://esphome.io/components/api.html#advantages-over-mqtt
+mqtt:
+  broker: !secret mqtt_host
+  username: !secret mqtt_username
+  password: !secret mqtt_password
+  id: mqtt_client
 
 web_server:
   port: 80
 
 time:
-  - platform: homeassistant
+  - platform: sntp
 
 uart:
   id: uart_bus
diff --git a/smartsolar-mppt-esp8266-example-multiple-uarts.yaml b/smartsolar-mppt-esp8266-example-multiple-uarts.yaml
index 9d8ec70..d148b6d 100644
--- a/smartsolar-mppt-esp8266-example-multiple-uarts.yaml
+++ b/smartsolar-mppt-esp8266-example-multiple-uarts.yaml
@@ -25,6 +25,8 @@ logger:
   baud_rate: 0
   esp8266_store_log_strings_in_flash: false
 
+# If you use Home Assistant please remove this `mqtt` section and uncomment the `api` component!
+# The native API has many advantages over MQTT: https://esphome.io/components/api.html#advantages-over-mqtt
 mqtt:
   broker: !secret mqtt_host
   username: !secret mqtt_username
diff --git a/smartsolar-mppt-esp8266-example.yaml b/smartsolar-mppt-esp8266-example.yaml
index 11b216b..e640342 100644
--- a/smartsolar-mppt-esp8266-example.yaml
+++ b/smartsolar-mppt-esp8266-example.yaml
@@ -23,6 +23,8 @@ logger:
   baud_rate: 0
   esp8266_store_log_strings_in_flash: false
 
+# If you use Home Assistant please remove this `mqtt` section and uncomment the `api` component!
+# The native API has many advantages over MQTT: https://esphome.io/components/api.html#advantages-over-mqtt
 mqtt:
   broker: !secret mqtt_host
   username: !secret mqtt_username
diff --git a/tests/emulator-all-keys.yaml b/tests/emulator-all-keys.yaml
index 40aa53a..5f6597a 100644
--- a/tests/emulator-all-keys.yaml
+++ b/tests/emulator-all-keys.yaml
@@ -12,14 +12,15 @@ wifi:
   ssid: !secret wifi_ssid
   password: !secret wifi_password
 
-api:
-
 ota:
   platform: esphome
 
 logger:
   level: DEBUG
 
+api:
+  reboot_timeout: 0s
+
 uart:
   baud_rate: 19200
   tx_pin: ${tx_pin}
diff --git a/tests/fake-bluesmart-ip22-0xa332.yaml b/tests/fake-bluesmart-ip22-0xa332.yaml
index cae59bc..fed9355 100644
--- a/tests/fake-bluesmart-ip22-0xa332.yaml
+++ b/tests/fake-bluesmart-ip22-0xa332.yaml
@@ -12,14 +12,15 @@ wifi:
   ssid: !secret wifi_ssid
   password: !secret wifi_password
 
-api:
-
 ota:
   platform: esphome
 
 logger:
   level: DEBUG
 
+api:
+  reboot_timeout: 0s
+
 uart:
   baud_rate: 19200
   tx_pin: ${tx_pin}
diff --git a/tests/fake-bluesmart-ip65-0xa30a.yaml b/tests/fake-bluesmart-ip65-0xa30a.yaml
index 7c769b0..cc4a34e 100644
--- a/tests/fake-bluesmart-ip65-0xa30a.yaml
+++ b/tests/fake-bluesmart-ip65-0xa30a.yaml
@@ -12,14 +12,15 @@ wifi:
   ssid: !secret wifi_ssid
   password: !secret wifi_password
 
-api:
-
 ota:
   platform: esphome
 
 logger:
   level: DEBUG
 
+api:
+  reboot_timeout: 0s
+
 uart:
   baud_rate: 19200
   tx_pin: ${tx_pin}
diff --git a/tests/fake-bmv600.yaml b/tests/fake-bmv600.yaml
index 8f07095..caf664f 100644
--- a/tests/fake-bmv600.yaml
+++ b/tests/fake-bmv600.yaml
@@ -12,14 +12,15 @@ wifi:
   ssid: !secret wifi_ssid
   password: !secret wifi_password
 
-api:
-
 ota:
   platform: esphome
 
 logger:
   level: DEBUG
 
+api:
+  reboot_timeout: 0s
+
 uart:
   baud_rate: 19200
   tx_pin: ${tx_pin}
diff --git a/tests/fake-bmv700.yaml b/tests/fake-bmv700.yaml
index fc55567..2bda6e2 100644
--- a/tests/fake-bmv700.yaml
+++ b/tests/fake-bmv700.yaml
@@ -12,14 +12,15 @@ wifi:
   ssid: !secret wifi_ssid
   password: !secret wifi_password
 
-api:
-
 ota:
   platform: esphome
 
 logger:
   level: DEBUG
 
+api:
+  reboot_timeout: 0s
+
 uart:
   baud_rate: 19200
   tx_pin: ${tx_pin}
diff --git a/tests/fake-bmv710.yaml b/tests/fake-bmv710.yaml
index e8bf565..0779227 100644
--- a/tests/fake-bmv710.yaml
+++ b/tests/fake-bmv710.yaml
@@ -12,14 +12,15 @@ wifi:
   ssid: !secret wifi_ssid
   password: !secret wifi_password
 
-api:
-
 ota:
   platform: esphome
 
 logger:
   level: DEBUG
 
+api:
+  reboot_timeout: 0s
+
 uart:
   baud_rate: 19200
   tx_pin: ${tx_pin}
diff --git a/tests/fake-bmv712.yaml b/tests/fake-bmv712.yaml
index 17a5921..0632506 100644
--- a/tests/fake-bmv712.yaml
+++ b/tests/fake-bmv712.yaml
@@ -12,14 +12,15 @@ wifi:
   ssid: !secret wifi_ssid
   password: !secret wifi_password
 
-api:
-
 ota:
   platform: esphome
 
 logger:
   level: DEBUG
 
+api:
+  reboot_timeout: 0s
+
 uart:
   baud_rate: 19200
   tx_pin: ${tx_pin}
diff --git a/tests/fake-multi-rs-solar.yaml b/tests/fake-multi-rs-solar.yaml
index 9e6df31..f3f892b 100644
--- a/tests/fake-multi-rs-solar.yaml
+++ b/tests/fake-multi-rs-solar.yaml
@@ -12,14 +12,15 @@ wifi:
   ssid: !secret wifi_ssid
   password: !secret wifi_password
 
-api:
-
 ota:
   platform: esphome
 
 logger:
   level: DEBUG
 
+api:
+  reboot_timeout: 0s
+
 uart:
   baud_rate: 19200
   tx_pin: ${tx_pin}
diff --git a/tests/fake-phoenix-inverter.yaml b/tests/fake-phoenix-inverter.yaml
index de0638a..8e6bd6d 100644
--- a/tests/fake-phoenix-inverter.yaml
+++ b/tests/fake-phoenix-inverter.yaml
@@ -12,14 +12,15 @@ wifi:
   ssid: !secret wifi_ssid
   password: !secret wifi_password
 
-api:
-
 ota:
   platform: esphome
 
 logger:
   level: DEBUG
 
+api:
+  reboot_timeout: 0s
+
 uart:
   baud_rate: 19200
   tx_pin: ${tx_pin}
diff --git a/tests/fake-smartsolar-mppt.yaml b/tests/fake-smartsolar-mppt.yaml
index c431162..d577f20 100644
--- a/tests/fake-smartsolar-mppt.yaml
+++ b/tests/fake-smartsolar-mppt.yaml
@@ -12,14 +12,15 @@ wifi:
   ssid: !secret wifi_ssid
   password: !secret wifi_password
 
-api:
-
 ota:
   platform: esphome
 
 logger:
   level: DEBUG
 
+api:
+  reboot_timeout: 0s
+
 uart:
   baud_rate: 19200
   tx_pin: ${tx_pin}