diff --git a/src/Host.Transport.Properties.xml b/src/Host.Transport.Properties.xml
index 67f7042d..722bb3cb 100644
--- a/src/Host.Transport.Properties.xml
+++ b/src/Host.Transport.Properties.xml
@@ -4,7 +4,7 @@
 	<Import Project="Common.Properties.xml" />
 
 	<PropertyGroup>
-    <Version>2.1.2</Version>
+    <Version>2.1.3</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
diff --git a/src/SlimMessageBus.Host.AsyncApi/MessageBusDocumentGenerator.cs b/src/SlimMessageBus.Host.AsyncApi/MessageBusDocumentGenerator.cs
index 5b10cc79..9f410d13 100644
--- a/src/SlimMessageBus.Host.AsyncApi/MessageBusDocumentGenerator.cs
+++ b/src/SlimMessageBus.Host.AsyncApi/MessageBusDocumentGenerator.cs
@@ -10,7 +10,6 @@
 
 using Saunter;
 using Saunter.AsyncApiSchema.v2;
-using Saunter.AsyncApiSchema.v2.Bindings;
 using Saunter.Attributes;
 using Saunter.Generation;
 using Saunter.Generation.Filters;
@@ -44,13 +43,13 @@ public AsyncApiDocument GenerateDocument(TypeInfo[] asyncApiTypes, AsyncApiOptio
         // ToDo: implement
         var serverByBusSettings = new Dictionary<MessageBusSettings, NamedServer>
         {
-            { _busSettings, new("root", new Server("kafka://kafka.cluster", "kafka")) }
+            { _busSettings, new("root", new Server("smb://smb.cluster", "kafka")) }
         };
         foreach (var childMessageBusSettings in _busSettings.Children)
         {
             if (busFilter == null || busFilter(childMessageBusSettings))
             {
-                serverByBusSettings.Add(childMessageBusSettings, new(childMessageBusSettings.Name, new Server("kafka://kafka.cluster", "kafka")));
+                serverByBusSettings.Add(childMessageBusSettings, new(childMessageBusSettings.Name, new Server("smb://smb.cluster", "kafka")));
             }
         }
 
@@ -106,7 +105,6 @@ private static void GenerateChannelsFromConsumers(IDictionary<string, ChannelIte
             {
                 Description = $"{consumer.PathKind}: {consumer.Path}",
                 Subscribe = subscribeOperation,
-                Bindings = new ChannelBindingsReference(namedServer.Name),
                 Servers = new List<string> { namedServer.Name },
             };
 
@@ -140,7 +138,6 @@ private static void GenerateChannelsFromProducers(IDictionary<string, ChannelIte
             {
                 Description = $"{producer.PathKind}: {producer.DefaultPath}",
                 Publish = publishOperation,
-                Bindings = new ChannelBindingsReference(namedServer.Name),
                 Servers = new List<string> { namedServer.Name },
             };
 
@@ -172,7 +169,6 @@ private static void GenerateChannelsFromProducers(IDictionary<string, ChannelIte
             Summary = consumerHandleMethod!.GetXmlDocsSummary() ?? consumerType.GetXmlDocsSummary(),
             Description = (!string.IsNullOrEmpty(consumerHandleMethod!.GetXmlDocsRemarks()) ? consumerHandleMethod!.GetXmlDocsRemarks() : null) ?? (!string.IsNullOrEmpty(consumerType.GetXmlDocsRemarks()) ? consumerType.GetXmlDocsRemarks() : null),
             Message = messages,
-            Bindings = new OperationBindingsReference(namedServer.Name),
         };
 
         // Add all message types pushed via this channel (topic/queue)
@@ -210,7 +206,6 @@ internal static string GetMessageId(Type messageType)
         {
             OperationId = $"{producer.DefaultPath}_{producer.MessageType.Name}",
             Message = messages,
-            Bindings = new OperationBindingsReference(namedServer.Name),
         };
 
         // Add all message types pushed via this channel (topic/queue)
@@ -237,7 +232,6 @@ private static IMessage GenerateMessageFromAttribute(Type messageType, AsyncApiS
             Title = messageType.Name,
             Summary = messageType.GetXmlDocsSummary(),
             Description = messageType.GetXmlDocsRemarks(),
-            Bindings = new MessageBindingsReference(namedServer.Name),
         };
         message.Name = message.Payload.ActualSchema.Id;