diff --git a/bindings/kafka/0.4.0/message.json b/bindings/kafka/0.4.0/message.json
index e7648595..704c7c0d 100644
--- a/bindings/kafka/0.4.0/message.json
+++ b/bindings/kafka/0.4.0/message.json
@@ -19,7 +19,7 @@
           "$ref": "http://asyncapi.com/definitions/3.0.0/schema.json"
         },
         {
-          "$ref": "http://asyncapi.com/definitions/avroSchema_v1.json"
+          "$ref": "http://asyncapi.com/common/avroSchema_v1.json"
         }
       ],
       "description": "The message key."
diff --git a/common/avroSchema_v1.json b/common/avroSchema_v1.json
index 88842cd1..f3bfcd2b 100644
--- a/common/avroSchema_v1.json
+++ b/common/avroSchema_v1.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "http://asyncapi.com/definitions/avroSchema_v1.json",
+  "$id": "http://asyncapi.com/common/avroSchema_v1.json",
   "definitions": {
     "avroSchema": {
       "title": "Avro Schema",
diff --git a/common/openapiSchema_3_0.json b/common/openapiSchema_3_0.json
index fc2cf33c..00e3a6ca 100644
--- a/common/openapiSchema_3_0.json
+++ b/common/openapiSchema_3_0.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "http://asyncapi.com/definitions/openapiSchema_3_0.json",
+  "$id": "http://asyncapi.com/common/openapiSchema_3_0.json",
   "type": "object",
   "definitions": {
     "ExternalDocumentation": {
diff --git a/definitions/2.0.0/message.json b/definitions/2.0.0/message.json
index 80a19e79..0061db97 100644
--- a/definitions/2.0.0/message.json
+++ b/definitions/2.0.0/message.json
@@ -200,7 +200,7 @@
               "then": {
                 "properties": {
                   "payload": {
-                    "$ref": "http://asyncapi.com/definitions/openapiSchema_3_0.json"
+                    "$ref": "http://asyncapi.com/common/openapiSchema_3_0.json"
                   }
                 }
               }
@@ -223,7 +223,7 @@
               "then": {
                 "properties": {
                   "payload": {
-                    "$ref": "http://asyncapi.com/definitions/avroSchema_v1.json"
+                    "$ref": "http://asyncapi.com/common/avroSchema_v1.json"
                   }
                 }
               }
diff --git a/definitions/2.1.0/message.json b/definitions/2.1.0/message.json
index 4c22c962..a280a824 100644
--- a/definitions/2.1.0/message.json
+++ b/definitions/2.1.0/message.json
@@ -223,7 +223,7 @@
               "then": {
                 "properties": {
                   "payload": {
-                    "$ref": "http://asyncapi.com/definitions/openapiSchema_3_0.json"
+                    "$ref": "http://asyncapi.com/common/openapiSchema_3_0.json"
                   }
                 }
               }
@@ -246,7 +246,7 @@
               "then": {
                 "properties": {
                   "payload": {
-                    "$ref": "http://asyncapi.com/definitions/avroSchema_v1.json"
+                    "$ref": "http://asyncapi.com/common/avroSchema_v1.json"
                   }
                 }
               }
diff --git a/definitions/2.2.0/message.json b/definitions/2.2.0/message.json
index 5d87baab..ec71a4d8 100644
--- a/definitions/2.2.0/message.json
+++ b/definitions/2.2.0/message.json
@@ -226,7 +226,7 @@
               "then": {
                 "properties": {
                   "payload": {
-                    "$ref": "http://asyncapi.com/definitions/openapiSchema_3_0.json"
+                    "$ref": "http://asyncapi.com/common/openapiSchema_3_0.json"
                   }
                 }
               }
@@ -249,7 +249,7 @@
               "then": {
                 "properties": {
                   "payload": {
-                    "$ref": "http://asyncapi.com/definitions/avroSchema_v1.json"
+                    "$ref": "http://asyncapi.com/common/avroSchema_v1.json"
                   }
                 }
               }
diff --git a/definitions/2.3.0/message.json b/definitions/2.3.0/message.json
index ea04e8e6..fd6d8f5e 100644
--- a/definitions/2.3.0/message.json
+++ b/definitions/2.3.0/message.json
@@ -229,7 +229,7 @@
               "then": {
                 "properties": {
                   "payload": {
-                    "$ref": "http://asyncapi.com/definitions/openapiSchema_3_0.json"
+                    "$ref": "http://asyncapi.com/common/openapiSchema_3_0.json"
                   }
                 }
               }
@@ -252,7 +252,7 @@
               "then": {
                 "properties": {
                   "payload": {
-                    "$ref": "http://asyncapi.com/definitions/avroSchema_v1.json"
+                    "$ref": "http://asyncapi.com/common/avroSchema_v1.json"
                   }
                 }
               }
diff --git a/definitions/2.4.0/message.json b/definitions/2.4.0/message.json
index 8da3d78b..25efb274 100644
--- a/definitions/2.4.0/message.json
+++ b/definitions/2.4.0/message.json
@@ -235,7 +235,7 @@
               "then": {
                 "properties": {
                   "payload": {
-                    "$ref": "http://asyncapi.com/definitions/openapiSchema_3_0.json"
+                    "$ref": "http://asyncapi.com/common/openapiSchema_3_0.json"
                   }
                 }
               }
@@ -258,7 +258,7 @@
               "then": {
                 "properties": {
                   "payload": {
-                    "$ref": "http://asyncapi.com/definitions/avroSchema_v1.json"
+                    "$ref": "http://asyncapi.com/common/avroSchema_v1.json"
                   }
                 }
               }
diff --git a/definitions/2.5.0/message.json b/definitions/2.5.0/message.json
index 402923aa..63a4506d 100644
--- a/definitions/2.5.0/message.json
+++ b/definitions/2.5.0/message.json
@@ -232,7 +232,7 @@
               "then": {
                 "properties": {
                   "payload": {
-                    "$ref": "http://asyncapi.com/definitions/openapiSchema_3_0.json"
+                    "$ref": "http://asyncapi.com/common/openapiSchema_3_0.json"
                   }
                 }
               }
@@ -255,7 +255,7 @@
               "then": {
                 "properties": {
                   "payload": {
-                    "$ref": "http://asyncapi.com/definitions/avroSchema_v1.json"
+                    "$ref": "http://asyncapi.com/common/avroSchema_v1.json"
                   }
                 }
               }
diff --git a/definitions/2.6.0/message.json b/definitions/2.6.0/message.json
index 8af9fdb4..f9e5b438 100644
--- a/definitions/2.6.0/message.json
+++ b/definitions/2.6.0/message.json
@@ -240,7 +240,7 @@
               "then": {
                 "properties": {
                   "payload": {
-                    "$ref": "http://asyncapi.com/definitions/openapiSchema_3_0.json"
+                    "$ref": "http://asyncapi.com/common/openapiSchema_3_0.json"
                   }
                 }
               }
@@ -263,7 +263,7 @@
               "then": {
                 "properties": {
                   "payload": {
-                    "$ref": "http://asyncapi.com/definitions/avroSchema_v1.json"
+                    "$ref": "http://asyncapi.com/common/avroSchema_v1.json"
                   }
                 }
               }
diff --git a/definitions/3.0.0/multiFormatSchema.json b/definitions/3.0.0/multiFormatSchema.json
index dabe48eb..de026c72 100644
--- a/definitions/3.0.0/multiFormatSchema.json
+++ b/definitions/3.0.0/multiFormatSchema.json
@@ -158,7 +158,7 @@
                   "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
                 },
                 {
-                  "$ref": "http://asyncapi.com/definitions/openapiSchema_3_0.json"
+                  "$ref": "http://asyncapi.com/common/openapiSchema_3_0.json"
                 }
               ]
             }
@@ -188,7 +188,7 @@
                   "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
                 },
                 {
-                  "$ref": "http://asyncapi.com/definitions/avroSchema_v1.json"
+                  "$ref": "http://asyncapi.com/common/avroSchema_v1.json"
                 }
               ]
             }
diff --git a/schemas/2.0.0.json b/schemas/2.0.0.json
index 1e1d3f82..2398d17a 100644
--- a/schemas/2.0.0.json
+++ b/schemas/2.0.0.json
@@ -1046,7 +1046,7 @@
                                     "then": {
                                         "properties": {
                                             "payload": {
-                                                "$ref": "http://asyncapi.com/definitions/openapiSchema_3_0.json"
+                                                "$ref": "http://asyncapi.com/common/openapiSchema_3_0.json"
                                             }
                                         }
                                     }
@@ -1069,7 +1069,7 @@
                                     "then": {
                                         "properties": {
                                             "payload": {
-                                                "$ref": "http://asyncapi.com/definitions/avroSchema_v1.json"
+                                                "$ref": "http://asyncapi.com/common/avroSchema_v1.json"
                                             }
                                         }
                                     }
@@ -1185,8 +1185,8 @@
                 }
             }
         },
-        "http://asyncapi.com/definitions/openapiSchema_3_0.json": {
-            "$id": "http://asyncapi.com/definitions/openapiSchema_3_0.json",
+        "http://asyncapi.com/common/openapiSchema_3_0.json": {
+            "$id": "http://asyncapi.com/common/openapiSchema_3_0.json",
             "type": "object",
             "definitions": {
                 "ExternalDocumentation": {
@@ -1472,8 +1472,8 @@
             },
             "additionalProperties": false
         },
-        "http://asyncapi.com/definitions/avroSchema_v1.json": {
-            "$id": "http://asyncapi.com/definitions/avroSchema_v1.json",
+        "http://asyncapi.com/common/avroSchema_v1.json": {
+            "$id": "http://asyncapi.com/common/avroSchema_v1.json",
             "definitions": {
                 "avroSchema": {
                     "title": "Avro Schema",
diff --git a/schemas/2.1.0.json b/schemas/2.1.0.json
index d893e202..8cfde4c0 100644
--- a/schemas/2.1.0.json
+++ b/schemas/2.1.0.json
@@ -1070,7 +1070,7 @@
                                     "then": {
                                         "properties": {
                                             "payload": {
-                                                "$ref": "http://asyncapi.com/definitions/openapiSchema_3_0.json"
+                                                "$ref": "http://asyncapi.com/common/openapiSchema_3_0.json"
                                             }
                                         }
                                     }
@@ -1093,7 +1093,7 @@
                                     "then": {
                                         "properties": {
                                             "payload": {
-                                                "$ref": "http://asyncapi.com/definitions/avroSchema_v1.json"
+                                                "$ref": "http://asyncapi.com/common/avroSchema_v1.json"
                                             }
                                         }
                                     }
@@ -1236,8 +1236,8 @@
                 }
             }
         },
-        "http://asyncapi.com/definitions/openapiSchema_3_0.json": {
-            "$id": "http://asyncapi.com/definitions/openapiSchema_3_0.json",
+        "http://asyncapi.com/common/openapiSchema_3_0.json": {
+            "$id": "http://asyncapi.com/common/openapiSchema_3_0.json",
             "type": "object",
             "definitions": {
                 "ExternalDocumentation": {
@@ -1523,8 +1523,8 @@
             },
             "additionalProperties": false
         },
-        "http://asyncapi.com/definitions/avroSchema_v1.json": {
-            "$id": "http://asyncapi.com/definitions/avroSchema_v1.json",
+        "http://asyncapi.com/common/avroSchema_v1.json": {
+            "$id": "http://asyncapi.com/common/avroSchema_v1.json",
             "definitions": {
                 "avroSchema": {
                     "title": "Avro Schema",
diff --git a/schemas/2.2.0.json b/schemas/2.2.0.json
index a8fa2ac6..f9f0b2f8 100644
--- a/schemas/2.2.0.json
+++ b/schemas/2.2.0.json
@@ -1082,7 +1082,7 @@
                                     "then": {
                                         "properties": {
                                             "payload": {
-                                                "$ref": "http://asyncapi.com/definitions/openapiSchema_3_0.json"
+                                                "$ref": "http://asyncapi.com/common/openapiSchema_3_0.json"
                                             }
                                         }
                                     }
@@ -1105,7 +1105,7 @@
                                     "then": {
                                         "properties": {
                                             "payload": {
-                                                "$ref": "http://asyncapi.com/definitions/avroSchema_v1.json"
+                                                "$ref": "http://asyncapi.com/common/avroSchema_v1.json"
                                             }
                                         }
                                     }
@@ -1221,8 +1221,8 @@
                 }
             }
         },
-        "http://asyncapi.com/definitions/openapiSchema_3_0.json": {
-            "$id": "http://asyncapi.com/definitions/openapiSchema_3_0.json",
+        "http://asyncapi.com/common/openapiSchema_3_0.json": {
+            "$id": "http://asyncapi.com/common/openapiSchema_3_0.json",
             "type": "object",
             "definitions": {
                 "ExternalDocumentation": {
@@ -1508,8 +1508,8 @@
             },
             "additionalProperties": false
         },
-        "http://asyncapi.com/definitions/avroSchema_v1.json": {
-            "$id": "http://asyncapi.com/definitions/avroSchema_v1.json",
+        "http://asyncapi.com/common/avroSchema_v1.json": {
+            "$id": "http://asyncapi.com/common/avroSchema_v1.json",
             "definitions": {
                 "avroSchema": {
                     "title": "Avro Schema",
diff --git a/schemas/2.3.0.json b/schemas/2.3.0.json
index 2be5928e..37682eca 100644
--- a/schemas/2.3.0.json
+++ b/schemas/2.3.0.json
@@ -1098,7 +1098,7 @@
                                     "then": {
                                         "properties": {
                                             "payload": {
-                                                "$ref": "http://asyncapi.com/definitions/openapiSchema_3_0.json"
+                                                "$ref": "http://asyncapi.com/common/openapiSchema_3_0.json"
                                             }
                                         }
                                     }
@@ -1121,7 +1121,7 @@
                                     "then": {
                                         "properties": {
                                             "payload": {
-                                                "$ref": "http://asyncapi.com/definitions/avroSchema_v1.json"
+                                                "$ref": "http://asyncapi.com/common/avroSchema_v1.json"
                                             }
                                         }
                                     }
@@ -1237,8 +1237,8 @@
                 }
             }
         },
-        "http://asyncapi.com/definitions/openapiSchema_3_0.json": {
-            "$id": "http://asyncapi.com/definitions/openapiSchema_3_0.json",
+        "http://asyncapi.com/common/openapiSchema_3_0.json": {
+            "$id": "http://asyncapi.com/common/openapiSchema_3_0.json",
             "type": "object",
             "definitions": {
                 "ExternalDocumentation": {
@@ -1524,8 +1524,8 @@
             },
             "additionalProperties": false
         },
-        "http://asyncapi.com/definitions/avroSchema_v1.json": {
-            "$id": "http://asyncapi.com/definitions/avroSchema_v1.json",
+        "http://asyncapi.com/common/avroSchema_v1.json": {
+            "$id": "http://asyncapi.com/common/avroSchema_v1.json",
             "definitions": {
                 "avroSchema": {
                     "title": "Avro Schema",
diff --git a/schemas/2.4.0.json b/schemas/2.4.0.json
index d8bf12da..f220e5f7 100644
--- a/schemas/2.4.0.json
+++ b/schemas/2.4.0.json
@@ -1116,7 +1116,7 @@
                                     "then": {
                                         "properties": {
                                             "payload": {
-                                                "$ref": "http://asyncapi.com/definitions/openapiSchema_3_0.json"
+                                                "$ref": "http://asyncapi.com/common/openapiSchema_3_0.json"
                                             }
                                         }
                                     }
@@ -1139,7 +1139,7 @@
                                     "then": {
                                         "properties": {
                                             "payload": {
-                                                "$ref": "http://asyncapi.com/definitions/avroSchema_v1.json"
+                                                "$ref": "http://asyncapi.com/common/avroSchema_v1.json"
                                             }
                                         }
                                     }
@@ -1258,8 +1258,8 @@
                 }
             }
         },
-        "http://asyncapi.com/definitions/openapiSchema_3_0.json": {
-            "$id": "http://asyncapi.com/definitions/openapiSchema_3_0.json",
+        "http://asyncapi.com/common/openapiSchema_3_0.json": {
+            "$id": "http://asyncapi.com/common/openapiSchema_3_0.json",
             "type": "object",
             "definitions": {
                 "ExternalDocumentation": {
@@ -1545,8 +1545,8 @@
             },
             "additionalProperties": false
         },
-        "http://asyncapi.com/definitions/avroSchema_v1.json": {
-            "$id": "http://asyncapi.com/definitions/avroSchema_v1.json",
+        "http://asyncapi.com/common/avroSchema_v1.json": {
+            "$id": "http://asyncapi.com/common/avroSchema_v1.json",
             "definitions": {
                 "avroSchema": {
                     "title": "Avro Schema",
diff --git a/schemas/2.5.0.json b/schemas/2.5.0.json
index 00ba45bf..f078bf4e 100644
--- a/schemas/2.5.0.json
+++ b/schemas/2.5.0.json
@@ -1130,7 +1130,7 @@
                                     "then": {
                                         "properties": {
                                             "payload": {
-                                                "$ref": "http://asyncapi.com/definitions/openapiSchema_3_0.json"
+                                                "$ref": "http://asyncapi.com/common/openapiSchema_3_0.json"
                                             }
                                         }
                                     }
@@ -1153,7 +1153,7 @@
                                     "then": {
                                         "properties": {
                                             "payload": {
-                                                "$ref": "http://asyncapi.com/definitions/avroSchema_v1.json"
+                                                "$ref": "http://asyncapi.com/common/avroSchema_v1.json"
                                             }
                                         }
                                     }
@@ -1272,8 +1272,8 @@
                 }
             }
         },
-        "http://asyncapi.com/definitions/openapiSchema_3_0.json": {
-            "$id": "http://asyncapi.com/definitions/openapiSchema_3_0.json",
+        "http://asyncapi.com/common/openapiSchema_3_0.json": {
+            "$id": "http://asyncapi.com/common/openapiSchema_3_0.json",
             "type": "object",
             "definitions": {
                 "ExternalDocumentation": {
@@ -1559,8 +1559,8 @@
             },
             "additionalProperties": false
         },
-        "http://asyncapi.com/definitions/avroSchema_v1.json": {
-            "$id": "http://asyncapi.com/definitions/avroSchema_v1.json",
+        "http://asyncapi.com/common/avroSchema_v1.json": {
+            "$id": "http://asyncapi.com/common/avroSchema_v1.json",
             "definitions": {
                 "avroSchema": {
                     "title": "Avro Schema",
diff --git a/schemas/2.6.0.json b/schemas/2.6.0.json
index b5ed42e6..c8d604cd 100644
--- a/schemas/2.6.0.json
+++ b/schemas/2.6.0.json
@@ -1439,7 +1439,7 @@
                                     "then": {
                                         "properties": {
                                             "payload": {
-                                                "$ref": "http://asyncapi.com/definitions/openapiSchema_3_0.json"
+                                                "$ref": "http://asyncapi.com/common/openapiSchema_3_0.json"
                                             }
                                         }
                                     }
@@ -1462,7 +1462,7 @@
                                     "then": {
                                         "properties": {
                                             "payload": {
-                                                "$ref": "http://asyncapi.com/definitions/avroSchema_v1.json"
+                                                "$ref": "http://asyncapi.com/common/avroSchema_v1.json"
                                             }
                                         }
                                     }
@@ -1726,8 +1726,8 @@
                 }
             ]
         },
-        "http://asyncapi.com/definitions/openapiSchema_3_0.json": {
-            "$id": "http://asyncapi.com/definitions/openapiSchema_3_0.json",
+        "http://asyncapi.com/common/openapiSchema_3_0.json": {
+            "$id": "http://asyncapi.com/common/openapiSchema_3_0.json",
             "type": "object",
             "definitions": {
                 "ExternalDocumentation": {
@@ -2013,8 +2013,8 @@
             },
             "additionalProperties": false
         },
-        "http://asyncapi.com/definitions/avroSchema_v1.json": {
-            "$id": "http://asyncapi.com/definitions/avroSchema_v1.json",
+        "http://asyncapi.com/common/avroSchema_v1.json": {
+            "$id": "http://asyncapi.com/common/avroSchema_v1.json",
             "definitions": {
                 "avroSchema": {
                     "title": "Avro Schema",
diff --git a/schemas/3.0.0.json b/schemas/3.0.0.json
index 1bef469a..8914c425 100644
--- a/schemas/3.0.0.json
+++ b/schemas/3.0.0.json
@@ -2947,7 +2947,7 @@
                                             "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
                                         },
                                         {
-                                            "$ref": "http://asyncapi.com/definitions/openapiSchema_3_0.json"
+                                            "$ref": "http://asyncapi.com/common/openapiSchema_3_0.json"
                                         }
                                     ]
                                 }
@@ -2977,7 +2977,7 @@
                                             "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
                                         },
                                         {
-                                            "$ref": "http://asyncapi.com/definitions/avroSchema_v1.json"
+                                            "$ref": "http://asyncapi.com/common/avroSchema_v1.json"
                                         }
                                     ]
                                 }
@@ -2987,8 +2987,8 @@
                 ]
             }
         },
-        "http://asyncapi.com/definitions/openapiSchema_3_0.json": {
-            "$id": "http://asyncapi.com/definitions/openapiSchema_3_0.json",
+        "http://asyncapi.com/common/openapiSchema_3_0.json": {
+            "$id": "http://asyncapi.com/common/openapiSchema_3_0.json",
             "type": "object",
             "definitions": {
                 "ExternalDocumentation": {
@@ -3274,8 +3274,8 @@
             },
             "additionalProperties": false
         },
-        "http://asyncapi.com/definitions/avroSchema_v1.json": {
-            "$id": "http://asyncapi.com/definitions/avroSchema_v1.json",
+        "http://asyncapi.com/common/avroSchema_v1.json": {
+            "$id": "http://asyncapi.com/common/avroSchema_v1.json",
             "definitions": {
                 "avroSchema": {
                     "title": "Avro Schema",
@@ -4288,7 +4288,7 @@
                             "$ref": "http://asyncapi.com/definitions/3.0.0/schema.json"
                         },
                         {
-                            "$ref": "http://asyncapi.com/definitions/avroSchema_v1.json"
+                            "$ref": "http://asyncapi.com/common/avroSchema_v1.json"
                         }
                     ],
                     "description": "The message key."