diff --git a/.gitignore b/.gitignore
index 1650c6be..ea8b7a23 100755
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ llmvision
 backups
 deps
 config/backups
+panel-notes/
 icloud
 __pycache__
 hacs
diff --git a/config/.HA_VERSION b/config/.HA_VERSION
index f0f51063..2ee75aaa 100755
--- a/config/.HA_VERSION
+++ b/config/.HA_VERSION
@@ -1 +1 @@
-2025.12.0
\ No newline at end of file
+2025.12.1
\ No newline at end of file
diff --git a/config/blueprints/template/homeassistant/inverted_binary_sensor.yaml b/config/blueprints/template/homeassistant/inverted_binary_sensor.yaml
deleted file mode 100644
index 5be18404..00000000
--- a/config/blueprints/template/homeassistant/inverted_binary_sensor.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-blueprint:
-  name: Invert a binary sensor
-  description: Creates a binary_sensor which holds the inverted value of a reference binary_sensor
-  domain: template
-  source_url: https://github.com/home-assistant/core/blob/dev/homeassistant/components/template/blueprints/inverted_binary_sensor.yaml
-  input:
-    reference_entity:
-      name: Binary sensor to be inverted
-      description: The binary_sensor which needs to have its value inverted
-      selector:
-        entity:
-          domain: binary_sensor
-variables:
-  reference_entity: !input reference_entity
-binary_sensor:
-  state: >
-    {% if states(reference_entity) == 'on' %}
-      off
-    {% elif states(reference_entity) == 'off' %}
-      on
-    {% else %}
-      {{ states(reference_entity) }}
-    {% endif %}
-  # delay_on: not_used in this example
-  # delay_off: not_used in this example
-  # auto_off: not_used in this example
-  availability: "{{ states(reference_entity) not in ('unknown', 'unavailable') }}"
diff --git a/config/homekit.yaml b/config/homekit.yaml
index ae7a821d..f5823061 100755
--- a/config/homekit.yaml
+++ b/config/homekit.yaml
@@ -1,84 +1,103 @@
-#-------------------------------------------
-# HomeKit Configuration for Home Assistant
-#
-# Description: This file controls the HomeKit integration settings,
-# defining which entities are exposed to Apple HomeKit.
-#
-# Follow me on https://www.vcloudinfo.com/click-here
-# Original Repository: https://github.com/CCOSTAN/Home-AssistantConfig
-##-------------------------------------------
+######################################################################
+# @CCOSTAN - Follow Me on X
+# For more info visit https://www.vcloudinfo.com/click-here
+# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
+# -------------------------------------------------------------------
+# HomeKit Configuration - Multi-bridge for stability + Alexa-friendly streams
+#  Main bridge for lights/locks/climate; cameras/lock split to accessory bridges.
+#  Camera streams use go2rtc substreams/restreams for faster Echo Show playback.
+# -------------------------------------------------------------------
+######################################################################
 
-filter:
-  include_domains:
-    - climate
-    - cover
-    - lock
-  exclude_domains:
-    - camera
-    - media_player
-    - sensor
-    - script
-    - sensor
-    - switch
-    - scene
-    - light
-  include_entities:
-    - camera.bedroomgate
-    - camera.driveway
-    - camera.filtergate
-    - camera.frontdoorbell
-    - camera.poolcam
-    - camera.frontlawn
-    - camera.garagecam
-    - light.bedroom
-    - light.bedroom_lights
-    - light.den_lights
-    - light.dinette_lights
-    - light.dining_room_lights
-    - light.foyer
-    - light.garage_lights
-    - light.hallway_lights
-    - light.kitchen_lights
-    - light.living_room_accents
-    - light.living_room_lights
-    - light.office_lights
-    - light.outdoor_front_lights
-    - light.upstairs_lights
-    - light.upstairs_lamp
-    - light.sink
-    - switch.lr_amp
-  exclude_entities:
-    - lock.spaceship_door_lock
-    - lock.spaceship_charger_door_lock
-    - lock.spaceship_trunk_lock
-    - lock.spaceship_frunk_lock
-    - climate.spaceship_hvac_climate_system
-    
-entity_config:
-  camera.frontdoorbell:
-    video_codec: copy
-    stream_source: rtsp://192.168.10.14:8554/frontdoorbell?mp4
-  camera.poolcam:
-    linked_motion_sensor: binary_sensor.poolcam_motion_sensor
-    video_codec: copy
-    stream_source: rtsp://192.168.10.14:8554/poolcam?mp4
-  camera.frontlawn:
-    linked_motion_sensor: binary_sensor.frontlawn_motion_sensor
-    video_codec: copy
-    stream_source: rtsp://192.168.10.14:8554/frontlawn?mp4
-  camera.garagecam:
-    linked_motion_sensor: binary_sensor.garagecam_motion_sensor
-    video_codec: copy
-    stream_source: rtsp://192.168.10.14:8554/garagecam?mp4
-  camera.bedroomgate:
-    linked_motion_sensor: binary_sensor.bedroomgate_motion_sensor
-    video_codec: copy
-    stream_source: rtsp://192.168.10.14:8554/bedroomgate?mp4
-  camera.driveway:
-    linked_motion_sensor: binary_sensor.driveway_motion_sensor
-    video_codec: copy
-    stream_source: rtsp://192.168.10.14:8554/driveway?mp4
-  camera.filtergate:
-    linked_motion_sensor: binary_sensor.filtergate_motion_sensor
-    video_codec: copy
-    stream_source: rtsp://192.168.10.14:8554/filtergate?mp4
+# Main bridge (everything except cameras + front door lock)
+- name: Home Assistant Bridge
+  mode: bridge
+  port: 21063
+  filter:
+    include_domains:
+      - climate
+      - cover
+      - lock
+    exclude_domains:
+      - camera
+      - media_player
+      - sensor
+      - script
+      - switch
+      - scene
+      - light
+    include_entities:
+      - light.bedroom
+      - light.bedroom_lights
+      - light.den_lights
+      - light.dinette_lights
+      - light.dining_room_lights
+      - light.foyer
+      - light.garage_lights
+      - light.hallway_lights
+      - light.kitchen_lights
+      - light.living_room_accents
+      - light.living_room_lights
+      - light.office_lights
+      - light.outdoor_front_lights
+      - light.upstairs_lights
+      - light.upstairs_lamp
+      - light.sink
+      - switch.lr_amp
+    exclude_entities:
+      - lock.front_door
+      - lock.spaceship_door_lock
+      - lock.spaceship_charger_door_lock
+      - lock.spaceship_trunk_lock
+      - lock.spaceship_frunk_lock
+      - climate.spaceship_hvac_climate_system
+
+# Cameras in accessory mode (better performance/reliability)
+- name: HomeKit Cameras
+  mode: accessory
+  port: 21064
+  filter:
+    include_entities:
+      - camera.bedroomgate
+      - camera.driveway
+      - camera.filtergate
+      - camera.frontdoorbell
+      - camera.poolcam
+      - camera.frontlawn
+      - camera.garagecam
+  entity_config:
+    camera.frontdoorbell:
+      video_codec: copy
+      stream_source: rtsp://192.168.10.14:8554/frontdoorbell_alexa
+    camera.poolcam:
+      linked_motion_sensor: binary_sensor.poolcam_motion_sensor
+      video_codec: copy
+      stream_source: rtsp://192.168.10.14:8554/poolcam_sub
+    camera.frontlawn:
+      linked_motion_sensor: binary_sensor.frontlawn_motion_sensor
+      video_codec: copy
+      stream_source: rtsp://192.168.10.14:8554/frontlawn_sub
+    camera.garagecam:
+      linked_motion_sensor: binary_sensor.garagecam_motion_sensor
+      video_codec: copy
+      stream_source: rtsp://192.168.10.14:8554/garagecam_sub
+    camera.bedroomgate:
+      linked_motion_sensor: binary_sensor.bedroomgate_motion_sensor
+      video_codec: copy
+      stream_source: rtsp://192.168.10.14:8554/bedroomgate?mp4
+    camera.driveway:
+      linked_motion_sensor: binary_sensor.driveway_motion_sensor
+      video_codec: copy
+      stream_source: rtsp://192.168.10.14:8554/driveway_sub
+    camera.filtergate:
+      linked_motion_sensor: binary_sensor.filtergate_motion_sensor
+      video_codec: copy
+      stream_source: rtsp://192.168.10.14:8554/filtergate?mp4
+
+# Front door lock in accessory mode (keeps lock responsive/available)
+- name: HomeKit Front Door Lock
+  mode: accessory
+  port: 21065
+  filter:
+    include_entities:
+      - lock.front_door