diff --git a/base.yaml b/base.yaml
index ddf62728..179ba42e 100644
--- a/base.yaml
+++ b/base.yaml
@@ -6,6 +6,8 @@ external_components:
       url: https://github.com/ratgdo/esphome-ratgdo
     refresh: 1s
 
+safe_mode:
+
 preferences:
   flash_write_interval: 1min
 
@@ -45,6 +47,9 @@ api:
             id($id_prefix).clear_paired_devices(ratgdo::PairedDevice::ACCESSORY);
           }
 
+ota:
+  - platform: esphome
+
 sensor:
   - platform: ratgdo
     id: ${id_prefix}_openings
diff --git a/base_drycontact.yaml b/base_drycontact.yaml
index eefa8fc3..79783d33 100644
--- a/base_drycontact.yaml
+++ b/base_drycontact.yaml
@@ -8,6 +8,8 @@ external_components:
       url: https://github.com/ratgdo/esphome-ratgdo
     refresh: 1s
 
+safe_mode:
+
 preferences:
   flash_write_interval: 1min
 
@@ -25,6 +27,9 @@ ratgdo:
   discrete_close_pin: ${discrete_close_pin}
   protocol: drycontact
 
+ota:
+  - platform: esphome
+
 binary_sensor:
   - platform: ratgdo
     type: obstruction
diff --git a/base_secplusv1.yaml b/base_secplusv1.yaml
index 867b542a..68a76b3c 100644
--- a/base_secplusv1.yaml
+++ b/base_secplusv1.yaml
@@ -6,6 +6,8 @@ external_components:
       url: https://github.com/ratgdo/esphome-ratgdo
     refresh: 1s
 
+safe_mode:
+
 preferences:
   flash_write_interval: 1min
 
@@ -28,6 +30,9 @@ ratgdo:
             message: "Failed to communicate with garage opener on startup."
             notification_id: "esphome_ratgdo_${id_prefix}_sync_failed"
 
+ota:
+  - platform: esphome
+
 lock:
   - platform: ratgdo
     id: ${id_prefix}_lock_remotes
diff --git a/static/v25board_esp32_d1_mini.yaml b/static/v25board_esp32_d1_mini.yaml
index 4a07136d..a31833c2 100644
--- a/static/v25board_esp32_d1_mini.yaml
+++ b/static/v25board_esp32_d1_mini.yaml
@@ -41,8 +41,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:
diff --git a/static/v25board_esp32_d1_mini_secplusv1.yaml b/static/v25board_esp32_d1_mini_secplusv1.yaml
index e4a2e9fb..66e11c6d 100644
--- a/static/v25board_esp32_d1_mini_secplusv1.yaml
+++ b/static/v25board_esp32_d1_mini_secplusv1.yaml
@@ -41,8 +41,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:
diff --git a/static/v25board_esp8266_d1_mini.yaml b/static/v25board_esp8266_d1_mini.yaml
index 83f6710a..0d0131b5 100644
--- a/static/v25board_esp8266_d1_mini.yaml
+++ b/static/v25board_esp8266_d1_mini.yaml
@@ -42,8 +42,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:
diff --git a/static/v25board_esp8266_d1_mini_lite.yaml b/static/v25board_esp8266_d1_mini_lite.yaml
index cbd70bf7..b4b94aea 100644
--- a/static/v25board_esp8266_d1_mini_lite.yaml
+++ b/static/v25board_esp8266_d1_mini_lite.yaml
@@ -42,8 +42,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:
diff --git a/static/v25board_esp8266_d1_mini_lite_secplusv1.yaml b/static/v25board_esp8266_d1_mini_lite_secplusv1.yaml
index 54da983a..0b78cd9e 100644
--- a/static/v25board_esp8266_d1_mini_lite_secplusv1.yaml
+++ b/static/v25board_esp8266_d1_mini_lite_secplusv1.yaml
@@ -42,8 +42,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:
diff --git a/static/v25board_esp8266_d1_mini_secplusv1.yaml b/static/v25board_esp8266_d1_mini_secplusv1.yaml
index 7efcbe87..f8029b08 100644
--- a/static/v25board_esp8266_d1_mini_secplusv1.yaml
+++ b/static/v25board_esp8266_d1_mini_secplusv1.yaml
@@ -42,8 +42,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:
diff --git a/static/v25iboard.yaml b/static/v25iboard.yaml
index db1c11c4..98bb6b8b 100644
--- a/static/v25iboard.yaml
+++ b/static/v25iboard.yaml
@@ -42,8 +42,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:
diff --git a/static/v25iboard_drycontact.yaml b/static/v25iboard_drycontact.yaml
index bbf1ecab..431456bd 100644
--- a/static/v25iboard_drycontact.yaml
+++ b/static/v25iboard_drycontact.yaml
@@ -42,8 +42,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:
diff --git a/static/v25iboard_secplusv1.yaml b/static/v25iboard_secplusv1.yaml
index c099aea7..7d1c72a6 100644
--- a/static/v25iboard_secplusv1.yaml
+++ b/static/v25iboard_secplusv1.yaml
@@ -42,8 +42,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:
diff --git a/static/v2board_esp32_d1_mini.yaml b/static/v2board_esp32_d1_mini.yaml
index d6153094..d926559e 100644
--- a/static/v2board_esp32_d1_mini.yaml
+++ b/static/v2board_esp32_d1_mini.yaml
@@ -41,8 +41,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:
diff --git a/static/v2board_esp32_lolin_s2_mini.yaml b/static/v2board_esp32_lolin_s2_mini.yaml
index 6dca833a..6570c16c 100644
--- a/static/v2board_esp32_lolin_s2_mini.yaml
+++ b/static/v2board_esp32_lolin_s2_mini.yaml
@@ -41,8 +41,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:
diff --git a/static/v2board_esp8266_d1_mini.yaml b/static/v2board_esp8266_d1_mini.yaml
index ac1b537a..954c8fea 100644
--- a/static/v2board_esp8266_d1_mini.yaml
+++ b/static/v2board_esp8266_d1_mini.yaml
@@ -42,8 +42,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:
diff --git a/static/v2board_esp8266_d1_mini_lite.yaml b/static/v2board_esp8266_d1_mini_lite.yaml
index 75f0c12d..d2b85c08 100644
--- a/static/v2board_esp8266_d1_mini_lite.yaml
+++ b/static/v2board_esp8266_d1_mini_lite.yaml
@@ -42,8 +42,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi: