diff --git a/package-lock.json b/package-lock.json
index 8fac18a7..1730b893 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@asyncapi/specs",
-  "version": "2.15.0-next-spec.1",
+  "version": "2.15.0-next-spec.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4566587d..3aca6373 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@asyncapi/specs",
-  "version": "2.15.0-next-spec.1",
+  "version": "2.15.0-next-spec.2",
   "description": "AsyncAPI schema versions",
   "main": "index.js",
   "scripts": {
diff --git a/schemas/2.5.0.json b/schemas/2.5.0.json
index 921e3a33..d2070555 100644
--- a/schemas/2.5.0.json
+++ b/schemas/2.5.0.json
@@ -222,6 +222,13 @@
                 },
                 "bindings": {
                     "$ref": "http://asyncapi.com/definitions/2.5.0/bindingsObject.json"
+                },
+                "tags": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "http://asyncapi.com/definitions/2.5.0/tag.json"
+                    },
+                    "uniqueItems": true
                 }
             }
         },
@@ -305,6 +312,53 @@
                 "solace": {}
             }
         },
+        "http://asyncapi.com/definitions/2.5.0/tag.json": {
+            "$id": "http://asyncapi.com/definitions/2.5.0/tag.json",
+            "type": "object",
+            "additionalProperties": false,
+            "required": [
+                "name"
+            ],
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "externalDocs": {
+                    "$ref": "http://asyncapi.com/definitions/2.5.0/externalDocs.json"
+                }
+            },
+            "patternProperties": {
+                "^x-[\\w\\d\\.\\x2d_]+$": {
+                    "$ref": "http://asyncapi.com/definitions/2.5.0/specificationExtension.json"
+                }
+            }
+        },
+        "http://asyncapi.com/definitions/2.5.0/externalDocs.json": {
+            "$id": "http://asyncapi.com/definitions/2.5.0/externalDocs.json",
+            "type": "object",
+            "additionalProperties": false,
+            "description": "information about external documentation",
+            "required": [
+                "url"
+            ],
+            "properties": {
+                "description": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string",
+                    "format": "uri"
+                }
+            },
+            "patternProperties": {
+                "^x-[\\w\\d\\.\\x2d_]+$": {
+                    "$ref": "http://asyncapi.com/definitions/2.5.0/specificationExtension.json"
+                }
+            }
+        },
         "http://asyncapi.com/definitions/2.5.0/channels.json": {
             "$id": "http://asyncapi.com/definitions/2.5.0/channels.json",
             "type": "object",
@@ -730,29 +784,6 @@
             },
             "default": true
         },
-        "http://asyncapi.com/definitions/2.5.0/externalDocs.json": {
-            "$id": "http://asyncapi.com/definitions/2.5.0/externalDocs.json",
-            "type": "object",
-            "additionalProperties": false,
-            "description": "information about external documentation",
-            "required": [
-                "url"
-            ],
-            "properties": {
-                "description": {
-                    "type": "string"
-                },
-                "url": {
-                    "type": "string",
-                    "format": "uri"
-                }
-            },
-            "patternProperties": {
-                "^x-[\\w\\d\\.\\x2d_]+$": {
-                    "$ref": "http://asyncapi.com/definitions/2.5.0/specificationExtension.json"
-                }
-            }
-        },
         "http://asyncapi.com/definitions/2.5.0/operation.json": {
             "$id": "http://asyncapi.com/definitions/2.5.0/operation.json",
             "type": "object",
@@ -868,30 +899,6 @@
                 }
             }
         },
-        "http://asyncapi.com/definitions/2.5.0/tag.json": {
-            "$id": "http://asyncapi.com/definitions/2.5.0/tag.json",
-            "type": "object",
-            "additionalProperties": false,
-            "required": [
-                "name"
-            ],
-            "properties": {
-                "name": {
-                    "type": "string"
-                },
-                "description": {
-                    "type": "string"
-                },
-                "externalDocs": {
-                    "$ref": "http://asyncapi.com/definitions/2.5.0/externalDocs.json"
-                }
-            },
-            "patternProperties": {
-                "^x-[\\w\\d\\.\\x2d_]+$": {
-                    "$ref": "http://asyncapi.com/definitions/2.5.0/specificationExtension.json"
-                }
-            }
-        },
         "http://asyncapi.com/definitions/2.5.0/message.json": {
             "$id": "http://asyncapi.com/definitions/2.5.0/message.json",
             "oneOf": [