diff --git a/models/modes/car-share/event.yaml b/models/modes/car-share/event.yaml
index 3fce03e..d48216e 100644
--- a/models/modes/car-share/event.yaml
+++ b/models/modes/car-share/event.yaml
@@ -102,17 +102,18 @@ if:
   properties:
     event_types:
       contains:
-        - customer_cancellation
-        - driver_cancellation
-        - provider_cancellation
-        - reservation_start
-        - reservation_stop
-        - trip_end
-        - trip_enter_jurisdiction
-        - trip_leave_jurisdiction
-        - trip_resume
-        - trip_start
-        - trip_stop
+        items:
+          - customer_cancellation
+          - driver_cancellation
+          - provider_cancellation
+          - reservation_start
+          - reservation_stop
+          - trip_end
+          - trip_enter_jurisdiction
+          - trip_leave_jurisdiction
+          - trip_resume
+          - trip_start
+          - trip_stop
 then:
   properties:
     trip_ids:
diff --git a/models/modes/delivery-robots/event.yaml b/models/modes/delivery-robots/event.yaml
index bb30e20..7b600b8 100644
--- a/models/modes/delivery-robots/event.yaml
+++ b/models/modes/delivery-robots/event.yaml
@@ -113,17 +113,18 @@ if:
   properties:
     event_types:
       contains:
-        - customer_cancellation
-        - driver_cancellation
-        - provider_cancellation
-        - reservation_start
-        - reservation_stop
-        - trip_end
-        - trip_enter_jurisdiction
-        - trip_leave_jurisdiction
-        - trip_pause
-        - trip_resume
-        - trip_start
+        items:
+          - customer_cancellation
+          - driver_cancellation
+          - provider_cancellation
+          - reservation_start
+          - reservation_stop
+          - trip_end
+          - trip_enter_jurisdiction
+          - trip_leave_jurisdiction
+          - trip_pause
+          - trip_resume
+          - trip_start
 then:
   properties:
     trip_ids:
diff --git a/models/modes/micromobility/event.yaml b/models/modes/micromobility/event.yaml
index ae85bc4..226eb99 100644
--- a/models/modes/micromobility/event.yaml
+++ b/models/modes/micromobility/event.yaml
@@ -112,11 +112,12 @@ if:
   properties:
     event_types:
       contains:
-        - trip_cancel
-        - trip_end
-        - trip_enter_jurisdiction
-        - trip_leave_jurisdiction
-        - trip_start
+        items:
+          - trip_cancel
+          - trip_end
+          - trip_enter_jurisdiction
+          - trip_leave_jurisdiction
+          - trip_start
 then:
   properties:
     trip_ids:
diff --git a/models/modes/passenger-services/event.yaml b/models/modes/passenger-services/event.yaml
index 28f80db..dd5e9f0 100644
--- a/models/modes/passenger-services/event.yaml
+++ b/models/modes/passenger-services/event.yaml
@@ -96,17 +96,18 @@ if:
   properties:
     event_types:
       contains:
-        - driver_cancellation
-        - passenger_cancellation
-        - provider_cancellation
-        - reservation_start
-        - reservation_stop
-        - trip_end
-        - trip_enter_jurisdiction
-        - trip_leave_jurisdiction
-        - trip_resume
-        - trip_start
-        - trip_stop
+        items:
+          - driver_cancellation
+          - passenger_cancellation
+          - provider_cancellation
+          - reservation_start
+          - reservation_stop
+          - trip_end
+          - trip_enter_jurisdiction
+          - trip_leave_jurisdiction
+          - trip_resume
+          - trip_start
+          - trip_stop
 then:
   properties:
     trip_ids: