diff --git a/configuration/automations/bathroom-lights.yaml b/configuration/automations/bathroom-lights.yaml
index ad80864..37f12fa 100644
--- a/configuration/automations/bathroom-lights.yaml
+++ b/configuration/automations/bathroom-lights.yaml
@@ -52,4 +52,15 @@
       subtype: button_2
   action:
     - service: script.bathroom_lights_toggle
+    - choose:
+        - conditions:
+            - condition: state
+              entity_id: light.bathroom_lights
+              state: 'on'
+          sequence:
+            - service: automation.turn_on
+              target:
+                entity_id:
+                  - automation.bathroom_shower_motion_off
+                  - automation.bathroom_lights_off
   mode: single
\ No newline at end of file
diff --git a/configuration/automations/bathroom-mirror-button.yaml b/configuration/automations/bathroom-mirror-button.yaml
index 3e76944..c9b29ac 100644
--- a/configuration/automations/bathroom-mirror-button.yaml
+++ b/configuration/automations/bathroom-mirror-button.yaml
@@ -6,6 +6,11 @@
       platform: device
       type: remote_button_short_press
       subtype: turn_on
+    - device_id: ea9d3cc90cf5da1108925e50489efce9
+      domain: zha
+      platform: device
+      type: remote_button_alt_short_press
+      subtype: button_2
   action:
     - service: media_player.media_play_pause
       target:
@@ -20,6 +25,38 @@
       platform: device
       type: remote_button_short_press
       subtype: turn_off
+    - device_id: ea9d3cc90cf5da1108925e50489efce9
+      domain: zha
+      platform: device
+      type: remote_button_alt_short_press
+      subtype: button_1
   action:
     - service: script.bathroom_mirror_lights_toggle
   mode: single
+
+- id: bathroom-mirror-button-3
+  alias: '[Bathroom] Mirror Button Vacuum'
+  trigger:
+    - device_id: ea9d3cc90cf5da1108925e50489efce9
+      domain: zha
+      platform: device
+      type: remote_button_alt_short_press
+      subtype: button_3
+  action:
+    - service: vacuum.toggle
+      entity_id: vacuum.robot_vacuum
+
+- id: bathroom-mirror-button-4
+  alias: '[Bathroom] Mirror Button Automations'
+  trigger:
+    - device_id: ea9d3cc90cf5da1108925e50489efce9
+      domain: zha
+      platform: device
+      type: remote_button_alt_short_press
+      subtype: button_3
+  action:
+    - service: automation.turn_off
+      target:
+        entity_id:
+          - automation.bathroom_shower_motion_off
+          - automation.bathroom_lights_off
\ No newline at end of file