diff --git a/automations/files/automations/hallway-doorbel.yaml b/automations/files/automations/hallway-doorbel.yaml
deleted file mode 100644
index 82b75a4..0000000
--- a/automations/files/automations/hallway-doorbel.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-- id: hallway-doorbell
-  alias: '[Hallway] Doorbell'
-  mode: restart
-  trigger:
-    - platform: state
-      entity_id: switch.doorbell_switch
-      from: 'off'
-      to: 'on'
-  action:
-    - service: notify.notify
-      data:
-        message: "Doorbell"
-    - service: script.pause_all_players
-    - service: light.turn_on
-      data:
-        effect: Police
-      entity_id: light.desk_lightbar_ambilight
-    - service: zwave.set_config_parameter
-      data:
-        node_id: 12
-        parameter: 7
-        value: 'Door bell music'
-    - service: switch.turn_on
-      entity_id: switch.siren_switch
-    - delay: '30'
-    - service: light.turn_on
-      data:
-        hs_color: [ 240,100 ]
-      entity_id: light.desk_lightbar_ambilight
-    - delay: '5'
-    - service: light.turn_off
-      entity_id: light.desk_lightbar_ambilight
-
-- id: hallway-doorbell-burn-prevention
-  alias: '[Hallway] Doorbell burn prevention'
-  mode: restart
-  trigger:
-    - platform: state
-      entity_id: switch.doorbell_switch
-      from: 'off'
-      to: 'on'
-  action:
-    - delay: '1'
-    - service: switch.turn_off
-      entity_id: switch.doorbell_switch
\ No newline at end of file
diff --git a/automations/files/automations/hallway-doorbell.yaml b/automations/files/automations/hallway-doorbell.yaml
new file mode 100644
index 0000000..e7bb8ef
--- /dev/null
+++ b/automations/files/automations/hallway-doorbell.yaml
@@ -0,0 +1,57 @@
+- id: hallway-doorbell
+  alias: '[Hallway] Doorbell'
+  mode: restart
+  trigger:
+    - platform: state
+      entity_id: switch.doorbell_button_switch
+      from: 'off'
+      to: 'on'
+  action:
+    - service: notify.notify
+      data:
+        message: "Doorbell"
+    - choose:
+        - conditions:
+            - condition: state
+              entity_id: input_boolean.mute_doorbell
+              state: 'off'
+          sequence:
+            - service: script.pause_all_players
+            - service: switch.turn_on
+              target:
+                entity_id: switch.doorbell_bell
+            - service: switch.turn_off
+              target:
+                entity_id: switch.doorbell_bell
+            - service: light.turn_on
+              data:
+                effect: Police
+              entity_id: light.desk_lightbar_ambilight
+            - service: zwave.set_config_parameter
+              data:
+                node_id: 12
+                parameter: 7
+                value: 'Door bell music'
+            - service: switch.turn_on
+              entity_id: switch.siren_switch
+            - delay: '30'
+            - service: light.turn_on
+              data:
+                hs_color: [ 240,100 ]
+              entity_id: light.desk_lightbar_ambilight
+            - delay: '1'
+            - service: light.turn_off
+              entity_id: light.desk_lightbar_ambilight
+
+- id: hallway-doorbell-bell-burn-prevention
+  alias: '[Hallway] Doorbell bell burn prevention'
+  mode: restart
+  trigger:
+    - platform: state
+      entity_id: switch.doorbell_bell
+      from: 'off'
+      to: 'on'
+  action:
+    - delay: '1'
+    - service: switch.turn_off
+      entity_id: switch.doorbell_bell
\ No newline at end of file
diff --git a/automations/files/scripts/modes.yaml b/automations/files/scripts/modes.yaml
index d3f19de..72094d0 100644
--- a/automations/files/scripts/modes.yaml
+++ b/automations/files/scripts/modes.yaml
@@ -29,6 +29,8 @@ good_night:
         - light.computer_computer_cave_background
     - service: switch.turn_off
       entity_id: switch.desk_motor_on_off
+    - service: switch.turn_on
+      entity_id: switch.mute_doorbell
     - service: input_boolean.turn_off
       target:
         entity_id: input_boolean.pc_caffeine
@@ -54,6 +56,8 @@ good_morning:
       entity_id:
         - switch.desk_motor_on_off
         - switch.computer_outlet
+    - service: switch.turn_off
+      entity_id: switch.mute_doorbell
   mode: single
   icon: mdi:weather-sunny
 leave_home: