diff --git a/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/ApiIntegrationTest.java b/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/ApiIntegrationTest.java
index 2ea6485c3..1e88a4986 100644
--- a/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/ApiIntegrationTest.java
+++ b/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/ApiIntegrationTest.java
@@ -21,7 +21,7 @@
         classes = {SpringwolfSqsExampleApplication.class},
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ExtendWith({SqsTestContainerExtension.class})
-public class ApiIntegrationTest {
+class ApiIntegrationTest {
 
     @DynamicPropertySource
     static void setUpTestContainers(DynamicPropertyRegistry registry) {
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 75926d9bf..6290a954d 100644
--- a/springwolf-examples/springwolf-sqs-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-sqs-example/src/test/resources/asyncapi.json
@@ -45,9 +45,7 @@
             "$ref": "#/components/schemas/HeadersNotDocumented"
           },
           "bindings": {
-            "sqs": {
-              "bindingVersion": "0.2.0"
-            }
+            "sqs": { }
           }
         }
       },
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/SqsMessageBindingProcessor.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/SqsMessageBindingProcessor.java
index fd8acfae1..a2462422a 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/SqsMessageBindingProcessor.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/SqsMessageBindingProcessor.java
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
 
-import com.asyncapi.v2.binding.message.amqp.AMQPMessageBinding;
+import com.asyncapi.v2.binding.message.sqs.SQSMessageBinding;
 import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.MessageBindingProcessor;
 import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedMessageBinding;
 import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SqsAsyncOperationBinding;
@@ -23,15 +23,15 @@ public void setEmbeddedValueResolver(StringValueResolver resolver) {
     @Override
     public Optional<ProcessedMessageBinding> process(Method method) {
         return Arrays.stream(method.getAnnotations())
-                .filter(annotation -> annotation instanceof SqsAsyncOperationBinding)
-                .map(annotation -> (SqsAsyncOperationBinding) annotation)
+                .filter(SqsAsyncOperationBinding.class::isInstance)
+                .map(SqsAsyncOperationBinding.class::cast)
                 .findAny()
                 .map(this::mapToMessageBinding);
     }
 
     private ProcessedMessageBinding mapToMessageBinding(SqsAsyncOperationBinding bindingAnnotation) {
-        AMQPMessageBinding amqpMessageBinding = AMQPMessageBinding.builder().build();
+        SQSMessageBinding sqsMessageBinding = new SQSMessageBinding();
 
-        return new ProcessedMessageBinding(bindingAnnotation.type(), amqpMessageBinding);
+        return new ProcessedMessageBinding(bindingAnnotation.type(), sqsMessageBinding);
     }
 }