diff --git a/configuration/automations/alarm-clock.yaml b/configuration/automations/alarm-clock.yaml
index d5d631e..e7b161d 100644
--- a/configuration/automations/alarm-clock.yaml
+++ b/configuration/automations/alarm-clock.yaml
@@ -1,9 +1,10 @@
 - id: alarm-clock-automation
   alias: '[Alarm-Clock] Wakeup automation'
   trigger:
-    - platform: state
+    - platform: calendar
+      event: start
+      offset: '-0:30:0'
       entity_id: calendar.automations_wakeup
-      to: 'on'
   action:
     - service: automation.turn_off
       target:
diff --git a/configuration/automations/calendar.yaml b/configuration/automations/calendar.yaml
index 0aed3d1..70156f4 100644
--- a/configuration/automations/calendar.yaml
+++ b/configuration/automations/calendar.yaml
@@ -2,12 +2,12 @@
   alias: "[Calendar] Coffee machine"
   mode: single
   trigger:
-    - platform: state
+    - platform: calendar
+      event: start
       entity_id: calendar.automations_caffeine_free_time
-      to: 'on'
-    - platform: state
+    - platform: calendar
+      event: start
       entity_id: calendar.automations_sleep
-      to: 'on'
   action:
     - service: switch.turn_off
       target:
@@ -17,12 +17,12 @@
   alias: "[Calendar] Coffee machine"
   mode: single
   trigger:
-    - platform: state
+    - platform: calendar
+      event: end
       entity_id: calendar.automations_caffeine_free_time
-      to: 'off'
-    - platform: state
+    - platform: calendar
+      event: end
       entity_id: calendar.automations_sleep
-      to: 'off'
   condition:
     - condition: state
       entity_id: calendar.automations_caffeine_free_time
diff --git a/configuration/automations/f1.yaml b/configuration/automations/f1.yaml
index 28be2e2..82c7959 100644
--- a/configuration/automations/f1.yaml
+++ b/configuration/automations/f1.yaml
@@ -2,9 +2,10 @@
   alias: '[F1] Automation'
   mode: single
   trigger:
-    - platform: state
+    - platform: calendar
+      event: start
+      offset: '-0:05:0'
       entity_id: calendar.2021_fia_formula_one_world_championship_race_calendar
-      to: 'on'
   condition:
     - condition: state
       entity_id: input_select.home_mode