diff --git a/packages/presence/presence.yaml b/packages/presence/presence.yaml
index 121becb..5b1164c 100644
--- a/packages/presence/presence.yaml
+++ b/packages/presence/presence.yaml
@@ -14,46 +14,46 @@ homeassistant:
     sensor.jp_presence_status:
       entity_picture: https://gravatar.com/avatar/e78e623948f3675cf1c51544f9bec928
 
-    device_tracker.jp_p3a_gps:
-      friendly_name: J.P. Pixel 3a
-      icon: mdi:map-marker
-    device_tracker.jp_p3a_ip:
-      friendly_name: J.P. Pixel 3a
-      icon: mdi:wifi
-    device_tracker.jp_p3a_bt_entry:
-      friendly_name: J.P. Pixel 3a
-      source_type: bluetooth
-      icon: mdi:bluetooth
+    # device_tracker.jp_p3a_gps:
+    #   friendly_name: J.P. Pixel 3a
+    #   icon: mdi:map-marker
+    # device_tracker.jp_p3a_ip:
+    #   friendly_name: J.P. Pixel 3a
+    #   icon: mdi:wifi
+    # device_tracker.jp_p3a_bt_entry:
+    #   friendly_name: J.P. Pixel 3a
+    #   source_type: bluetooth
+    #   icon: mdi:bluetooth
 
-    device_tracker.jp_gs8_ap:
-      friendly_name: J.P. Galaxy S8
-      icon: mdi:wifi
+    # device_tracker.jp_gs8_ap:
+    #   friendly_name: J.P. Galaxy S8
+    #   icon: mdi:wifi
 
-    device_tracker.jen_iphone_ip:
-      friendly_name: Jen iPhone
-      icon: mdi:wifi
-    device_tracker.jen_iphone_bt_entry:
-      friendly_name: Jen iPhone
-      source_type: bluetooth
-      icon: mdi:bluetooth
+    # device_tracker.jen_iphone_ip:
+    #   friendly_name: Jen iPhone
+    #   icon: mdi:wifi
+    # device_tracker.jen_iphone_bt_entry:
+    #   friendly_name: Jen iPhone
+    #   source_type: bluetooth
+    #   icon: mdi:bluetooth
 
 # -----------------------------------------------------------------------------
 # Manual Setup Device Trackers
-device_tracker:
+# device_tracker:
 
-  # Ping Platform
-  - platform: ping
-    hosts:
-      jp_p3a_ip: !secret jp_p3a_ip
-      jp_gs8_ip: !secret jp_gs8_ip
-      jen_iphone_ip: !secret jen_iphone_ip
+#   # Ping Platform
+#   - platform: ping
+#     hosts:
+#       jp_p3a_ip: !secret jp_p3a_ip
+#       jp_gs8_ip: !secret jp_gs8_ip
+#       jen_iphone_ip: !secret jen_iphone_ip
 
-  # MQTT Platform (Bluetooth Presence Sensor)
-  - platform: mqtt
-    devices:
-      jp_gs8_bt_entry: monitor/entry/jp_gs8/device_tracker
-      jp_p3a_bt_entry: monitor/entry/jp_p3a/device_tracker
-      jen_iphone_bt_entry: monitor/entry/jen_iphone/device_tracker 
+#   # MQTT Platform (Bluetooth Presence Sensor)
+#   - platform: mqtt
+#     devices:
+#       jp_gs8_bt_entry: monitor/entry/jp_gs8/device_tracker
+#       jp_p3a_bt_entry: monitor/entry/jp_p3a/device_tracker
+#       jen_iphone_bt_entry: monitor/entry/jen_iphone/device_tracker 
 
 # -----------------------------------------------------------------------------
 # Proximity Sensors for Zones
@@ -157,32 +157,32 @@ sensor:
 automation:
 
   # Run Bluetooth Arrival Scan at Home Assistant startup
-  - alias: Startup Arrival Scan
-    trigger:
-      - platform: homeassistant
-        event: start
-    mode: queued
-    action:
-      - service: mqtt.publish
-        data: 
-          topic: monitor/scan/arrive
-          payload: scan
+  # - alias: Startup Arrival Scan
+  #   trigger:
+  #     - platform: homeassistant
+  #       event: start
+  #   mode: queued
+  #   action:
+  #     - service: mqtt.publish
+  #       data: 
+  #         topic: monitor/scan/arrive
+  #         payload: scan
 
   # Run Bluetooth Departure Scan if a Ping Device Tracker goes Away
-  - alias: Bluetooth Departure Scan
-    trigger:
-      - platform: homeassistant
-        event: start
-      - platform: state
-        entity_id: binary_sensor.front_door_sensor
-      - platform: time_pattern
-        minutes: "/10"
-    mode: single
-    action:
-      - service: mqtt.publish
-        data: 
-          topic: monitor/scan/depart
-          payload: scan
+  # - alias: Bluetooth Departure Scan
+  #   trigger:
+  #     - platform: homeassistant
+  #       event: start
+  #     - platform: state
+  #       entity_id: binary_sensor.front_door_sensor
+  #     - platform: time_pattern
+  #       minutes: "/10"
+  #   mode: single
+  #   action:
+  #     - service: mqtt.publish
+  #       data: 
+  #         topic: monitor/scan/depart
+  #         payload: scan
 
   # Handle Just Arrived/Just Left State Transitions
   - alias: Mark Person as Just Arrived
diff --git a/packages/security/security.yaml b/packages/security/security.yaml
index e5a5f77..3acc902 100644
--- a/packages/security/security.yaml
+++ b/packages/security/security.yaml
@@ -294,26 +294,6 @@ automation:
     action:
       - service: shell_command.doorbell_camera_set_online
 
-  - alias: Frigate Doorbell Notification
-    use_blueprint:
-      path: hunterjm/frigate_0.10_notification.yaml
-      input:
-        camera: doorbell
-        notify_device: ce165dc8c682f384b6b0c0f36b72659a
-        base_url: https://hass.kraussnet.com
-        critical: true
-        update_thumbnail: true
-
-  - alias: Frigate Backyard Notification
-    use_blueprint:
-      path: hunterjm/frigate_0.10_notification.yaml
-      input:
-        camera: backyard
-        notify_device: ce165dc8c682f384b6b0c0f36b72659a
-        base_url: https://hass.kraussnet.com
-        critical: true
-        update_thumbnail: true
-
   - alias: Frigate Event Notification
     trigger:
       - platform: mqtt
@@ -328,8 +308,8 @@ automation:
       data:
         message: "A {{ trigger.payload_json.after.label }} detected on {{ trigger.payload_json.after.camera|title }} camera"
         data:
-          image: "/api/frigate/notifications/{{ trigger.payload_json.after.id }}/thumbnail.jpg?foramt=android"
-          clickAction: "https://hass.kraussnet.com/api/frigate/notifications/{{ trigger.payload_json.after.id }}/{{ trigger.payload_json.after.camera }}/clip.mp4"
+          image: "/api/frigate/notifications/{{ trigger.payload_json.after.id }}/thumbnail.jpg"
+          clickAction: "https://hass.kraussnet.com/api/frigate/notifications/{{ trigger.payload_json.after.id }}/clip.mp4"
           ttl: 0
           priority: high
           tag: "{{ trigger.payload_json.after.id }}"
@@ -337,7 +317,7 @@ automation:
           actions:
             - action: URI
               title: View Clip
-              uri: "https://hass.kraussnet.com/api/frigate/notifications/{{ trigger.payload_json.after.id }}/{{ trigger.payload_json.after.camera }}/clip.mp4"
+              uri: "https://hass.kraussnet.com/api/frigate/notifications/{{ trigger.payload_json.after.id }}/clip.mp4"
             - action: URI
               title: View Snapshot
               uri: "https://hass.kraussnet.com/api/frigate/notifications/{{ trigger.payload_json.after.id }}/snapshot.jpg"