diff --git a/definitions/2.0.0/avroSchema_v1.json b/definitions/2.0.0/avroSchema_v1.json
new file mode 100644
index 00000000..781e66e8
--- /dev/null
+++ b/definitions/2.0.0/avroSchema_v1.json
@@ -0,0 +1,317 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://asyncapi.com/definitions/2.0.0/avroSchema_v1.json",
+  "definitions": {
+    "avroSchema": {
+      "title": "Avro Schema",
+      "description": "Root Schema",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/types"
+        }
+      ]
+    },
+    "types": {
+      "title": "Avro Types",
+      "description": "Allowed Avro types",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/primitiveType"
+        },
+        {
+          "$ref": "#/definitions/primitiveTypeWithMetadata"
+        },
+        {
+          "$ref": "#/definitions/customTypeReference"
+        },
+        {
+          "$ref": "#/definitions/avroRecord"
+        },
+        {
+          "$ref": "#/definitions/avroEnum"
+        },
+        {
+          "$ref": "#/definitions/avroArray"
+        },
+        {
+          "$ref": "#/definitions/avroMap"
+        },
+        {
+          "$ref": "#/definitions/avroFixed"
+        },
+        {
+          "$ref": "#/definitions/avroUnion"
+        }
+      ]
+    },
+    "primitiveType": {
+      "title": "Primitive Type",
+      "description": "Basic type primitives.",
+      "type": "string",
+      "enum": [
+        "null",
+        "boolean",
+        "int",
+        "long",
+        "float",
+        "double",
+        "bytes",
+        "string"
+      ]
+    },
+    "primitiveTypeWithMetadata": {
+      "title": "Primitive Type With Metadata",
+      "description": "A primitive type with metadata attached.",
+      "type": "object",
+      "properties": {
+        "type": {
+          "$ref": "#/definitions/primitiveType"
+        }
+      },
+      "required": [
+        "type"
+      ]
+    },
+    "customTypeReference": {
+      "title": "Custom Type",
+      "description": "Reference to a ComplexType",
+      "not": {
+        "$ref": "#/definitions/primitiveType"
+      },
+      "type": "string",
+      "pattern": "^[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*$"
+    },
+    "avroUnion": {
+      "title": "Union",
+      "description": "A Union of types",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/avroSchema"
+      },
+      "minItems": 1
+    },
+    "avroField": {
+      "title": "Field",
+      "description": "A field within a Record",
+      "type": "object",
+      "properties": {
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "type": {
+          "$ref": "#/definitions/types"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "default": true,
+        "order": {
+          "enum": [
+            "ascending",
+            "descending",
+            "ignore"
+          ]
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        }
+      },
+      "required": [
+        "name",
+        "type"
+      ]
+    },
+    "avroRecord": {
+      "title": "Record",
+      "description": "A Record",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "record"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "fields": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/avroField"
+          }
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "fields"
+      ]
+    },
+    "avroEnum": {
+      "title": "Enum",
+      "description": "An enumeration",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "enum"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "symbols": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "symbols"
+      ]
+    },
+    "avroArray": {
+      "title": "Array",
+      "description": "An array",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "array"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "items": {
+          "$ref": "#/definitions/types"
+        }
+      },
+      "required": [
+        "type",
+        "items"
+      ]
+    },
+    "avroMap": {
+      "title": "Map",
+      "description": "A map of values",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "map"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "values": {
+          "$ref": "#/definitions/types"
+        }
+      },
+      "required": [
+        "type",
+        "values"
+      ]
+    },
+    "avroFixed": {
+      "title": "Fixed",
+      "description": "A fixed sized array of bytes",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "fixed"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "size": {
+          "type": "number"
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "size"
+      ]
+    },
+    "name": {
+      "type": "string",
+      "pattern": "^[A-Za-z_][A-Za-z0-9_]*$"
+    },
+    "namespace": {
+      "type": "string",
+      "pattern": "^([A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*)*$"
+    }
+  },
+  "description": "Json-Schema definition for Avro AVSC files.",
+  "oneOf": [
+    {
+      "$ref": "#/definitions/avroSchema"
+    }
+  ],
+  "title": "Avro Schema Definition"
+}
\ No newline at end of file
diff --git a/definitions/2.0.0/message.json b/definitions/2.0.0/message.json
index 238964f3..d7d4b456 100644
--- a/definitions/2.0.0/message.json
+++ b/definitions/2.0.0/message.json
@@ -181,6 +181,29 @@
                   }
                 }
               }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/vnd.apache.avro;version=1.9.0",
+                      "application/vnd.apache.avro+json;version=1.9.0",
+                      "application/vnd.apache.avro+yaml;version=1.9.0"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.0.0/avroSchema_v1.json"
+                  }
+                }
+              }
             }
           ]
         }
diff --git a/definitions/2.1.0/avroSchema_v1.json b/definitions/2.1.0/avroSchema_v1.json
new file mode 100644
index 00000000..be559eff
--- /dev/null
+++ b/definitions/2.1.0/avroSchema_v1.json
@@ -0,0 +1,317 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://asyncapi.com/definitions/2.1.0/avroSchema_v1.json",
+  "definitions": {
+    "avroSchema": {
+      "title": "Avro Schema",
+      "description": "Root Schema",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/types"
+        }
+      ]
+    },
+    "types": {
+      "title": "Avro Types",
+      "description": "Allowed Avro types",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/primitiveType"
+        },
+        {
+          "$ref": "#/definitions/primitiveTypeWithMetadata"
+        },
+        {
+          "$ref": "#/definitions/customTypeReference"
+        },
+        {
+          "$ref": "#/definitions/avroRecord"
+        },
+        {
+          "$ref": "#/definitions/avroEnum"
+        },
+        {
+          "$ref": "#/definitions/avroArray"
+        },
+        {
+          "$ref": "#/definitions/avroMap"
+        },
+        {
+          "$ref": "#/definitions/avroFixed"
+        },
+        {
+          "$ref": "#/definitions/avroUnion"
+        }
+      ]
+    },
+    "primitiveType": {
+      "title": "Primitive Type",
+      "description": "Basic type primitives.",
+      "type": "string",
+      "enum": [
+        "null",
+        "boolean",
+        "int",
+        "long",
+        "float",
+        "double",
+        "bytes",
+        "string"
+      ]
+    },
+    "primitiveTypeWithMetadata": {
+      "title": "Primitive Type With Metadata",
+      "description": "A primitive type with metadata attached.",
+      "type": "object",
+      "properties": {
+        "type": {
+          "$ref": "#/definitions/primitiveType"
+        }
+      },
+      "required": [
+        "type"
+      ]
+    },
+    "customTypeReference": {
+      "title": "Custom Type",
+      "description": "Reference to a ComplexType",
+      "not": {
+        "$ref": "#/definitions/primitiveType"
+      },
+      "type": "string",
+      "pattern": "^[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*$"
+    },
+    "avroUnion": {
+      "title": "Union",
+      "description": "A Union of types",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/avroSchema"
+      },
+      "minItems": 1
+    },
+    "avroField": {
+      "title": "Field",
+      "description": "A field within a Record",
+      "type": "object",
+      "properties": {
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "type": {
+          "$ref": "#/definitions/types"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "default": true,
+        "order": {
+          "enum": [
+            "ascending",
+            "descending",
+            "ignore"
+          ]
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        }
+      },
+      "required": [
+        "name",
+        "type"
+      ]
+    },
+    "avroRecord": {
+      "title": "Record",
+      "description": "A Record",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "record"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "fields": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/avroField"
+          }
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "fields"
+      ]
+    },
+    "avroEnum": {
+      "title": "Enum",
+      "description": "An enumeration",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "enum"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "symbols": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "symbols"
+      ]
+    },
+    "avroArray": {
+      "title": "Array",
+      "description": "An array",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "array"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "items": {
+          "$ref": "#/definitions/types"
+        }
+      },
+      "required": [
+        "type",
+        "items"
+      ]
+    },
+    "avroMap": {
+      "title": "Map",
+      "description": "A map of values",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "map"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "values": {
+          "$ref": "#/definitions/types"
+        }
+      },
+      "required": [
+        "type",
+        "values"
+      ]
+    },
+    "avroFixed": {
+      "title": "Fixed",
+      "description": "A fixed sized array of bytes",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "fixed"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "size": {
+          "type": "number"
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "size"
+      ]
+    },
+    "name": {
+      "type": "string",
+      "pattern": "^[A-Za-z_][A-Za-z0-9_]*$"
+    },
+    "namespace": {
+      "type": "string",
+      "pattern": "^([A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*)*$"
+    }
+  },
+  "description": "Json-Schema definition for Avro AVSC files.",
+  "oneOf": [
+    {
+      "$ref": "#/definitions/avroSchema"
+    }
+  ],
+  "title": "Avro Schema Definition"
+}
\ No newline at end of file
diff --git a/definitions/2.1.0/message.json b/definitions/2.1.0/message.json
index 87243207..9971dcb1 100644
--- a/definitions/2.1.0/message.json
+++ b/definitions/2.1.0/message.json
@@ -204,6 +204,29 @@
                   }
                 }
               }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/vnd.apache.avro;version=1.9.0",
+                      "application/vnd.apache.avro+json;version=1.9.0",
+                      "application/vnd.apache.avro+yaml;version=1.9.0"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.1.0/avroSchema_v1.json"
+                  }
+                }
+              }
             }
           ]
         }
diff --git a/definitions/2.2.0/avroSchema_v1.json b/definitions/2.2.0/avroSchema_v1.json
new file mode 100644
index 00000000..f5ec8a12
--- /dev/null
+++ b/definitions/2.2.0/avroSchema_v1.json
@@ -0,0 +1,317 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://asyncapi.com/definitions/2.2.0/avroSchema_v1.json",
+  "definitions": {
+    "avroSchema": {
+      "title": "Avro Schema",
+      "description": "Root Schema",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/types"
+        }
+      ]
+    },
+    "types": {
+      "title": "Avro Types",
+      "description": "Allowed Avro types",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/primitiveType"
+        },
+        {
+          "$ref": "#/definitions/primitiveTypeWithMetadata"
+        },
+        {
+          "$ref": "#/definitions/customTypeReference"
+        },
+        {
+          "$ref": "#/definitions/avroRecord"
+        },
+        {
+          "$ref": "#/definitions/avroEnum"
+        },
+        {
+          "$ref": "#/definitions/avroArray"
+        },
+        {
+          "$ref": "#/definitions/avroMap"
+        },
+        {
+          "$ref": "#/definitions/avroFixed"
+        },
+        {
+          "$ref": "#/definitions/avroUnion"
+        }
+      ]
+    },
+    "primitiveType": {
+      "title": "Primitive Type",
+      "description": "Basic type primitives.",
+      "type": "string",
+      "enum": [
+        "null",
+        "boolean",
+        "int",
+        "long",
+        "float",
+        "double",
+        "bytes",
+        "string"
+      ]
+    },
+    "primitiveTypeWithMetadata": {
+      "title": "Primitive Type With Metadata",
+      "description": "A primitive type with metadata attached.",
+      "type": "object",
+      "properties": {
+        "type": {
+          "$ref": "#/definitions/primitiveType"
+        }
+      },
+      "required": [
+        "type"
+      ]
+    },
+    "customTypeReference": {
+      "title": "Custom Type",
+      "description": "Reference to a ComplexType",
+      "not": {
+        "$ref": "#/definitions/primitiveType"
+      },
+      "type": "string",
+      "pattern": "^[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*$"
+    },
+    "avroUnion": {
+      "title": "Union",
+      "description": "A Union of types",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/avroSchema"
+      },
+      "minItems": 1
+    },
+    "avroField": {
+      "title": "Field",
+      "description": "A field within a Record",
+      "type": "object",
+      "properties": {
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "type": {
+          "$ref": "#/definitions/types"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "default": true,
+        "order": {
+          "enum": [
+            "ascending",
+            "descending",
+            "ignore"
+          ]
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        }
+      },
+      "required": [
+        "name",
+        "type"
+      ]
+    },
+    "avroRecord": {
+      "title": "Record",
+      "description": "A Record",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "record"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "fields": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/avroField"
+          }
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "fields"
+      ]
+    },
+    "avroEnum": {
+      "title": "Enum",
+      "description": "An enumeration",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "enum"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "symbols": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "symbols"
+      ]
+    },
+    "avroArray": {
+      "title": "Array",
+      "description": "An array",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "array"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "items": {
+          "$ref": "#/definitions/types"
+        }
+      },
+      "required": [
+        "type",
+        "items"
+      ]
+    },
+    "avroMap": {
+      "title": "Map",
+      "description": "A map of values",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "map"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "values": {
+          "$ref": "#/definitions/types"
+        }
+      },
+      "required": [
+        "type",
+        "values"
+      ]
+    },
+    "avroFixed": {
+      "title": "Fixed",
+      "description": "A fixed sized array of bytes",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "fixed"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "size": {
+          "type": "number"
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "size"
+      ]
+    },
+    "name": {
+      "type": "string",
+      "pattern": "^[A-Za-z_][A-Za-z0-9_]*$"
+    },
+    "namespace": {
+      "type": "string",
+      "pattern": "^([A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*)*$"
+    }
+  },
+  "description": "Json-Schema definition for Avro AVSC files.",
+  "oneOf": [
+    {
+      "$ref": "#/definitions/avroSchema"
+    }
+  ],
+  "title": "Avro Schema Definition"
+}
\ No newline at end of file
diff --git a/definitions/2.2.0/message.json b/definitions/2.2.0/message.json
index 8627e4e7..e747fa6f 100644
--- a/definitions/2.2.0/message.json
+++ b/definitions/2.2.0/message.json
@@ -207,6 +207,29 @@
                   }
                 }
               }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/vnd.apache.avro;version=1.9.0",
+                      "application/vnd.apache.avro+json;version=1.9.0",
+                      "application/vnd.apache.avro+yaml;version=1.9.0"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.2.0/avroSchema_v1.json"
+                  }
+                }
+              }
             }
           ]
         }
diff --git a/definitions/2.3.0/avroSchema_v1.json b/definitions/2.3.0/avroSchema_v1.json
new file mode 100644
index 00000000..93a7615d
--- /dev/null
+++ b/definitions/2.3.0/avroSchema_v1.json
@@ -0,0 +1,317 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://asyncapi.com/definitions/2.3.0/avroSchema_v1.json",
+  "definitions": {
+    "avroSchema": {
+      "title": "Avro Schema",
+      "description": "Root Schema",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/types"
+        }
+      ]
+    },
+    "types": {
+      "title": "Avro Types",
+      "description": "Allowed Avro types",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/primitiveType"
+        },
+        {
+          "$ref": "#/definitions/primitiveTypeWithMetadata"
+        },
+        {
+          "$ref": "#/definitions/customTypeReference"
+        },
+        {
+          "$ref": "#/definitions/avroRecord"
+        },
+        {
+          "$ref": "#/definitions/avroEnum"
+        },
+        {
+          "$ref": "#/definitions/avroArray"
+        },
+        {
+          "$ref": "#/definitions/avroMap"
+        },
+        {
+          "$ref": "#/definitions/avroFixed"
+        },
+        {
+          "$ref": "#/definitions/avroUnion"
+        }
+      ]
+    },
+    "primitiveType": {
+      "title": "Primitive Type",
+      "description": "Basic type primitives.",
+      "type": "string",
+      "enum": [
+        "null",
+        "boolean",
+        "int",
+        "long",
+        "float",
+        "double",
+        "bytes",
+        "string"
+      ]
+    },
+    "primitiveTypeWithMetadata": {
+      "title": "Primitive Type With Metadata",
+      "description": "A primitive type with metadata attached.",
+      "type": "object",
+      "properties": {
+        "type": {
+          "$ref": "#/definitions/primitiveType"
+        }
+      },
+      "required": [
+        "type"
+      ]
+    },
+    "customTypeReference": {
+      "title": "Custom Type",
+      "description": "Reference to a ComplexType",
+      "not": {
+        "$ref": "#/definitions/primitiveType"
+      },
+      "type": "string",
+      "pattern": "^[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*$"
+    },
+    "avroUnion": {
+      "title": "Union",
+      "description": "A Union of types",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/avroSchema"
+      },
+      "minItems": 1
+    },
+    "avroField": {
+      "title": "Field",
+      "description": "A field within a Record",
+      "type": "object",
+      "properties": {
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "type": {
+          "$ref": "#/definitions/types"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "default": true,
+        "order": {
+          "enum": [
+            "ascending",
+            "descending",
+            "ignore"
+          ]
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        }
+      },
+      "required": [
+        "name",
+        "type"
+      ]
+    },
+    "avroRecord": {
+      "title": "Record",
+      "description": "A Record",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "record"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "fields": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/avroField"
+          }
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "fields"
+      ]
+    },
+    "avroEnum": {
+      "title": "Enum",
+      "description": "An enumeration",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "enum"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "symbols": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "symbols"
+      ]
+    },
+    "avroArray": {
+      "title": "Array",
+      "description": "An array",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "array"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "items": {
+          "$ref": "#/definitions/types"
+        }
+      },
+      "required": [
+        "type",
+        "items"
+      ]
+    },
+    "avroMap": {
+      "title": "Map",
+      "description": "A map of values",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "map"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "values": {
+          "$ref": "#/definitions/types"
+        }
+      },
+      "required": [
+        "type",
+        "values"
+      ]
+    },
+    "avroFixed": {
+      "title": "Fixed",
+      "description": "A fixed sized array of bytes",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "fixed"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "size": {
+          "type": "number"
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "size"
+      ]
+    },
+    "name": {
+      "type": "string",
+      "pattern": "^[A-Za-z_][A-Za-z0-9_]*$"
+    },
+    "namespace": {
+      "type": "string",
+      "pattern": "^([A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*)*$"
+    }
+  },
+  "description": "Json-Schema definition for Avro AVSC files.",
+  "oneOf": [
+    {
+      "$ref": "#/definitions/avroSchema"
+    }
+  ],
+  "title": "Avro Schema Definition"
+}
\ No newline at end of file
diff --git a/definitions/2.3.0/message.json b/definitions/2.3.0/message.json
index e43d4f61..5a9d72af 100644
--- a/definitions/2.3.0/message.json
+++ b/definitions/2.3.0/message.json
@@ -210,6 +210,29 @@
                   }
                 }
               }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/vnd.apache.avro;version=1.9.0",
+                      "application/vnd.apache.avro+json;version=1.9.0",
+                      "application/vnd.apache.avro+yaml;version=1.9.0"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.3.0/avroSchema_v1.json"
+                  }
+                }
+              }
             }
           ]
         }
diff --git a/definitions/2.4.0/avroSchema_v1.json b/definitions/2.4.0/avroSchema_v1.json
new file mode 100644
index 00000000..19394659
--- /dev/null
+++ b/definitions/2.4.0/avroSchema_v1.json
@@ -0,0 +1,317 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://asyncapi.com/definitions/2.4.0/avroSchema_v1.json",
+  "definitions": {
+    "avroSchema": {
+      "title": "Avro Schema",
+      "description": "Root Schema",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/types"
+        }
+      ]
+    },
+    "types": {
+      "title": "Avro Types",
+      "description": "Allowed Avro types",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/primitiveType"
+        },
+        {
+          "$ref": "#/definitions/primitiveTypeWithMetadata"
+        },
+        {
+          "$ref": "#/definitions/customTypeReference"
+        },
+        {
+          "$ref": "#/definitions/avroRecord"
+        },
+        {
+          "$ref": "#/definitions/avroEnum"
+        },
+        {
+          "$ref": "#/definitions/avroArray"
+        },
+        {
+          "$ref": "#/definitions/avroMap"
+        },
+        {
+          "$ref": "#/definitions/avroFixed"
+        },
+        {
+          "$ref": "#/definitions/avroUnion"
+        }
+      ]
+    },
+    "primitiveType": {
+      "title": "Primitive Type",
+      "description": "Basic type primitives.",
+      "type": "string",
+      "enum": [
+        "null",
+        "boolean",
+        "int",
+        "long",
+        "float",
+        "double",
+        "bytes",
+        "string"
+      ]
+    },
+    "primitiveTypeWithMetadata": {
+      "title": "Primitive Type With Metadata",
+      "description": "A primitive type with metadata attached.",
+      "type": "object",
+      "properties": {
+        "type": {
+          "$ref": "#/definitions/primitiveType"
+        }
+      },
+      "required": [
+        "type"
+      ]
+    },
+    "customTypeReference": {
+      "title": "Custom Type",
+      "description": "Reference to a ComplexType",
+      "not": {
+        "$ref": "#/definitions/primitiveType"
+      },
+      "type": "string",
+      "pattern": "^[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*$"
+    },
+    "avroUnion": {
+      "title": "Union",
+      "description": "A Union of types",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/avroSchema"
+      },
+      "minItems": 1
+    },
+    "avroField": {
+      "title": "Field",
+      "description": "A field within a Record",
+      "type": "object",
+      "properties": {
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "type": {
+          "$ref": "#/definitions/types"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "default": true,
+        "order": {
+          "enum": [
+            "ascending",
+            "descending",
+            "ignore"
+          ]
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        }
+      },
+      "required": [
+        "name",
+        "type"
+      ]
+    },
+    "avroRecord": {
+      "title": "Record",
+      "description": "A Record",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "record"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "fields": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/avroField"
+          }
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "fields"
+      ]
+    },
+    "avroEnum": {
+      "title": "Enum",
+      "description": "An enumeration",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "enum"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "symbols": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "symbols"
+      ]
+    },
+    "avroArray": {
+      "title": "Array",
+      "description": "An array",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "array"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "items": {
+          "$ref": "#/definitions/types"
+        }
+      },
+      "required": [
+        "type",
+        "items"
+      ]
+    },
+    "avroMap": {
+      "title": "Map",
+      "description": "A map of values",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "map"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "values": {
+          "$ref": "#/definitions/types"
+        }
+      },
+      "required": [
+        "type",
+        "values"
+      ]
+    },
+    "avroFixed": {
+      "title": "Fixed",
+      "description": "A fixed sized array of bytes",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "fixed"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "size": {
+          "type": "number"
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "size"
+      ]
+    },
+    "name": {
+      "type": "string",
+      "pattern": "^[A-Za-z_][A-Za-z0-9_]*$"
+    },
+    "namespace": {
+      "type": "string",
+      "pattern": "^([A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*)*$"
+    }
+  },
+  "description": "Json-Schema definition for Avro AVSC files.",
+  "oneOf": [
+    {
+      "$ref": "#/definitions/avroSchema"
+    }
+  ],
+  "title": "Avro Schema Definition"
+}
\ No newline at end of file
diff --git a/definitions/2.4.0/message.json b/definitions/2.4.0/message.json
index 60ef1cab..3b93772a 100644
--- a/definitions/2.4.0/message.json
+++ b/definitions/2.4.0/message.json
@@ -216,6 +216,29 @@
                   }
                 }
               }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/vnd.apache.avro;version=1.9.0",
+                      "application/vnd.apache.avro+json;version=1.9.0",
+                      "application/vnd.apache.avro+yaml;version=1.9.0"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.4.0/avroSchema_v1.json"
+                  }
+                }
+              }
             }
           ]
         }
diff --git a/definitions/2.5.0/avroSchema_v1.json b/definitions/2.5.0/avroSchema_v1.json
new file mode 100644
index 00000000..34386294
--- /dev/null
+++ b/definitions/2.5.0/avroSchema_v1.json
@@ -0,0 +1,317 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://asyncapi.com/definitions/2.5.0/avroSchema_v1.json",
+  "definitions": {
+    "avroSchema": {
+      "title": "Avro Schema",
+      "description": "Root Schema",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/types"
+        }
+      ]
+    },
+    "types": {
+      "title": "Avro Types",
+      "description": "Allowed Avro types",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/primitiveType"
+        },
+        {
+          "$ref": "#/definitions/primitiveTypeWithMetadata"
+        },
+        {
+          "$ref": "#/definitions/customTypeReference"
+        },
+        {
+          "$ref": "#/definitions/avroRecord"
+        },
+        {
+          "$ref": "#/definitions/avroEnum"
+        },
+        {
+          "$ref": "#/definitions/avroArray"
+        },
+        {
+          "$ref": "#/definitions/avroMap"
+        },
+        {
+          "$ref": "#/definitions/avroFixed"
+        },
+        {
+          "$ref": "#/definitions/avroUnion"
+        }
+      ]
+    },
+    "primitiveType": {
+      "title": "Primitive Type",
+      "description": "Basic type primitives.",
+      "type": "string",
+      "enum": [
+        "null",
+        "boolean",
+        "int",
+        "long",
+        "float",
+        "double",
+        "bytes",
+        "string"
+      ]
+    },
+    "primitiveTypeWithMetadata": {
+      "title": "Primitive Type With Metadata",
+      "description": "A primitive type with metadata attached.",
+      "type": "object",
+      "properties": {
+        "type": {
+          "$ref": "#/definitions/primitiveType"
+        }
+      },
+      "required": [
+        "type"
+      ]
+    },
+    "customTypeReference": {
+      "title": "Custom Type",
+      "description": "Reference to a ComplexType",
+      "not": {
+        "$ref": "#/definitions/primitiveType"
+      },
+      "type": "string",
+      "pattern": "^[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*$"
+    },
+    "avroUnion": {
+      "title": "Union",
+      "description": "A Union of types",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/avroSchema"
+      },
+      "minItems": 1
+    },
+    "avroField": {
+      "title": "Field",
+      "description": "A field within a Record",
+      "type": "object",
+      "properties": {
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "type": {
+          "$ref": "#/definitions/types"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "default": true,
+        "order": {
+          "enum": [
+            "ascending",
+            "descending",
+            "ignore"
+          ]
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        }
+      },
+      "required": [
+        "name",
+        "type"
+      ]
+    },
+    "avroRecord": {
+      "title": "Record",
+      "description": "A Record",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "record"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "fields": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/avroField"
+          }
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "fields"
+      ]
+    },
+    "avroEnum": {
+      "title": "Enum",
+      "description": "An enumeration",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "enum"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "symbols": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "symbols"
+      ]
+    },
+    "avroArray": {
+      "title": "Array",
+      "description": "An array",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "array"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "items": {
+          "$ref": "#/definitions/types"
+        }
+      },
+      "required": [
+        "type",
+        "items"
+      ]
+    },
+    "avroMap": {
+      "title": "Map",
+      "description": "A map of values",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "map"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "values": {
+          "$ref": "#/definitions/types"
+        }
+      },
+      "required": [
+        "type",
+        "values"
+      ]
+    },
+    "avroFixed": {
+      "title": "Fixed",
+      "description": "A fixed sized array of bytes",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "fixed"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "size": {
+          "type": "number"
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "size"
+      ]
+    },
+    "name": {
+      "type": "string",
+      "pattern": "^[A-Za-z_][A-Za-z0-9_]*$"
+    },
+    "namespace": {
+      "type": "string",
+      "pattern": "^([A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*)*$"
+    }
+  },
+  "description": "Json-Schema definition for Avro AVSC files.",
+  "oneOf": [
+    {
+      "$ref": "#/definitions/avroSchema"
+    }
+  ],
+  "title": "Avro Schema Definition"
+}
\ No newline at end of file
diff --git a/definitions/2.5.0/message.json b/definitions/2.5.0/message.json
index 2dc35688..923f8930 100644
--- a/definitions/2.5.0/message.json
+++ b/definitions/2.5.0/message.json
@@ -213,6 +213,29 @@
                   }
                 }
               }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/vnd.apache.avro;version=1.9.0",
+                      "application/vnd.apache.avro+json;version=1.9.0",
+                      "application/vnd.apache.avro+yaml;version=1.9.0"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.5.0/avroSchema_v1.json"
+                  }
+                }
+              }
             }
           ]
         }
diff --git a/definitions/2.6.0/avroSchema_v1.json b/definitions/2.6.0/avroSchema_v1.json
new file mode 100644
index 00000000..f215bdaa
--- /dev/null
+++ b/definitions/2.6.0/avroSchema_v1.json
@@ -0,0 +1,317 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://asyncapi.com/definitions/2.6.0/avroSchema_v1.json",
+  "definitions": {
+    "avroSchema": {
+      "title": "Avro Schema",
+      "description": "Root Schema",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/types"
+        }
+      ]
+    },
+    "types": {
+      "title": "Avro Types",
+      "description": "Allowed Avro types",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/primitiveType"
+        },
+        {
+          "$ref": "#/definitions/primitiveTypeWithMetadata"
+        },
+        {
+          "$ref": "#/definitions/customTypeReference"
+        },
+        {
+          "$ref": "#/definitions/avroRecord"
+        },
+        {
+          "$ref": "#/definitions/avroEnum"
+        },
+        {
+          "$ref": "#/definitions/avroArray"
+        },
+        {
+          "$ref": "#/definitions/avroMap"
+        },
+        {
+          "$ref": "#/definitions/avroFixed"
+        },
+        {
+          "$ref": "#/definitions/avroUnion"
+        }
+      ]
+    },
+    "primitiveType": {
+      "title": "Primitive Type",
+      "description": "Basic type primitives.",
+      "type": "string",
+      "enum": [
+        "null",
+        "boolean",
+        "int",
+        "long",
+        "float",
+        "double",
+        "bytes",
+        "string"
+      ]
+    },
+    "primitiveTypeWithMetadata": {
+      "title": "Primitive Type With Metadata",
+      "description": "A primitive type with metadata attached.",
+      "type": "object",
+      "properties": {
+        "type": {
+          "$ref": "#/definitions/primitiveType"
+        }
+      },
+      "required": [
+        "type"
+      ]
+    },
+    "customTypeReference": {
+      "title": "Custom Type",
+      "description": "Reference to a ComplexType",
+      "not": {
+        "$ref": "#/definitions/primitiveType"
+      },
+      "type": "string",
+      "pattern": "^[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*$"
+    },
+    "avroUnion": {
+      "title": "Union",
+      "description": "A Union of types",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/avroSchema"
+      },
+      "minItems": 1
+    },
+    "avroField": {
+      "title": "Field",
+      "description": "A field within a Record",
+      "type": "object",
+      "properties": {
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "type": {
+          "$ref": "#/definitions/types"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "default": true,
+        "order": {
+          "enum": [
+            "ascending",
+            "descending",
+            "ignore"
+          ]
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        }
+      },
+      "required": [
+        "name",
+        "type"
+      ]
+    },
+    "avroRecord": {
+      "title": "Record",
+      "description": "A Record",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "record"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "fields": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/avroField"
+          }
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "fields"
+      ]
+    },
+    "avroEnum": {
+      "title": "Enum",
+      "description": "An enumeration",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "enum"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "symbols": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "symbols"
+      ]
+    },
+    "avroArray": {
+      "title": "Array",
+      "description": "An array",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "array"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "items": {
+          "$ref": "#/definitions/types"
+        }
+      },
+      "required": [
+        "type",
+        "items"
+      ]
+    },
+    "avroMap": {
+      "title": "Map",
+      "description": "A map of values",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "map"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "values": {
+          "$ref": "#/definitions/types"
+        }
+      },
+      "required": [
+        "type",
+        "values"
+      ]
+    },
+    "avroFixed": {
+      "title": "Fixed",
+      "description": "A fixed sized array of bytes",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "fixed"
+        },
+        "name": {
+          "$ref": "#/definitions/name"
+        },
+        "namespace": {
+          "$ref": "#/definitions/namespace"
+        },
+        "doc": {
+          "type": "string"
+        },
+        "aliases": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/name"
+          }
+        },
+        "size": {
+          "type": "number"
+        }
+      },
+      "required": [
+        "type",
+        "name",
+        "size"
+      ]
+    },
+    "name": {
+      "type": "string",
+      "pattern": "^[A-Za-z_][A-Za-z0-9_]*$"
+    },
+    "namespace": {
+      "type": "string",
+      "pattern": "^([A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*)*$"
+    }
+  },
+  "description": "Json-Schema definition for Avro AVSC files.",
+  "oneOf": [
+    {
+      "$ref": "#/definitions/avroSchema"
+    }
+  ],
+  "title": "Avro Schema Definition"
+}
\ No newline at end of file
diff --git a/definitions/2.6.0/message.json b/definitions/2.6.0/message.json
index ad3d32d1..7986b9ae 100644
--- a/definitions/2.6.0/message.json
+++ b/definitions/2.6.0/message.json
@@ -216,6 +216,29 @@
                   }
                 }
               }
+            },
+            {
+              "if": {
+                "required": [
+                  "schemaFormat"
+                ],
+                "properties": {
+                  "schemaFormat": {
+                    "enum": [
+                      "application/vnd.apache.avro;version=1.9.0",
+                      "application/vnd.apache.avro+json;version=1.9.0",
+                      "application/vnd.apache.avro+yaml;version=1.9.0"
+                    ]
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "payload": {
+                    "$ref": "http://asyncapi.com/definitions/2.6.0/avroSchema_v1.json"
+                  }
+                }
+              }
             }
           ]
         }