diff --git a/configuration/automations/behaviour-goto-sleep.yaml b/configuration/automations/behaviour-goto-sleep.yaml
index 1336dc1..fb2fbb5 100644
--- a/configuration/automations/behaviour-goto-sleep.yaml
+++ b/configuration/automations/behaviour-goto-sleep.yaml
@@ -1,11 +1,15 @@
 - id: goto_sleep
   alias: '[Behaviour] Go to sleep'
-  description: ''
+  mode: single
   trigger:
-    - platform: time
-      at: '23:25'
-    - platform: time
-      at: '23:55'
+    - platform: calendar
+      event: start
+      offset: '-9:35:0'
+      entity_id: calendar.automations_wakeup
+    - platform: calendar
+      event: start
+      offset: '-9:05:0'
+      entity_id: calendar.automations_wakeup
   condition:
     - condition: time
       weekday:
@@ -53,69 +57,15 @@
     - service: light.turn_off
       target:
         entity_id: light.office_light_up
-  mode: single
 
-- id: goto_sleep-2
-  alias: '[Behaviour] Go to sleep 2 (next day)'
-  description: ''
-  trigger:
-    - platform: time
-      at: '0:25'
-  condition:
-    - condition: time
-      weekday:
-        - mon
-        - tue
-        - wed
-        - thu
-        - fri
-    - condition: state
-      entity_id: binary_sensor.hulk_ping
-      state: 'on'
-  action:
-    - service: light.turn_on
-      data:
-        flash: long
-        rgb_color:
-          - 255
-          - 0
-          - 0
-      target:
-        entity_id: light.office_light_up
-    - delay: '0:05:00'
-    - choose:
-        - conditions:
-            - condition: state
-              entity_id: binary_sensor.hulk_ping
-              state: 'on'
-            - condition: state
-              entity_id: input_boolean.pc_caffeine
-              state: 'off'
-          sequence:
-            - service: shell_command.pc_poweroff
-    - choose:
-        - conditions:
-            - condition: state
-              entity_id: binary_sensor.hulk_ping
-              state: 'on'
-            - condition: state
-              entity_id: input_boolean.pc_caffeine
-              state: 'on'
-          sequence:
-            - service: input_boolean.turn_off
-              target:
-                entity_id: input_boolean.pc_caffeine
-    - service: light.turn_off
-      target:
-        entity_id: light.office_light_up
+- id: goto_sleep_2
+  alias: '[Behaviour] Go to sleep (hard cutoff)'
   mode: single
-
-- id: goto_sleep-
-  alias: '[Behaviour] Go to sleep 3 (hard cutoff)'
-  description: ''
   trigger:
-    - platform: time
-      at: '0:55'
+    - platform: calendar
+      event: start
+      offset: '-8:35:0'
+      entity_id: calendar.automations_wakeup
   condition:
     - condition: time
       weekday:
@@ -157,4 +107,3 @@
     - service: switch.turn_off
       target:
         entity_id: switch.computer_outlet
-  mode: single