diff --git a/automations.yaml b/automations.yaml
index e08d5de..a1e6f37 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -2,9 +2,11 @@
   alias: Licht bei Sonnenuntergang einschalten
   description: ''
   triggers:
-  - event: sunset
-    offset: '-1:00'
-    trigger: sun
+  - trigger: numeric_state
+    entity_id:
+    - sun.sun
+    attribute: elevation
+    below: 5
   conditions:
   - condition: state
     entity_id: person.marcus_scholz
@@ -43,9 +45,11 @@
   alias: Licht bei Sonnenaufgang ausschalten
   description: ''
   triggers:
-  - event: sunrise
-    offset: '+1:00'
-    trigger: sun
+  - trigger: numeric_state
+    entity_id:
+    - sun.sun
+    attribute: elevation
+    above: 5
   conditions: []
   actions:
   - target:
@@ -146,9 +150,7 @@
   - data:
       cache: true
       media_player_entity_id: media_player.home_assistant_voice_0a7c6b_media_player
-      message: '{{message}}
-
-        '
+      message: 4 20, lodere es, Lustknabe
     target:
       entity_id: tts.piper
     enabled: true
@@ -156,9 +158,7 @@
   - data:
       cache: true
       media_player_entity_id: media_player.home_assistant_voice_09c0e7_media_player
-      message: '{{message}}
-
-        '
+      message: 4 20, lodere es, Lustknabe
     target:
       entity_id: tts.piper
     enabled: true
@@ -166,9 +166,7 @@
   - data:
       cache: true
       media_player_entity_id: media_player.m5stack_atom_echo
-      message: '{{message}}
-
-        '
+      message: 4 20, lodere es, Lustknabe
     target:
       entity_id: tts.piper
     enabled: true
@@ -832,9 +830,11 @@
   alias: Licht bei Sonnenuntergang einschalten (XMas)
   description: ''
   triggers:
-  - event: sunset
-    offset: '-1:00'
-    trigger: sun
+  - trigger: numeric_state
+    entity_id:
+    - sun.sun
+    attribute: elevation
+    below: 5
   conditions:
   - condition: state
     entity_id: person.marcus_scholz
@@ -861,9 +861,11 @@
   alias: Licht bei Sonnenaufgang ausschalten (XMas)
   description: ''
   triggers:
-  - event: sunrise
-    offset: '+1:00'
-    trigger: sun
+  - trigger: numeric_state
+    entity_id:
+    - sun.sun
+    attribute: elevation
+    above: 5
   conditions: []
   actions:
   - target: