diff --git a/data/event-schemas/schema/m.call.answer.yaml b/data/event-schemas/schema/m.call.answer.yaml
index 23291c90..0989eb4c 100644
--- a/data/event-schemas/schema/m.call.answer.yaml
+++ b/data/event-schemas/schema/m.call.answer.yaml
@@ -1,44 +1,37 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "type": "object",
-    "description": "This event is sent by the callee when they wish to answer the call.",
-    "x-weight": 40,
-    "allOf": [{
-        "$ref": "core-event-schema/room_event.yaml"
-    }],
-    "properties": {
-        "content": {
-            "type": "object",
-            "allOf": [{
-                "$ref": "core-event-schema/call_event.yaml"
-            }],
-            "properties": {
-                "answer": {
-                    "type": "object",
-                    "title": "Answer",
-                    "description": "The session description object",
-                    "properties": {
-                        "type": {
-                            "type": "string",
-                            "enum": ["answer"],
-                            "description": "The type of session description."
-                        },
-                        "sdp": {
-                            "type": "string",
-                            "description": "The SDP text of the session description."
-                        }
-                    },
-                    "required": ["type", "sdp"]
-                },
-                "sdp_stream_metadata": {
-                    "$ref": "components/sdp_stream_metadata.yaml"
-                }
-            },
-            "required": ["answer"]
-        },
-        "type": {
-            "type": "string",
-            "enum": ["m.call.answer"]
-        }
-    }
-}
+$schema: https://json-schema.org/draft/2020-12/schema
+
+type: object
+description: This event is sent by the callee when they wish to answer the call.
+x-weight: 40
+allOf:
+- $ref: core-event-schema/room_event.yaml
+properties:
+  content:
+    type: object
+    allOf:
+    - $ref: core-event-schema/call_event.yaml
+    properties:
+      answer:
+        type: object
+        title: Answer
+        description: The session description object
+        properties:
+          type:
+            type: string
+            enum:
+            - answer
+            description: The type of session description.
+          sdp:
+            type: string
+            description: The SDP text of the session description.
+        required:
+        - type
+        - sdp
+      sdp_stream_metadata:
+        $ref: components/sdp_stream_metadata.yaml
+    required:
+    - answer
+  type:
+    type: string
+    enum:
+    - m.call.answer
diff --git a/data/event-schemas/schema/m.call.invite.yaml b/data/event-schemas/schema/m.call.invite.yaml
index 6bd07a8a..194420d7 100644
--- a/data/event-schemas/schema/m.call.invite.yaml
+++ b/data/event-schemas/schema/m.call.invite.yaml
@@ -1,53 +1,45 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "type": "object",
-    "description": "This event is sent by the caller when they wish to establish a call.",
-    "x-weight": 10,
-    "allOf": [{
-        "$ref": "core-event-schema/room_event.yaml"
-    }],
-    "properties": {
-        "content": {
-            "type": "object",
-            "allOf": [{
-                "$ref": "core-event-schema/call_event.yaml"
-            }],
-            "properties": {
-                "offer": {
-                    "type": "object",
-                    "title": "Offer",
-                    "description": "The session description object",
-                    "properties": {
-                        "type": {
-                            "type": "string",
-                            "enum": ["offer"],
-                            "description": "The type of session description."
-                        },
-                        "sdp": {
-                            "type": "string",
-                            "description": "The SDP text of the session description."
-                        }
-                    },
-                    "required": ["type", "sdp"]
-                },
-                "lifetime": {
-                    "type": "integer",
-                    "description": "The time in milliseconds that the invite is valid for. Once the invite age exceeds this value, clients should discard it. They should also no longer show the call as awaiting an answer in the UI."
-                },
-                "invitee": {
-                    "type": "string",
-                    "description": "The ID of the user being called. If omitted, any user in the room can answer.",
-                    "x-addedInMatrixVersion": "1.7"
-                },
-                "sdp_stream_metadata": {
-                    "$ref": "components/sdp_stream_metadata.yaml"
-                }
-            },
-            "required": ["offer", "lifetime"]
-        },
-        "type": {
-            "type": "string",
-            "enum": ["m.call.invite"]
-        }
-    }
-}
+$schema: https://json-schema.org/draft/2020-12/schema
+
+type: object
+description: This event is sent by the caller when they wish to establish a call.
+x-weight: 10
+allOf:
+- $ref: core-event-schema/room_event.yaml
+properties:
+  content:
+    type: object
+    allOf:
+    - $ref: core-event-schema/call_event.yaml
+    properties:
+      offer:
+        type: object
+        title: Offer
+        description: The session description object
+        properties:
+          type:
+            type: string
+            enum:
+            - offer
+            description: The type of session description.
+          sdp:
+            type: string
+            description: The SDP text of the session description.
+        required:
+        - type
+        - sdp
+      lifetime:
+        type: integer
+        description: The time in milliseconds that the invite is valid for. Once the invite age exceeds this value, clients should discard it. They should also no longer show the call as awaiting an answer in the UI.
+      invitee:
+        type: string
+        description: The ID of the user being called. If omitted, any user in the room can answer.
+        x-addedInMatrixVersion: '1.7'
+      sdp_stream_metadata:
+        $ref: components/sdp_stream_metadata.yaml
+    required:
+    - offer
+    - lifetime
+  type:
+    type: string
+    enum:
+    - m.call.invite
diff --git a/data/event-schemas/schema/m.call.select_answer.yaml b/data/event-schemas/schema/m.call.select_answer.yaml
index bdfa1ee9..e20491fb 100644
--- a/data/event-schemas/schema/m.call.select_answer.yaml
+++ b/data/event-schemas/schema/m.call.select_answer.yaml
@@ -1,29 +1,23 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "type": "object",
-    "description": "This event is sent by the caller's client once it has decided which other client to talk to, by selecting one of multiple possible incoming `m.call.answer` events. Its `selected_party_id` field indicates the answer it's chosen. The `call_id` and `party_id` of the caller is also included. If the callee's client sees a `select_answer` for an answer with party ID other than the one it sent, it ends the call and informs the user the call was answered elsewhere. It does not send any events. Media can start flowing before this event is seen or even sent.  Clients that implement previous versions of this specification will ignore this event and behave as they did before.",
-    "x-addedInMatrixVersion": "1.7",
-    "x-weight": 50,
-    "allOf": [{
-        "$ref": "core-event-schema/room_event.yaml"
-    }],
-    "properties": {
-        "content": {
-            "type": "object",
-            "allOf": [{
-                "$ref": "core-event-schema/call_event.yaml"
-            }],
-            "properties": {
-                "selected_party_id": {
-                    "type": "string",
-                    "description": "The `party_id` field from the answer event that the caller chose."
-                },
-            },
-            "required": ["selected_party_id"]
-        },
-        "type": {
-            "type": "string",
-            "enum": ["m.call.select_answer"]
-        }
-    }
-}
+$schema: https://json-schema.org/draft/2020-12/schema
+
+type: object
+description: This event is sent by the caller's client once it has decided which other client to talk to, by selecting one of multiple possible incoming `m.call.answer` events. Its `selected_party_id` field indicates the answer it's chosen. The `call_id` and `party_id` of the caller is also included. If the callee's client sees a `select_answer` for an answer with party ID other than the one it sent, it ends the call and informs the user the call was answered elsewhere. It does not send any events. Media can start flowing before this event is seen or even sent.  Clients that implement previous versions of this specification will ignore this event and behave as they did before.
+x-addedInMatrixVersion: '1.7'
+x-weight: 50
+allOf:
+- $ref: core-event-schema/room_event.yaml
+properties:
+  content:
+    type: object
+    allOf:
+    - $ref: core-event-schema/call_event.yaml
+    properties:
+      selected_party_id:
+        type: string
+        description: The `party_id` field from the answer event that the caller chose.
+    required:
+    - selected_party_id
+  type:
+    type: string
+    enum:
+    - m.call.select_answer