diff --git a/automations/01_home_and_lighting/01a_office_automations.yaml b/automations/01_home_and_lighting/01a_office_automations.yaml
index d034aa8..e99902e 100644
--- a/automations/01_home_and_lighting/01a_office_automations.yaml
+++ b/automations/01_home_and_lighting/01a_office_automations.yaml
@@ -20,7 +20,9 @@
     target:
       device_id:
       - 42b9a4c3e4edfd663f2b8a0a95c3997c
-      - 889b4b9e38814db0249b94d2dea4ae43
+  - action: switch.turn_on
+    target:
+      entity_id: switch.office_wax_warmer_socket_1
   - type: turn_on
     device_id: 397d7f06bfbbeaf3014d989a1e32ce07
     entity_id: 92505d68c2d00ef59e8ba61c3e3db32b
@@ -61,7 +63,9 @@
     target:
       device_id:
       - 42b9a4c3e4edfd663f2b8a0a95c3997c
-      - 889b4b9e38814db0249b94d2dea4ae43
+  - action: switch.turn_off
+    target:
+      entity_id: switch.office_wax_warmer_socket_1
   - type: turn_off
     device_id: 397d7f06bfbbeaf3014d989a1e32ce07
     entity_id: 92505d68c2d00ef59e8ba61c3e3db32b
@@ -80,4 +84,4 @@
     device_id: 31d67bb445f5c8920a1dc076d0d71e76
     entity_id: 6c1fd91e0ff15419f7bdb6b9e233cffc
     domain: switch
-  mode: single
\ No newline at end of file
+  mode: single
diff --git a/automations/01_home_and_lighting/01b_first_floor_automations.yaml b/automations/01_home_and_lighting/01b_first_floor_automations.yaml
index 7f414fe..dcdbe39 100644
--- a/automations/01_home_and_lighting/01b_first_floor_automations.yaml
+++ b/automations/01_home_and_lighting/01b_first_floor_automations.yaml
@@ -467,14 +467,30 @@
   mode: single
 
 - id: '1760000000001'
-  alias: Fireplace mantle outlet morning schedule
-  description: Turn the fireplace mantle outlet on each morning.
+  alias: Fireplace mantle wax warmer on with motion
+  description: Turn on the mantle wax warmer when motion is detected in the living room.
   triggers:
-  - trigger: time
-    at: '05:30:00'
+  - trigger: state
+    entity_id: binary_sensor.living_room_motion_2
+    to: 'on'
   conditions: []
   actions:
   - action: switch.turn_on
     target:
       entity_id: switch.fireplace
-  mode: single
\ No newline at end of file
+  mode: single
+
+- id: 'fireplace_mantle_wax_warmer_off_when_empty'
+  alias: Fireplace mantle wax warmer off when empty
+  description: Turn off the mantle wax warmer after one hour without living room occupancy.
+  triggers:
+  - trigger: state
+    entity_id: binary_sensor.living_room_occupancy
+    to: 'off'
+    for: '01:00:00'
+  conditions: []
+  actions:
+  - action: switch.turn_off
+    target:
+      entity_id: switch.fireplace
+  mode: single