diff --git a/include/scripts/overvaagning.yaml b/include/scripts/overvaagning.yaml
index a31b95e..f49e32c 100644
--- a/include/scripts/overvaagning.yaml
+++ b/include/scripts/overvaagning.yaml
@@ -41,8 +41,7 @@ overvaagning:
         device_id: cf4f218aae515c84aea9f37f190dcfd5
       enabled: true
       action: camera.snapshot
-    - metadata: {}
-      choose:
+    - choose:
         - conditions:
             - condition: template
               value_template: "{{ not ai_is_paused }}"
diff --git a/include/templates/roborock.yaml b/include/templates/roborock.yaml
index 1c5a208..1b8f11f 100644
--- a/include/templates/roborock.yaml
+++ b/include/templates/roborock.yaml
@@ -1,4 +1,19 @@
-- sensor:
+- trigger:
+    - platform: homeassistant
+      event: start
+    - platform: state
+      entity_id: sensor.roborock_s8_pro_ultra_last_clean_end
+    - platform: state
+      entity_id: vacuum.roborock_s8_pro_ultra
+    - platform: state
+      entity_id:
+        - automation.roborock_smart_cleaning_start
+        - automation.roborock_syd_workday_vacuum
+        - automation.roborock_syd_workday_mop
+      attribute: last_triggered
+    - platform: time_pattern
+      hours: "/2"
+  sensor:
     - name: "Roborock Last Clean End Compact"
       unique_id: roborock_last_clean_end_compact
       state: >