diff --git a/kube/deploy/apps/esphome/app/config/.bluetooth-proxy.yaml b/kube/deploy/apps/esphome/app/config/.bluetooth-proxy.yaml
index a2960374..13278d8e 100644
--- a/kube/deploy/apps/esphome/app/config/.bluetooth-proxy.yaml
+++ b/kube/deploy/apps/esphome/app/config/.bluetooth-proxy.yaml
@@ -27,3 +27,16 @@ esp32:
       CONFIG_BT_BLE_50_FEATURES_SUPPORTED: y
       # Extend the watchdog timeout, so the device reboots if the device appears locked up for over 10 seconds.
       CONFIG_ESP_TASK_WDT_TIMEOUT_S: "10"
+
+# IRK
+external_components:
+  - components: [irk_enrollment]
+    source:
+      type: git
+      url: https://github.com/dgrnbrg/appdaemon-configs
+      ref: 175ec95b46db01ef02d3ed375aac2d577a2e8007
+      path: custom_components
+
+irk_enrollment:
+  latest_irk:
+    name: Latest IRK
diff --git a/kube/deploy/apps/esphome/app/config/.common.yaml b/kube/deploy/apps/esphome/app/config/.common.yaml
index 07a0b4ba..dac0704c 100644
--- a/kube/deploy/apps/esphome/app/config/.common.yaml
+++ b/kube/deploy/apps/esphome/app/config/.common.yaml
@@ -1,8 +1,4 @@
 substitutions:
-  system_name: >
-    ${AREA_DNS}-${NAME_DNS}
-  device_description: "$${description}"
-  friendly_name: "$${area} - $${name}"
   board: "$${board | default('esp32-s3-devkitc-1')}"
   framework: "$${framework | default('esp-idf')}" # This is important: the default "arduino" framework does not perform well.
   log: "$${log | default('INFO')}"