diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfConfigProperties.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfConfigProperties.java
index a6d60c9ae..010c7a21c 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfConfigProperties.java
+++ b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfConfigProperties.java
@@ -150,7 +150,7 @@ public static class Info {
              * Extension properties for the Info block.
              */
             @Nullable
-            private Map<String, String> extensionFields;
+            private Map<String, String> extensionFields = Map.of("x-generator", "springwolf");
         }
     }
 
diff --git a/springwolf-examples/springwolf-amqp-example/src/main/resources/application.properties b/springwolf-examples/springwolf-amqp-example/src/main/resources/application.properties
index a85a87524..3ec9d7ed0 100644
--- a/springwolf-examples/springwolf-amqp-example/src/main/resources/application.properties
+++ b/springwolf-examples/springwolf-amqp-example/src/main/resources/application.properties
@@ -20,6 +20,7 @@ springwolf.docket.info.version=1.0.0
 springwolf.docket.info.description=Springwolf example project to demonstrate springwolfs abilities
 springwolf.docket.info.terms-of-service=http://asyncapi.org/terms
 springwolf.docket.info.extension-fields.x-api-audience=company-internal
+springwolf.docket.info.extension-fields.x-generator=springwolf
 springwolf.docket.info.contact.name=springwolf
 springwolf.docket.info.contact.email=example@example.com
 springwolf.docket.info.contact.url=https://github.com/springwolf/springwolf-core
diff --git a/springwolf-examples/springwolf-amqp-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-amqp-example/src/test/resources/asyncapi.json
index 6c6d4ad90..b6c5f3fbb 100644
--- a/springwolf-examples/springwolf-amqp-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-amqp-example/src/test/resources/asyncapi.json
@@ -14,7 +14,8 @@
       "name": "Apache License 2.0",
       "x-desc": "some description"
     },
-    "x-api-audience": "company-internal"
+    "x-api-audience": "company-internal",
+    "x-generator": "springwolf"
   },
   "defaultContentType": "application/json",
   "servers": {
diff --git a/springwolf-examples/springwolf-cloud-stream-example/src/main/resources/application.properties b/springwolf-examples/springwolf-cloud-stream-example/src/main/resources/application.properties
index f9fe72611..045b64f32 100644
--- a/springwolf-examples/springwolf-cloud-stream-example/src/main/resources/application.properties
+++ b/springwolf-examples/springwolf-cloud-stream-example/src/main/resources/application.properties
@@ -16,7 +16,7 @@ spring.cloud.stream.bindings.consumerMethod-in-0.destination=another-topic
 # Springwolf configuration
 springwolf.enabled=true
 springwolf.docket.base-package=io.github.stavshamir.springwolf.example.cloudstream
-springwolf.docket.info.title=${spring.application.name}
+springwolf.docket.info.title=Springwolf example project - CloudStream
 springwolf.docket.info.version=1.0.0
 springwolf.docket.info.description=Springwolf example project to demonstrate springwolfs abilities
 springwolf.docket.info.terms-of-service=http://asyncapi.org/terms
diff --git a/springwolf-examples/springwolf-cloud-stream-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-cloud-stream-example/src/test/resources/asyncapi.json
index 6213321c1..f498ea243 100644
--- a/springwolf-examples/springwolf-cloud-stream-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-cloud-stream-example/src/test/resources/asyncapi.json
@@ -11,7 +11,8 @@
     },
     "license": {
       "name": "Apache License 2.0"
-    }
+    },
+    "x-generator": "springwolf"
   },
   "defaultContentType": "application/json",
   "servers": {
diff --git a/springwolf-examples/springwolf-jms-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-jms-example/src/test/resources/asyncapi.json
index e8469db42..f1368e997 100644
--- a/springwolf-examples/springwolf-jms-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-jms-example/src/test/resources/asyncapi.json
@@ -11,7 +11,8 @@
     },
     "license": {
       "name": "Apache License 2.0"
-    }
+    },
+    "x-generator": "springwolf"
   },
   "defaultContentType": "application/json",
   "servers": {
diff --git a/springwolf-examples/springwolf-kafka-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-kafka-example/src/test/resources/asyncapi.json
index fbdc9e901..51d971788 100644
--- a/springwolf-examples/springwolf-kafka-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-kafka-example/src/test/resources/asyncapi.json
@@ -11,7 +11,8 @@
     },
     "license": {
       "name": "Apache License 2.0"
-    }
+    },
+    "x-generator": "springwolf"
   },
   "defaultContentType": "application/json",
   "servers": {
diff --git a/springwolf-examples/springwolf-sns-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-sns-example/src/test/resources/asyncapi.json
index 2842a7931..f5008280e 100644
--- a/springwolf-examples/springwolf-sns-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-sns-example/src/test/resources/asyncapi.json
@@ -11,7 +11,8 @@
     },
     "license": {
       "name": "Apache License 2.0"
-    }
+    },
+    "x-generator": "springwolf"
   },
   "defaultContentType": "application/json",
   "servers": {
diff --git a/springwolf-examples/springwolf-sqs-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-sqs-example/src/test/resources/asyncapi.json
index 6290a954d..6fdd4bf9e 100644
--- a/springwolf-examples/springwolf-sqs-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-sqs-example/src/test/resources/asyncapi.json
@@ -11,7 +11,8 @@
     },
     "license": {
       "name": "Apache License 2.0"
-    }
+    },
+    "x-generator": "springwolf"
   },
   "defaultContentType": "application/json",
   "servers": {