diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5e95847..637ab4b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
       id-token: write
       pull-requests: write
     with:
-      device-name: msr-2
+      device-name: msr-1
       # MSR-1.yaml is the end-user image served at firmware/ (OTA updates). The Factory image (improv +
       # factory test) is only used for first flashes via the web installer.
       yaml-files: |
diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml
index b274a24..e57d891 100644
--- a/Integrations/ESPHome/Core.yaml
+++ b/Integrations/ESPHome/Core.yaml
@@ -5,10 +5,6 @@ substitutions:
   # `substitutions: { ota_password: !secret <name>_ota_password }` so each
   # device on your network uses a unique secret instead of the shared default.
   ota_password: "apolloautomation"
-  # Firmware variant identity: overridden to "true" by MSR-1_BLE.yaml. Seeds
-  # the Bluetooth Proxy select on boot so it self-corrects to what is
-  # actually running after a failed or abandoned switch.
-  ble_firmware: "false"
   # Default update channel on first boot (no stored user choice yet, i.e. a
   # fresh flash). The beta-channel builds override this to "Beta" (see
   # Integrations/ESPHome/beta-channel/) so firmware obtained from the beta
diff --git a/Integrations/ESPHome/MSR-1_BLE.yaml b/Integrations/ESPHome/MSR-1_BLE.yaml
index c026398..7e66e0a 100644
--- a/Integrations/ESPHome/MSR-1_BLE.yaml
+++ b/Integrations/ESPHome/MSR-1_BLE.yaml
@@ -1,5 +1,4 @@
 substitutions:
-  ble_firmware: "true"
   # Legacy BLE devices keep updating from the firmware-ble manifest.
   ota_stable_manifest: "https://apolloautomation.github.io/MSR-1/firmware-ble/manifest.json"
   ota_beta_manifest: "https://github.com/ApolloAutomation/MSR-1/releases/download/beta-fw/manifest-ble.json"