diff --git a/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml b/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
index a61641f..9bc9f44 100644
--- a/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
+++ b/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
@@ -125,7 +125,7 @@ script:
             App.feed_wdt();
             delay_seconds_(1);
           }
-          //if (disp1->upload_tft(921600)) id(restart_nspanel).press();
+          //if (disp1->upload_tft(921600)) App.safe_reboot();
           ESP_LOGW(TAG, "Try #1 failed");
           if (disp1->is_setup()) display_wrapped_text->execute("confirm.body", "Try #1 failed", 18);
           App.feed_wdt();
@@ -134,7 +134,7 @@ script:
           nextion_status->execute();
           App.feed_wdt();
           if (disp1->is_setup()) display_wrapped_text->execute("confirm.body", "Try #2 at 921600 bps", 18);
-          //if (disp1->upload_tft(921600)) id(restart_nspanel).press();
+          //if (disp1->upload_tft(921600)) App.safe_reboot();
           ESP_LOGW(TAG, "Try #2 failed");
           if (disp1->is_setup()) display_wrapped_text->execute("confirm.body", "Try #2 failed", 18);
           App.feed_wdt();
@@ -143,7 +143,7 @@ script:
           nextion_status->execute();
           App.feed_wdt();
           if (disp1->is_setup()) display_wrapped_text->execute("confirm.body", "Try #3 at 115200 bps", 18);
-          //if (disp1->upload_tft(115200)) id(restart_nspanel).press();
+          //if (disp1->upload_tft(115200)) App.safe_reboot();
           ESP_LOGW(TAG, "Try #3 failed");
           App.feed_wdt();
           if (disp1->is_setup()) {
@@ -172,7 +172,7 @@ script:
             App.feed_wdt();
             delay_seconds_(1);
           }
-          //if (disp1->upload_tft(115200)) id(restart_nspanel).press();
+          //if (disp1->upload_tft(115200)) App.safe_reboot();
           ESP_LOGE(TAG, "TFT upload failed");
           if (disp1->is_setup()) display_wrapped_text->execute("confirm.body", "TFT upload failed", 18);
           if (disp1->is_setup()) delay_seconds_(2);
@@ -185,7 +185,7 @@ script:
           id(screen_power).turn_on();
           ESP_LOGD(TAG, "Restarting ESPHome");
           delay_seconds_(2);
-          id(restart_nspanel).press();
+          App.safe_reboot();
 
           ESP_LOGD(TAG, "Finished!");
 
@@ -908,7 +908,7 @@ script:
             lovelace_custom_command->execute(update_msg);
           }
           delay_seconds_(1);
-          if (upload_tft_(url, target_upload_baud_rate_)) id(restart_nspanel).press();
+          if (upload_tft_(url, target_upload_baud_rate_)) App.safe_reboot();
           ESP_LOGW(TAG, "Try #1 failed");
           if (display_mode->state > 0) display_wrapped_text->execute("confirm.body", "Try #1 failed", 18);
           delay_seconds_(5);
@@ -923,7 +923,7 @@ script:
             lovelace_custom_command->execute(update_msg);
           }
           delay_seconds_(1);
-          if (upload_tft_(url, target_upload_baud_rate_)) id(restart_nspanel).press();
+          if (upload_tft_(url, target_upload_baud_rate_)) App.safe_reboot();
           ESP_LOGW(TAG, "Try #2 failed");
           if (display_mode->state > 0) display_wrapped_text->execute("confirm.body", "Try #2 failed", 18);
           delay_seconds_(5);
@@ -938,7 +938,7 @@ script:
             lovelace_custom_command->execute(update_msg);
           }
           delay_seconds_(1);
-          if (upload_tft_(url, original_baud_rate_)) id(restart_nspanel).press();
+          if (upload_tft_(url, original_baud_rate_)) App.safe_reboot();
           ESP_LOGW(TAG, "Try #3 failed");
           if (display_mode->state > 0) {
             display_wrapped_text->execute("confirm.body", "Try #3 failed. Restarting display.", 18);
@@ -979,7 +979,7 @@ script:
             lovelace_custom_command->execute(update_msg);
           }
           delay_seconds_(1);
-          if (upload_tft_(url, original_baud_rate_)) id(restart_nspanel).press();
+          if (upload_tft_(url, original_baud_rate_)) App.safe_reboot();
           ESP_LOGW(TAG, "Try #4 failed");
           disable_boot_timers_();
           if (display_mode->state > 0) {
@@ -1004,7 +1004,7 @@ script:
             lovelace_custom_command->execute(update_msg);
           }
           delay_seconds_(1);
-          if (upload_tft_(url, 115200)) id(restart_nspanel).press();
+          if (upload_tft_(url, 115200)) App.safe_reboot();
           ESP_LOGE(TAG, "TFT upload failed");
           if (display_mode->state > 0) display_wrapped_text->execute("confirm.body", "TFT upload failed", 18);
           if (display_mode->state > 0) delay_seconds_(2);
@@ -1017,7 +1017,7 @@ script:
           id(screen_power).turn_on();
           ESP_LOGD(TAG, "Restarting ESPHome");
           delay_seconds_(2);
-          id(restart_nspanel).press();
+          App.safe_reboot();
 
           ESP_LOGD(TAG, "Finished!");