diff --git a/esphome/nspanel_esphome_addon_upload_tft.yaml b/esphome/nspanel_esphome_addon_upload_tft.yaml
index 4024d13..e74714d 100644
--- a/esphome/nspanel_esphome_addon_upload_tft.yaml
+++ b/esphome/nspanel_esphome_addon_upload_tft.yaml
@@ -224,6 +224,18 @@ script:
           ESP_LOGD(TAG, "  Upload URL: %s", url.c_str());
           disp1->set_tft_url(url.c_str());
 
+          #ifdef USE_IMPROV
+          ESP_LOGD(TAG, "Stop Improv BLE");
+          ble_improv->dump_config();
+          ble_improv->stop();
+          ble_improv->dump_config();
+          #endif
+          #ifdef USE_CAPTIVE_PORTAL
+          ESP_LOGD(TAG, "Stop Captive Portal");
+          ap_captive_portal->dump_config();
+          ap_captive_portal->stop();
+          ap_captive_portal->dump_config();
+          #endif
           #ifdef USE_ESP32_BLE_CLIENT
           ble_tracker->dump_config();
           ESP_LOGD(TAG, "Disable BLE");
diff --git a/esphome/nspanel_esphome_core.yaml b/esphome/nspanel_esphome_core.yaml
index 998b2f5..53fd97d 100644
--- a/esphome/nspanel_esphome_core.yaml
+++ b/esphome/nspanel_esphome_core.yaml
@@ -2300,12 +2300,18 @@ script:
             #ifdef USE_CAPTIVE_PORTAL
             ESP_LOGCONFIG(TAG, "  - Captive portal");
             #endif
+            #ifdef USE_ESP32_BLE_SERVER
+            ESP_LOGCONFIG(TAG, "  - BLE server");
+            #endif
             #ifdef USE_ESP32_BLE_CLIENT
             ESP_LOGCONFIG(TAG, "  - BLE tracker");
             #endif
             #ifdef USE_BLUETOOTH_PROXY
             ESP_LOGCONFIG(TAG, "  - Bluetooth proxy");
             #endif
+            #ifdef USE_IMPROV
+            ESP_LOGCONFIG(TAG, "  - Improv (BLE)");
+            #endif
             #ifdef USE_WEBSERVER
             ESP_LOGCONFIG(TAG, "  - Web server");
             #endif
diff --git a/prebuilt/nspanel_esphome_prebuilt.yaml b/prebuilt/nspanel_esphome_prebuilt.yaml
index 91bca8b..8914f82 100644
--- a/prebuilt/nspanel_esphome_prebuilt.yaml
+++ b/prebuilt/nspanel_esphome_prebuilt.yaml
@@ -57,14 +57,22 @@ button:
             ESP_LOGE(TAG, "Firmware update failed!");
 
 captive_portal:
+  id: ap_captive_portal
 
 dashboard_import:
   package_import_url: github://Blackymas/NSPanel_HA_Blueprint/prebuilt/nspanel_esphome_prebuilt.yaml@main
   import_full_config: false
 
+esp32_ble:
+  id: ble
+
 esp32_improv:
+  id: ble_improv
   authorizer: none
 
+esp32_ble_server:
+  id: ble_server
+
 esphome:
   name_add_mac_suffix: true
   project:
@@ -75,6 +83,7 @@ esphome:
       - -D NSPANEL_HA_BLUEPRINT_PREBUILT
 
 improv_serial:
+  id: serial_improv
 
 logger:
   baud_rate: 115200