diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 5fb32e3..436184d 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -2,6 +2,7 @@ name-template: 'Release v$NEXT_PATCH_VERSION'
 tag-template: "$RESOLVED_VERSION"
 change-template: "- #$NUMBER $TITLE @$AUTHOR"
 sort-direction: ascending
+category-template: '**$TITLE**'
 
 categories:
   - title: "🚨 Breaking changes"
@@ -25,11 +26,9 @@ include-labels:
 
 no-changes-template: '- No changes'
 
+# The shared build workflow appends a Full Changelog compare link to the
+# release body (release-drafter cannot render 4-part version tags).
 template: |
-  ## What's Changed
+  **What's Changed**
 
   $CHANGES
-
-  **Full Changelog**: https://github.com/ApolloAutomation/MSR-2/compare/$PREVIOUS_TAG...$RESOLVED_VERSION.1
-
-   Be sure to 🌟 this repository for updates!
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6b7e07a..6d5ab44 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,7 +26,8 @@ jobs:
       device-name: msr-2
       yaml-files: |
         Integrations/ESPHome/MSR-2_Factory.yaml
-      firmware-names: "2_Factory:firmware"
+        Integrations/ESPHome/MSR-2_BLE.yaml
+      firmware-names: "2_Factory:firmware,2_BLE:firmware-ble"
       core-yaml-path: Integrations/ESPHome/Core.yaml
       esphome-version: stable
       # Bypass check if manually triggered with bypass option
diff --git a/Integrations/ESPHome/MSR-2.yaml b/Integrations/ESPHome/MSR-2.yaml
index 78fdd46..6f83199 100644
--- a/Integrations/ESPHome/MSR-2.yaml
+++ b/Integrations/ESPHome/MSR-2.yaml
@@ -25,7 +25,7 @@ esphome:
     name: "ApolloAutomation.MSR-2"
     version: "${version}"
 
-  min_version: 2025.2.0
+  min_version: 2025.11.0
   
 dashboard_import:
   package_import_url: github://ApolloAutomation/MSR-2/Integrations/ESPHome/MSR-2.yaml
@@ -36,8 +36,12 @@ logger:
 ota:
   - platform: esphome
     id: ota_default
+  - platform: http_request
+    id: ota_managed
 
 wifi:
+  on_connect:
+    - component.update: update_http_request
 
   power_save_mode: none
 
@@ -46,5 +50,16 @@ wifi:
     ssid: "Apollo MSR2 Hotspot"
 
 
+http_request:
+  verify_ssl: true
+
+safe_mode:
+
+update:
+  - platform: http_request
+    id: update_http_request
+    name: Firmware Update
+    source: https://apolloautomation.github.io/MSR-2/firmware/manifest.json
+
 packages:
   core: !include Core.yaml
diff --git a/Integrations/ESPHome/MSR-2_BLE.yaml b/Integrations/ESPHome/MSR-2_BLE.yaml
index 480104e..6e9e103 100644
--- a/Integrations/ESPHome/MSR-2_BLE.yaml
+++ b/Integrations/ESPHome/MSR-2_BLE.yaml
@@ -25,7 +25,7 @@ esphome:
     name: "ApolloAutomation.MSR-2_BLE"
     version: "${version}"
 
-  min_version: 2025.2.0
+  min_version: 2025.11.0
 
 logger:
   
@@ -34,12 +34,16 @@ dashboard_import:
   import_full_config: false
 
 wifi:
+  on_connect:
+    - component.update: update_http_request
   ap:
     ssid: "Apollo MSR2 Hotspot"
 
 ota:
   - platform: esphome
     id: ota_esphome
+  - platform: http_request
+    id: ota_managed
 
 bluetooth_proxy:
   active: true
@@ -47,5 +51,16 @@ esp32_ble_tracker:
   scan_parameters:
     active: false
 
+http_request:
+  verify_ssl: true
+
+safe_mode:
+
+update:
+  - platform: http_request
+    id: update_http_request
+    name: Firmware Update
+    source: https://apolloautomation.github.io/MSR-2/firmware-ble/manifest.json
+
 packages:
   core: !include Core.yaml
diff --git a/Integrations/ESPHome/MSR-2_Factory.yaml b/Integrations/ESPHome/MSR-2_Factory.yaml
index 04b3aae..791c36e 100644
--- a/Integrations/ESPHome/MSR-2_Factory.yaml
+++ b/Integrations/ESPHome/MSR-2_Factory.yaml
@@ -25,7 +25,7 @@ esphome:
     name: "ApolloAutomation.MSR-2_Factory"
     version: "${version}"
 
-  min_version: 2025.2.0
+  min_version: 2025.11.0
 
   
 dashboard_import:
@@ -39,6 +39,8 @@ esp32_improv:
   authorizer: none
 
 wifi:
+  on_connect:
+    - component.update: update_http_request
   ap:
     ssid: "Apollo MSR2 Hotspot"
 
@@ -47,6 +49,19 @@ logger:
 ota:
   - platform: esphome
     id: ota_esphome
+  - platform: http_request
+    id: ota_managed
+
+http_request:
+  verify_ssl: true
+
+safe_mode:
+
+update:
+  - platform: http_request
+    id: update_http_request
+    name: Firmware Update
+    source: https://apolloautomation.github.io/MSR-2/firmware/manifest.json
 
 packages:
   core: !include Core.yaml