diff --git a/packages/security/security.yaml b/packages/security/security.yaml
index d4b7ab6..0318e78 100644
--- a/packages/security/security.yaml
+++ b/packages/security/security.yaml
@@ -43,9 +43,23 @@ input_boolean:
   auto_disarm_alarm:
     name: Automatically Disarm Alarm on Presence Change
 
+binary_sensor:
+
+# -----------------------------------------------------------------------------
+# Doorbell Camera Online State
+  - platform: rest
+    name: Doorbell Camera Online
+    resource: !secret doorbell_camera_rest_url
+    authentication: digest
+    username: admin
+    password: !secret doorbell_camera_password
+    params:
+      action: getConfig
+      name: VSP_PaaS.Online
+    value_template: "{{ value.split('=')[1] }}"
+
 # -----------------------------------------------------------------------------
 # Door and Window Groups
-binary_sensor:
   - platform: group
     name: All Doors
     entities:
@@ -75,19 +89,6 @@ binary_sensor:
       - binary_sensor.bedroom_side_window
       - binary_sensor.bedroom_back_window
 
-  # Doorbell Camera Online State
-  - platform: rest
-    name: Doorbell Camera Online
-    resource: !secret doorbell_camera_rest_url
-    authentication: digest
-    username: admin
-    password: !secret doorbell_camera_password
-    params:
-      action: getConfig
-      name: VSP_PaaS.Online
-    value_template: "{{ value.split('=')[1] }}"
-    scan_interval: 30
-
 template:
   sensor:
     - name: Open Windows/Doors
@@ -117,6 +118,11 @@ input_button:
     name: Garage Door
     icon: mdi:garage
 
+# -----------------------------------------------------------------------------
+# Force Doorbell Online State
+shell_command:
+  doorbell_camera_set_online: !secret doorbell_camera_online_command
+
 # -----------------------------------------------------------------------------
 # Security Automations
 automation: