diff --git a/.github/workflows/springwolf-addons.yml b/.github/workflows/springwolf-addons.yml
index 4e9b0410a..c516baf30 100644
--- a/.github/workflows/springwolf-addons.yml
+++ b/.github/workflows/springwolf-addons.yml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        addon: [ "common-model-converters", "generic-binding", "json-schema", "kotlinx-serialization-model-converter" ]
+        addon: [ "common-model-converters", "json-schema", "kotlinx-serialization-model-converter" ]
 
     env:
       addon: springwolf-add-ons/springwolf-${{ matrix.addon }}
diff --git a/build.gradle b/build.gradle
index 0892085f5..f2b7523db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,6 @@ applyDotEnvFileAsGradleProperties()
 
 var addons = [
         'springwolf-common-model-converters' ,
-        'springwolf-generic-binding' ,
         'springwolf-json-schema',
         'springwolf-kotlinx-serialization-model-converter'
 ]
diff --git a/settings.gradle b/settings.gradle
index cb878d9ed..1533eee19 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -21,7 +21,6 @@ include(
         'springwolf-examples:springwolf-stomp-example',
         'springwolf-ui',
         'springwolf-add-ons:springwolf-common-model-converters',
-        'springwolf-add-ons:springwolf-generic-binding',
         'springwolf-add-ons:springwolf-json-schema',
         'springwolf-add-ons:springwolf-kotlinx-serialization-model-converter',
 )
diff --git a/springwolf-add-ons/springwolf-generic-binding/build.gradle b/springwolf-add-ons/springwolf-generic-binding/build.gradle
deleted file mode 100644
index 4fef048bf..000000000
--- a/springwolf-add-ons/springwolf-generic-binding/build.gradle
+++ /dev/null
@@ -1,54 +0,0 @@
-import org.springframework.boot.gradle.plugin.SpringBootPlugin
-
-plugins {
-    id 'java-library'
-
-    alias libs.plugins.spring.boot
-    alias libs.plugins.cutterslade.analyze
-}
-
-dependencies {
-    api project(":springwolf-core")
-    api project(":springwolf-asyncapi")
-
-    implementation libs.slf4j.api
-
-    implementation platform(SpringBootPlugin.BOM_COORDINATES)
-    implementation libs.spring.context
-    implementation libs.spring.core
-    implementation libs.spring.boot.autoconfigure
-
-    annotationProcessor libs.lombok
-    compileOnly libs.lombok
-
-    testImplementation libs.assertj.core
-    testImplementation libs.mockito.core
-
-    testImplementation libs.junit.jupiter.api
-    testImplementation libs.junit.jupiter.params
-    testRuntimeOnly libs.junit.jupiter
-    testRuntimeOnly libs.junit.plattform.launcher
-    testRuntimeOnly libs.slf4j.simple
-}
-
-jar {
-    enabled = true
-    archiveClassifier = ''
-}
-bootJar.enabled = false
-
-java {
-    withJavadocJar()
-    withSourcesJar()
-}
-
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            pom {
-                name = 'springwolf-generic-binding'
-                description = 'Document any AsyncAPI binding in Springwolf using a generic way'
-            }
-        }
-    }
-}
diff --git a/springwolf-add-ons/springwolf-generic-binding/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springwolf-add-ons/springwolf-generic-binding/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index d03f6e98b..000000000
--- a/springwolf-add-ons/springwolf-generic-binding/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-io.github.springwolf.addons.generic_binding.annotation.configuration.SpringwolfGenericBindingAutoConfiguration
diff --git a/springwolf-add-ons/springwolf-generic-binding/README.md b/springwolf-bindings/README.md
similarity index 87%
rename from springwolf-add-ons/springwolf-generic-binding/README.md
rename to springwolf-bindings/README.md
index d4a1e9a62..448639846 100644
--- a/springwolf-add-ons/springwolf-generic-binding/README.md
+++ b/springwolf-bindings/README.md
@@ -1,4 +1,4 @@
-# Springwolf Generic Binding Add-on
+# Springwolf Generic Binding
 
 ### Table Of Contents
 
@@ -24,7 +24,7 @@ Add the following dependency:
 
 ```groovy
 dependencies {
-    implementation 'io.github.springwolf:springwolf-generic-binding:<springwolf-version>'
+    implementation 'io.github.springwolf:springwolf-bindings:<springwolf-version>'
 }
 ```
 
diff --git a/springwolf-bindings/build.gradle b/springwolf-bindings/build.gradle
index c3baae131..a84f18bc2 100644
--- a/springwolf-bindings/build.gradle
+++ b/springwolf-bindings/build.gradle
@@ -15,6 +15,7 @@ dependencies {
     implementation libs.spring.context
     implementation libs.spring.core
     implementation libs.spring.boot.autoconfigure
+    implementation libs.slf4j.api
     implementation libs.commons.lang3
     implementation libs.jakarta.annotation.api
 
@@ -23,6 +24,7 @@ dependencies {
 
     testImplementation libs.assertj.core
     testImplementation libs.mockito.core
+    testImplementation libs.junit.jupiter.params
 
     testImplementation libs.junit.jupiter.api
     testRuntimeOnly libs.junit.jupiter
diff --git a/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/AsyncGenericOperationBinding.java b/springwolf-bindings/src/main/java/io/github/springwolf/bindings/generic/annotation/AsyncGenericOperationBinding.java
similarity index 93%
rename from springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/AsyncGenericOperationBinding.java
rename to springwolf-bindings/src/main/java/io/github/springwolf/bindings/generic/annotation/AsyncGenericOperationBinding.java
index 28abc9f0f..ba7ef6cdf 100644
--- a/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/AsyncGenericOperationBinding.java
+++ b/springwolf-bindings/src/main/java/io/github/springwolf/bindings/generic/annotation/AsyncGenericOperationBinding.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.addons.generic_binding.annotation;
+package io.github.springwolf.bindings.generic.annotation;
 
 import io.github.springwolf.core.asyncapi.annotations.AsyncOperationBinding;
 
diff --git a/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/configuration/SpringwolfGenericBindingAutoConfiguration.java b/springwolf-bindings/src/main/java/io/github/springwolf/bindings/generic/configuration/SpringwolfGenericBindingAutoConfiguration.java
similarity index 86%
rename from springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/configuration/SpringwolfGenericBindingAutoConfiguration.java
rename to springwolf-bindings/src/main/java/io/github/springwolf/bindings/generic/configuration/SpringwolfGenericBindingAutoConfiguration.java
index 4aa9bf1a5..84ad7a2d7 100644
--- a/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/configuration/SpringwolfGenericBindingAutoConfiguration.java
+++ b/springwolf-bindings/src/main/java/io/github/springwolf/bindings/generic/configuration/SpringwolfGenericBindingAutoConfiguration.java
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.addons.generic_binding.annotation.configuration;
+package io.github.springwolf.bindings.generic.configuration;
 
-import io.github.springwolf.addons.generic_binding.annotation.processor.AsyncGenericOperationBindingProcessor;
+import io.github.springwolf.bindings.generic.scanners.operations.AsyncGenericOperationBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.bindings.BindingProcessorPriority;
 import io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants;
 import io.github.springwolf.core.standalone.StandaloneConfiguration;
diff --git a/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessor.java b/springwolf-bindings/src/main/java/io/github/springwolf/bindings/generic/scanners/operations/AsyncGenericOperationBindingProcessor.java
similarity index 88%
rename from springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessor.java
rename to springwolf-bindings/src/main/java/io/github/springwolf/bindings/generic/scanners/operations/AsyncGenericOperationBindingProcessor.java
index 4695b8376..24f07f2d6 100644
--- a/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessor.java
+++ b/springwolf-bindings/src/main/java/io/github/springwolf/bindings/generic/scanners/operations/AsyncGenericOperationBindingProcessor.java
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.addons.generic_binding.annotation.processor;
+package io.github.springwolf.bindings.generic.scanners.operations;
 
-import io.github.springwolf.addons.generic_binding.annotation.AsyncGenericOperationBinding;
 import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.bindings.generic.annotation.AsyncGenericOperationBinding;
 import io.github.springwolf.core.asyncapi.scanners.bindings.operations.AbstractOperationBindingProcessor;
 import io.github.springwolf.core.asyncapi.scanners.bindings.operations.ProcessedOperationBinding;
 import org.springframework.util.StringValueResolver;
diff --git a/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/processor/PropertiesUtil.java b/springwolf-bindings/src/main/java/io/github/springwolf/bindings/generic/scanners/operations/PropertiesUtil.java
similarity index 97%
rename from springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/processor/PropertiesUtil.java
rename to springwolf-bindings/src/main/java/io/github/springwolf/bindings/generic/scanners/operations/PropertiesUtil.java
index ea6e828eb..3fb0d4118 100644
--- a/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/processor/PropertiesUtil.java
+++ b/springwolf-bindings/src/main/java/io/github/springwolf/bindings/generic/scanners/operations/PropertiesUtil.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.addons.generic_binding.annotation.processor;
+package io.github.springwolf.bindings.generic.scanners.operations;
 
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/springwolf-bindings/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springwolf-bindings/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index eb76f446f..7992ebfea 100644
--- a/springwolf-bindings/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/springwolf-bindings/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -5,3 +5,4 @@ io.github.springwolf.bindings.kafka.configuration.SpringwolfKafkaBindingAutoConf
 io.github.springwolf.bindings.sns.configuration.SpringwolfSnsBindingAutoConfiguration
 io.github.springwolf.bindings.sqs.configuration.SpringwolfSqsBindingAutoConfiguration
 io.github.springwolf.bindings.stomp.configuration.SpringwolfStompBindingAutoConfiguration
+io.github.springwolf.bindings.generic.configuration.SpringwolfGenericBindingAutoConfiguration
diff --git a/springwolf-add-ons/springwolf-generic-binding/src/test/java/io/github/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessorTest.java b/springwolf-bindings/src/test/java/io/github/springwolf/bindings/generic/scanners/operations/AsyncGenericOperationBindingProcessorTest.java
similarity index 97%
rename from springwolf-add-ons/springwolf-generic-binding/src/test/java/io/github/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessorTest.java
rename to springwolf-bindings/src/test/java/io/github/springwolf/bindings/generic/scanners/operations/AsyncGenericOperationBindingProcessorTest.java
index d5bf314b8..c33b6e6d2 100644
--- a/springwolf-add-ons/springwolf-generic-binding/src/test/java/io/github/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessorTest.java
+++ b/springwolf-bindings/src/test/java/io/github/springwolf/bindings/generic/scanners/operations/AsyncGenericOperationBindingProcessorTest.java
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
-package io.github.springwolf.addons.generic_binding.annotation.processor;
+package io.github.springwolf.bindings.generic.scanners.operations;
 
-import io.github.springwolf.addons.generic_binding.annotation.AsyncGenericOperationBinding;
+import io.github.springwolf.bindings.generic.annotation.AsyncGenericOperationBinding;
 import io.github.springwolf.core.asyncapi.scanners.bindings.operations.ProcessedOperationBinding;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
diff --git a/springwolf-examples/springwolf-jms-example/build.gradle b/springwolf-examples/springwolf-jms-example/build.gradle
index 2fef28179..259deb12f 100644
--- a/springwolf-examples/springwolf-jms-example/build.gradle
+++ b/springwolf-examples/springwolf-jms-example/build.gradle
@@ -11,7 +11,7 @@ plugins {
 
 dependencies {
     implementation project(":springwolf-core")
-    implementation project(":springwolf-add-ons:springwolf-generic-binding")
+    implementation project(":springwolf-bindings")
     implementation project(":springwolf-plugins:springwolf-jms")
     permitUnusedDeclared project(":springwolf-plugins:springwolf-jms")
     permitUsedUndeclared project(":springwolf-bindings")
diff --git a/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/producers/AnotherProducer.java b/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/producers/AnotherProducer.java
index 0d63145c6..2511084f0 100644
--- a/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/producers/AnotherProducer.java
+++ b/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/producers/AnotherProducer.java
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package io.github.springwolf.examples.jms.producers;
 
-import io.github.springwolf.addons.generic_binding.annotation.AsyncGenericOperationBinding;
+import io.github.springwolf.bindings.generic.annotation.AsyncGenericOperationBinding;
 import io.github.springwolf.bindings.jms.annotations.JmsAsyncOperationBinding;
 import io.github.springwolf.core.asyncapi.annotations.AsyncOperation;
 import io.github.springwolf.core.asyncapi.annotations.AsyncPublisher;