diff --git a/idn/beta/schemas/WorkflowTrigger.yaml b/idn/beta/schemas/WorkflowTrigger.yaml
index a2e9bf8..b40f2ef 100644
--- a/idn/beta/schemas/WorkflowTrigger.yaml
+++ b/idn/beta/schemas/WorkflowTrigger.yaml
@@ -1,10 +1,11 @@
 type: object
 description: The trigger that starts the workflow
 required:
-    - type
-    - attributes
+  - type
+  - attributes
 properties:
   type:
+    type: string
     enum:
       - EVENT
       - EXTERNAL
@@ -12,8 +13,9 @@ properties:
     example: EVENT
     description: The trigger type
   attributes:
+    type: object
     description: Workflow Trigger Attributes.
-    oneOf:
-    - $ref: './workflows/trigger-attributes/EventAttributes.yaml'
-    # - $ref: './workflows/trigger-attributes/ExternalAttributes.yaml'
-    - $ref: './workflows/trigger-attributes/ScheduledAttributes.yaml'
+    anyOf:
+      - $ref: "./workflows/trigger-attributes/EventAttributes.yaml"
+      - $ref: "./workflows/trigger-attributes/ExternalAttributes.yaml"
+      - $ref: "./workflows/trigger-attributes/ScheduledAttributes.yaml"
diff --git a/idn/beta/schemas/workflows/trigger-attributes/EventAttributes.yaml b/idn/beta/schemas/workflows/trigger-attributes/EventAttributes.yaml
index 762805f..9d6bea4 100644
--- a/idn/beta/schemas/workflows/trigger-attributes/EventAttributes.yaml
+++ b/idn/beta/schemas/workflows/trigger-attributes/EventAttributes.yaml
@@ -7,7 +7,7 @@ properties:
     type: string
     description: The unique ID of the trigger
     example: "idn:identity-attributes-changed"
-  filter:
+  filter.$:
     type: string
     description: JSON path expression that will limit which events the trigger will fire on
-    example: "$.changes[?(@.attribute == 'manager')]"
\ No newline at end of file
+    example: "$.changes[?(@.attribute == 'manager')]"