diff --git a/extensions/aws2-cw/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/aws2-cw/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index f9697650d30b..89ca69b3a149 100644
--- a/extensions/aws2-cw/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/aws2-cw/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -22,7 +22,7 @@
 #
 ---
 name: "Camel AWS 2 CloudWatch"
-description: "Sending metrics to AWS CloudWatch using AWS SDK version 2.x"
+description: "Sending metrics to AWS CloudWatch"
 icon-url: "https://camel.apache.org/_/img/logo-d-f21b25ba38.svg"
 metadata:
   keywords:
diff --git a/extensions/aws2-ec2/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/aws2-ec2/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 00910e1a359e..39535438d815 100644
--- a/extensions/aws2-ec2/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/aws2-ec2/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -22,7 +22,7 @@
 #
 ---
 name: "Camel AWS 2 Elastic Compute Cloud (EC2)"
-description: "Manage AWS EC2 instances using AWS SDK version 2.x"
+description: "Manage AWS EC2 instances"
 icon-url: "https://camel.apache.org/_/img/logo-d-f21b25ba38.svg"
 metadata:
   keywords:
diff --git a/extensions/aws2-ecs/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/aws2-ecs/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index e1774c17c32d..51bdd80b3f31 100644
--- a/extensions/aws2-ecs/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/aws2-ecs/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -22,7 +22,7 @@
 #
 ---
 name: "Camel AWS 2 Elastic Container Service (ECS)"
-description: "Manage AWS ECS cluster instances using AWS SDK version 2.x"
+description: "Manage AWS ECS cluster instances"
 icon-url: "https://camel.apache.org/_/img/logo-d-f21b25ba38.svg"
 metadata:
   keywords:
diff --git a/extensions/aws2-eks/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/aws2-eks/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index cf24c884fcd6..ed881fed1de8 100644
--- a/extensions/aws2-eks/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/aws2-eks/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -22,7 +22,7 @@
 #
 ---
 name: "Camel AWS 2 Elastic Kubernetes Service (EKS)"
-description: "Manage AWS EKS cluster instances using AWS SDK version 2.x"
+description: "Manage AWS EKS cluster instances"
 icon-url: "https://camel.apache.org/_/img/logo-d-f21b25ba38.svg"
 metadata:
   keywords:
diff --git a/extensions/aws2-iam/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/aws2-iam/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index fe2e060b6342..f781e2041c30 100644
--- a/extensions/aws2-iam/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/aws2-iam/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -22,7 +22,7 @@
 #
 ---
 name: "Camel AWS 2 Identity and Access Management (IAM)"
-description: "Manage AWS IAM instances using AWS SDK version 2.x"
+description: "Manage AWS IAM instances"
 icon-url: "https://camel.apache.org/_/img/logo-d-f21b25ba38.svg"
 metadata:
   keywords:
diff --git a/extensions/aws2-kms/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/aws2-kms/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 62ec938475df..414bc17df499 100644
--- a/extensions/aws2-kms/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/aws2-kms/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -22,7 +22,7 @@
 #
 ---
 name: "Camel AWS 2 Key Management Service (KMS)"
-description: "Manage keys stored in AWS KMS instances using AWS SDK version 2.x"
+description: "Manage keys stored in AWS KMS instances"
 icon-url: "https://camel.apache.org/_/img/logo-d-f21b25ba38.svg"
 metadata:
   keywords:
diff --git a/extensions/aws2-mq/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/aws2-mq/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index edbb1c2ed4a9..c9f054e3cd81 100644
--- a/extensions/aws2-mq/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/aws2-mq/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -22,7 +22,7 @@
 #
 ---
 name: "Camel AWS 2 MQ"
-description: "Manage AWS MQ instances using AWS SDK version 2.x"
+description: "Send messages to AWS MQ"
 icon-url: "https://camel.apache.org/_/img/logo-d-f21b25ba38.svg"
 metadata:
   keywords:
diff --git a/extensions/aws2-msk/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/aws2-msk/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 84bf7b82ac8d..88ae7785eb3d 100644
--- a/extensions/aws2-msk/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/aws2-msk/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -22,7 +22,7 @@
 #
 ---
 name: "Camel AWS 2 Managed Streaming for Apache Kafka (MSK)"
-description: "Manage AWS MSK instances using AWS SDK version 2.x"
+description: "Manage AWS MSK instances"
 icon-url: "https://camel.apache.org/_/img/logo-d-f21b25ba38.svg"
 metadata:
   keywords:
diff --git a/extensions/aws2-s3/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/aws2-s3/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 2c29c0756a89..ae4d0a83374f 100644
--- a/extensions/aws2-s3/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/aws2-s3/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -22,7 +22,7 @@
 #
 ---
 name: "Camel AWS 2 S3 Storage Service"
-description: "Store and retrieve objects from AWS S3 Storage Service using AWS SDK version 2.x"
+description: "Store and retrieve objects from AWS S3 Storage Service"
 icon-url: "https://camel.apache.org/_/img/logo-d-f21b25ba38.svg"
 metadata:
   keywords:
diff --git a/extensions/aws2-ses/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/aws2-ses/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 8395f5da6d7a..d8fc76c64b6b 100644
--- a/extensions/aws2-ses/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/aws2-ses/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -22,7 +22,7 @@
 #
 ---
 name: "Camel AWS 2 Simple Email Service (SES)"
-description: "Send e-mails through AWS SES service using AWS SDK version 2.x"
+description: "Send e-mails through AWS SES service"
 icon-url: "https://camel.apache.org/_/img/logo-d-f21b25ba38.svg"
 metadata:
   keywords:
diff --git a/extensions/aws2-sns/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/aws2-sns/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index f3b43c5fd8cb..33325324e05f 100644
--- a/extensions/aws2-sns/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/aws2-sns/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -22,7 +22,7 @@
 #
 ---
 name: "Camel AWS 2 Simple Notification System (SNS)"
-description: "Send messages to an AWS Simple Notification Topic using AWS SDK version 2.x"
+description: "Send messages to AWS Simple Notification Topic"
 icon-url: "https://camel.apache.org/_/img/logo-d-f21b25ba38.svg"
 metadata:
   keywords:
diff --git a/extensions/aws2-sqs/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/aws2-sqs/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index c7797374f67e..d84ca923e7f9 100644
--- a/extensions/aws2-sqs/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/aws2-sqs/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -22,7 +22,7 @@
 #
 ---
 name: "Camel AWS 2 Simple Queue Service (SQS)"
-description: "Send and receive messages to/from AWS SQS service using AWS SDK version 2.x"
+description: "Send and receive messages to/from AWS SQS"
 icon-url: "https://camel.apache.org/_/img/logo-d-f21b25ba38.svg"
 metadata:
   keywords:
diff --git a/integration-tests-jvm/azure-servicebus/pom.xml b/integration-tests-jvm/azure-servicebus/pom.xml
index 8cc246b43a82..39824833afc5 100644
--- a/integration-tests-jvm/azure-servicebus/pom.xml
+++ b/integration-tests-jvm/azure-servicebus/pom.xml
@@ -105,7 +105,7 @@
                 <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
                 <dependency>
                     <groupId>org.apache.camel.quarkus</groupId>
-                    <artifactId>camel-quarkus-azure-eventhubs-deployment</artifactId>
+                    <artifactId>camel-quarkus-azure-servicebus-deployment</artifactId>
                     <version>${project.version}</version>
                     <type>pom</type>
                     <scope>test</scope>
diff --git a/integration-tests/jms-ibmmq-client/pom.xml b/integration-tests/jms-ibmmq-client/pom.xml
index e6c12b4c2663..e8ceec492fb9 100644
--- a/integration-tests/jms-ibmmq-client/pom.xml
+++ b/integration-tests/jms-ibmmq-client/pom.xml
@@ -161,6 +161,19 @@
                         </exclusion>
                     </exclusions>
                 </dependency>
+                <dependency>
+                    <groupId>org.apache.camel.quarkus</groupId>
+                    <artifactId>camel-quarkus-jta-deployment</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
             </dependencies>
         </profile>
         <profile>
diff --git a/integration-tests/micrometer/pom.xml b/integration-tests/micrometer/pom.xml
index ab81822a9d50..4fa4f9862c41 100644
--- a/integration-tests/micrometer/pom.xml
+++ b/integration-tests/micrometer/pom.xml
@@ -160,6 +160,19 @@
                         </exclusion>
                     </exclusions>
                 </dependency>
+                <dependency>
+                    <groupId>org.apache.camel.quarkus</groupId>
+                    <artifactId>camel-quarkus-management-deployment</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
                 <dependency>
                     <groupId>org.apache.camel.quarkus</groupId>
                     <artifactId>camel-quarkus-micrometer-deployment</artifactId>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 761f204fd831..d40ad6ab352f 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -3847,12 +3847,12 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.camel.quarkus</groupId>
-                <artifactId>camel-quarkus-grpc-deployment</artifactId>
+                <artifactId>camel-quarkus-grpc-codegen</artifactId>
                 <version>${camel-quarkus.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.camel.quarkus</groupId>
-                <artifactId>camel-quarkus-grpc-codegen</artifactId>
+                <artifactId>camel-quarkus-grpc-deployment</artifactId>
                 <version>${camel-quarkus.version}</version>
             </dependency>
             <dependency>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index 747e66547738..0bf76c2c9561 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -3773,12 +3773,12 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
-        <artifactId>camel-quarkus-grpc-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+        <artifactId>camel-quarkus-grpc-codegen</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
         <version>3.2.1-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
       </dependency>
       <dependency>
         <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
-        <artifactId>camel-quarkus-grpc-codegen</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+        <artifactId>camel-quarkus-grpc-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
         <version>3.2.1-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
       </dependency>
       <dependency>
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index dcc3d0adc531..0d4f0359151a 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -3773,12 +3773,12 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel.quarkus</groupId>
-        <artifactId>camel-quarkus-grpc-deployment</artifactId>
+        <artifactId>camel-quarkus-grpc-codegen</artifactId>
         <version>3.2.1-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel.quarkus</groupId>
-        <artifactId>camel-quarkus-grpc-codegen</artifactId>
+        <artifactId>camel-quarkus-grpc-deployment</artifactId>
         <version>3.2.1-SNAPSHOT</version>
       </dependency>
       <dependency>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index c5dcd865449c..ee34a82f1ed0 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -3773,12 +3773,12 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
-        <artifactId>camel-quarkus-grpc-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+        <artifactId>camel-quarkus-grpc-codegen</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
         <version>3.2.1-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
       </dependency>
       <dependency>
         <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
-        <artifactId>camel-quarkus-grpc-codegen</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+        <artifactId>camel-quarkus-grpc-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
         <version>3.2.1-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
       </dependency>
       <dependency>