diff --git a/Integrations/ESPHome/BTN-1.yaml b/Integrations/ESPHome/BTN-1.yaml
index 97be964..4829341 100644
--- a/Integrations/ESPHome/BTN-1.yaml
+++ b/Integrations/ESPHome/BTN-1.yaml
@@ -25,11 +25,6 @@ update:
     source: https://apolloautomation.github.io/BTN-1/firmware/manifest.json
 
 wifi:
-  on_connect:
-    - delay: 5s
-    - ble.disable:
-  on_disconnect:
-    - ble.enable:
   ap:
     ssid: "Apollo BTN1 Hotspot"
 
diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml
index 168d731..0b9caf6 100644
--- a/Integrations/ESPHome/Core.yaml
+++ b/Integrations/ESPHome/Core.yaml
@@ -1,6 +1,6 @@
 substitutions:
   name: apollo-btn-1
-  version: "25.11.6.1"
+  version: "26.3.2.1"
   device_description: ${name} made by Apollo Automation - version ${version}.
 
 
@@ -9,19 +9,19 @@ esphome:
   friendly_name: Apollo BTN-1
   comment: Apollo BTN-1
   name_add_mac_suffix: true
-  platformio_options:
-    board_build.flash_mode: dio
-
   project:
     name: "ApolloAutomation.BTN-1"
     version: "${version}"
 
-  min_version: 2023.11.1
+  min_version: 2025.6.0
 
   # Wake-up detection logic
   on_boot:
     - priority: 500
       then:
+        - text_sensor.template.publish:
+            id: apollo_firmware_version
+            state: "${version}"
         - lambda: |-
             id(deep_sleep_1).set_sleep_duration(id(deep_sleep_sleep_duration).state * 60 * 60 * 1000);
         - if:
@@ -79,8 +79,8 @@ esphome:
 
 api:
   reboot_timeout: 0s
-  services:
-    - service: play_buzzer
+  actions:
+    - action: play_buzzer
       variables:
         song_str: string
       then:
@@ -132,13 +132,10 @@ api:
                 id: deep_sleep_1
 
 external_components:
-  - source: github://ApolloAutomation/ExternalComponents
-    components: [deep_sleep]
   - source: github://ApolloAutomation/esphome-battery-component
     components: [max17048] #Forked OptionZero
 
 esp32:
-  board: esp32-c6-devkitm-1
   variant: esp32c6
   flash_size: 8MB
   framework:
@@ -160,6 +157,7 @@ captive_portal:
 web_server:
   id: web_server_instance
   port: 80
+  version: 3
 
 i2c:
   id: i2c_bus
@@ -218,6 +216,19 @@ text_sensor:
     id: wakeup_button_pressed
     name: "Wake-up Button Pressed"
     icon: "mdi:gesture-tap-button"
+  - platform: wifi_info
+    ip_address:
+      name: "IP Address"
+      id: wifi_ip
+  - platform: version
+    name: "ESPHome Version"
+    hide_timestamp: true
+    entity_category: "diagnostic"
+  - platform: template
+    name: "Apollo Firmware Version"
+    id: apollo_firmware_version
+    update_interval: never
+    entity_category: "diagnostic"
 
 event:
   - platform: template