You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by va...@apache.org on 2025/02/04 17:46:46 UTC

(camel-kafka-connector) 01/03: Fixed dependencies and tests for camel 4.10 and regen.

This is an automated email from the ASF dual-hosted git repository.

valdar pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 403589815b681825c87184fa2e7be8d2be746c69
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Tue Feb 4 16:10:16 2025 +0100

    Fixed dependencies and tests for camel 4.10 and regen.
---
 .../camel-aws-bedrock-agent-runtime-sink-sink.json |  2 +-
 .../camel-aws-bedrock-text-sink-sink.json          |  2 +-
 .../camel-aws-cloudtrail-source-source.json        |  2 +-
 .../connectors/camel-aws-cloudwatch-sink-sink.json |  2 +-
 .../connectors/camel-aws-ddb-sink-sink.json        |  2 +-
 .../camel-aws-ddb-streams-source-source.json       |  2 +-
 .../connectors/camel-aws-ec2-sink-sink.json        |  2 +-
 .../camel-aws-eventbridge-sink-sink.json           |  2 +-
 .../camel-aws-kinesis-firehose-sink-sink.json      |  2 +-
 .../connectors/camel-aws-kinesis-sink-sink.json    |  2 +-
 .../camel-aws-kinesis-source-source.json           |  2 +-
 .../connectors/camel-aws-lambda-sink-sink.json     |  2 +-
 .../connectors/camel-aws-redshift-sink-sink.json   |  2 +-
 .../camel-aws-s3-event-based-source-source.json    |  2 +-
 .../connectors/camel-aws-s3-sink-sink.json         |  2 +-
 .../camel-aws-s3-streaming-upload-sink-sink.json   |  2 +-
 .../camel-aws-secrets-manager-sink-sink.json       |  2 +-
 .../connectors/camel-aws-ses-sink-sink.json        |  2 +-
 .../connectors/camel-aws-sns-fifo-sink-sink.json   |  2 +-
 .../connectors/camel-aws-sns-sink-sink.json        |  2 +-
 .../connectors/camel-aws-sqs-batch-sink-sink.json  |  2 +-
 .../connectors/camel-aws-sqs-fifo-sink-sink.json   |  2 +-
 .../connectors/camel-aws-sqs-sink-sink.json        |  2 +-
 .../connectors/camel-aws-sqs-source-source.json    |  2 +-
 .../camel-aws-timestream-query-sink-sink.json      |  2 +-
 .../connectors/camel-azure-cosmosdb-sink-sink.json |  2 +-
 .../camel-azure-cosmosdb-source-source.json        |  2 +-
 .../camel-azure-eventhubs-sink-sink.json           |  2 +-
 .../camel-azure-eventhubs-source-source.json       |  2 +-
 .../camel-azure-servicebus-source-source.json      |  2 +-
 .../camel-azure-storage-blob-append-sink-sink.json |  2 +-
 ...ure-storage-blob-event-based-source-source.json |  2 +-
 .../camel-google-storage-source-source.json        | 12 +++++
 .../resources/connectors/camel-https-sink.json     | 62 +++++++++++++++++++++-
 .../connectors/camel-kafka-ssl-source-source.json  |  6 +++
 .../connectors/camel-netty-http-sink.json          |  4 +-
 .../resources/connectors/camel-netty-sink.json     |  4 +-
 .../camel-aws-bedrock-agent-runtime-sink-sink.json |  2 +-
 .../aws-bedrock-agent-runtime-sink.kamelet.yaml    |  7 +--
 .../camel-aws-bedrock-text-sink-sink.json          |  2 +-
 .../kamelets/aws-bedrock-text-sink.kamelet.yaml    |  7 +--
 .../camel-aws-cloudtrail-source-source.json        |  2 +-
 .../kamelets/aws-cloudtrail-source.kamelet.yaml    |  5 +-
 .../resources/camel-aws-cloudwatch-sink-sink.json  |  2 +-
 .../kamelets/aws-cloudwatch-sink.kamelet.yaml      | 16 +-----
 .../resources/camel-aws-ddb-sink-sink.json         |  2 +-
 .../resources/kamelets/aws-ddb-sink.kamelet.yaml   | 20 +------
 .../camel-aws-ddb-streams-source-source.json       |  2 +-
 .../kamelets/aws-ddb-streams-source.kamelet.yaml   |  7 +--
 .../resources/camel-aws-ec2-sink-sink.json         |  2 +-
 .../resources/kamelets/aws-ec2-sink.kamelet.yaml   | 11 +---
 .../resources/camel-aws-eventbridge-sink-sink.json |  2 +-
 .../kamelets/aws-eventbridge-sink.kamelet.yaml     |  7 +--
 .../camel-aws-kinesis-firehose-sink-sink.json      |  2 +-
 .../aws-kinesis-firehose-sink.kamelet.yaml         |  7 +--
 .../resources/camel-aws-kinesis-sink-sink.json     |  2 +-
 .../kamelets/aws-kinesis-sink.kamelet.yaml         | 14 +----
 .../resources/camel-aws-kinesis-source-source.json |  2 +-
 .../kamelets/aws-kinesis-source.kamelet.yaml       |  9 +---
 .../resources/camel-aws-lambda-sink-sink.json      |  2 +-
 .../kamelets/aws-lambda-sink.kamelet.yaml          |  7 +--
 .../pom.xml                                        | 16 +++---
 .../resources/camel-aws-redshift-sink-sink.json    |  2 +-
 .../kamelets/aws-redshift-sink.kamelet.yaml        | 21 +++-----
 .../pom.xml                                        | 16 +++---
 .../kamelets/aws-redshift-source.kamelet.yaml      | 13 +++--
 .../camel-aws-s3-event-based-source-source.json    |  2 +-
 .../aws-s3-event-based-source.kamelet.yaml         | 10 +---
 .../resources/camel-aws-s3-sink-sink.json          |  2 +-
 .../resources/kamelets/aws-s3-sink.kamelet.yaml    | 11 +---
 .../camel-aws-s3-streaming-upload-sink-sink.json   |  2 +-
 .../aws-s3-streaming-upload-sink.kamelet.yaml      |  7 +--
 .../camel-aws-secrets-manager-sink-sink.json       |  2 +-
 .../kamelets/aws-secrets-manager-sink.kamelet.yaml | 13 +----
 .../resources/camel-aws-ses-sink-sink.json         |  2 +-
 .../resources/kamelets/aws-ses-sink.kamelet.yaml   | 16 +-----
 .../resources/camel-aws-sns-fifo-sink-sink.json    |  2 +-
 .../kamelets/aws-sns-fifo-sink.kamelet.yaml        | 11 +---
 .../resources/camel-aws-sns-sink-sink.json         |  2 +-
 .../resources/kamelets/aws-sns-sink.kamelet.yaml   |  9 +---
 .../resources/camel-aws-sqs-batch-sink-sink.json   |  2 +-
 .../kamelets/aws-sqs-batch-sink.kamelet.yaml       |  7 +--
 .../resources/camel-aws-sqs-fifo-sink-sink.json    |  2 +-
 .../kamelets/aws-sqs-fifo-sink.kamelet.yaml        |  7 +--
 .../resources/camel-aws-sqs-sink-sink.json         |  2 +-
 .../resources/kamelets/aws-sqs-sink.kamelet.yaml   |  7 +--
 .../resources/camel-aws-sqs-source-source.json     |  2 +-
 .../resources/kamelets/aws-sqs-source.kamelet.yaml | 17 ++----
 .../camel-aws-timestream-query-sink-sink.json      |  2 +-
 .../aws-timestream-query-sink.kamelet.yaml         | 11 +---
 .../resources/camel-azure-cosmosdb-sink-sink.json  |  2 +-
 .../kamelets/azure-cosmosdb-sink.kamelet.yaml      | 11 +---
 .../camel-azure-cosmosdb-source-source.json        |  2 +-
 .../kamelets/azure-cosmosdb-source.kamelet.yaml    |  7 +--
 .../resources/camel-azure-eventhubs-sink-sink.json |  2 +-
 .../kamelets/azure-eventhubs-sink.kamelet.yaml     | 11 +---
 .../camel-azure-eventhubs-source-source.json       |  2 +-
 .../kamelets/azure-eventhubs-source.kamelet.yaml   |  7 +--
 .../kamelets/azure-servicebus-sink.kamelet.yaml    |  3 +-
 .../camel-azure-servicebus-source-source.json      |  2 +-
 .../kamelets/azure-servicebus-source.kamelet.yaml  |  5 +-
 .../camel-azure-storage-blob-append-sink-sink.json |  2 +-
 .../azure-storage-blob-append-sink.kamelet.yaml    |  5 +-
 ...ure-storage-blob-changefeed-source.kamelet.yaml |  3 +-
 ...ure-storage-blob-event-based-source-source.json |  2 +-
 ...re-storage-blob-event-based-source.kamelet.yaml |  7 +--
 .../resources/kamelets/cassandra-sink.kamelet.yaml |  7 ++-
 .../kamelets/cassandra-source.kamelet.yaml         |  7 ++-
 .../camel-google-storage-source-source.json        | 12 +++++
 ...elGooglestoragesourceSourceConnectorConfig.java |  8 +++
 .../kamelets/google-storage-source.kamelet.yaml    | 10 ++++
 .../src/generated/resources/camel-https-sink.json  | 62 +++++++++++++++++++++-
 .../https/CamelHttpsSinkConnectorConfig.java       | 38 ++++++++++++-
 .../pom.xml                                        |  2 +-
 .../kamelets/jms-apache-artemis-sink.kamelet.yaml  |  2 +-
 .../pom.xml                                        |  2 +-
 .../jms-apache-artemis-source.kamelet.yaml         |  2 +-
 .../pom.xml                                        |  2 +-
 .../jms-pooled-apache-artemis-sink.kamelet.yaml    |  2 +-
 .../pom.xml                                        |  2 +-
 .../jms-pooled-apache-artemis-source.kamelet.yaml  |  2 +-
 .../pom.xml                                        | 16 +++---
 .../kafka-azure-schema-registry-sink.kamelet.yaml  |  4 +-
 .../pom.xml                                        | 16 +++---
 ...kafka-azure-schema-registry-source.kamelet.yaml |  4 +-
 .../pom.xml                                        | 16 +++---
 ...batch-azure-schema-registry-source.kamelet.yaml |  4 +-
 .../resources/camel-kafka-ssl-source-source.json   |  6 +++
 .../CamelKafkasslsourceSourceConnector.properties  |  2 +
 .../CamelKafkasslsourceSourceConnectorConfig.java  |  4 ++
 .../kamelets/kafka-ssl-source.kamelet.yaml         | 10 ++++
 .../camel-mariadb-sink-kafka-connector/pom.xml     | 10 ++--
 .../resources/kamelets/mariadb-sink.kamelet.yaml   |  8 ++-
 .../camel-mariadb-source-kafka-connector/pom.xml   | 10 ++--
 .../resources/kamelets/mariadb-source.kamelet.yaml |  8 ++-
 .../camel-mysql-sink-kafka-connector/pom.xml       | 10 ++--
 .../resources/kamelets/mysql-sink.kamelet.yaml     |  8 ++-
 .../camel-mysql-source-kafka-connector/pom.xml     | 10 ++--
 .../resources/kamelets/mysql-source.kamelet.yaml   |  8 ++-
 .../generated/resources/camel-netty-http-sink.json |  4 +-
 .../CamelNettyhttpSinkConnectorConfig.java         |  4 +-
 .../src/generated/resources/camel-netty-sink.json  |  4 +-
 .../netty/CamelNettySinkConnectorConfig.java       |  4 +-
 .../pom.xml                                        | 10 ++--
 .../kamelets/oracle-database-sink.kamelet.yaml     |  8 ++-
 .../pom.xml                                        | 10 ++--
 .../kamelets/oracle-database-source.kamelet.yaml   |  8 ++-
 .../camel-postgresql-sink-kafka-connector/pom.xml  | 12 ++---
 .../kamelets/postgresql-sink.kamelet.yaml          | 10 ++--
 .../pom.xml                                        | 12 ++---
 .../kamelets/postgresql-source.kamelet.yaml        | 10 ++--
 .../camel-snowflake-sink-kafka-connector/pom.xml   | 10 ++--
 .../resources/kamelets/snowflake-sink.kamelet.yaml |  8 ++-
 .../camel-snowflake-source-kafka-connector/pom.xml | 10 ++--
 .../kamelets/snowflake-source.kamelet.yaml         |  8 ++-
 .../kamelets/splunk-hec-sink.kamelet.yaml          |  3 +-
 .../camel-sqlserver-sink-kafka-connector/pom.xml   | 10 ++--
 .../resources/kamelets/sqlserver-sink.kamelet.yaml |  8 ++-
 .../camel-sqlserver-source-kafka-connector/pom.xml | 10 ++--
 .../kamelets/sqlserver-source.kamelet.yaml         |  8 ++-
 tests/itests-aws-v2/pom.xml                        |  5 +-
 ...CloudWatchLocalContainerServiceWithTimeout.java |  4 +-
 ...WSDynamodbLocalContainerServiceWithTimeout.java |  4 +-
 .../AWSEC2LocalContainerServiceWithTimeout.java    |  4 +-
 ...ventBridgeLocalContainerServiceWithTimeout.java |  4 +-
 .../AWSIAMLocalContainerServiceWithTimeout.java    |  4 +-
 .../AWSKMSLocalContainerServiceWithTimeout.java    |  4 +-
 ...AWSKinesisLocalContainerServiceWithTimeout.java |  5 +-
 .../AWSLambdaLocalContainerServiceWithTimeout.java |  4 +-
 .../AWSS3LocalContainerServiceWithTimeout.java     |  4 +-
 .../AWSSNSLocalContainerServiceWithTimeout.java    |  4 +-
 .../AWSSQSLocalContainerServiceWithTimeout.java    |  4 +-
 .../AWSSTSLocalContainerServiceWithTimeout.java    |  4 +-
 .../services/AWSServiceFactoryWithTimeout.java     |  9 ++--
 tests/itests-azure-storage-queue/pom.xml           |  5 +-
 .../kafkaconnector/common/AbstractKafkaTest.java   |  8 +--
 .../services/kafka/EmbeddedKafkaService.java       |  4 +-
 tests/itests-cxf/pom.xml                           |  2 +-
 .../cxf/source/CamelSourceCXFBasicITCase.java      | 44 +++++++++++++++
 .../cxf/source/CamelSourceCXFDataFormatTCase.java  | 45 ++++++++++++++++
 .../cxf/source/CamelSourceCXFITCase.java           | 59 ++------------------
 .../cxf/source/CamelSourceCXFUrlTCase.java         | 44 +++++++++++++++
 tests/itests-cxfrs/pom.xml                         |  2 +-
 .../ElasticSearchLocalContainerTestService.java}   | 26 ++++-----
 .../sink/CamelSinkElasticSearchITCase.java         |  8 +--
 tests/itests-mongodb/pom.xml                       |  5 +-
 .../common/MongoDBEnvVarServiceFactory.java        |  4 +-
 .../sjms2/common/FixedDispatchRouterContainer.java | 44 ---------------
 .../kafkaconnector/sjms2/common/SJMS2Common.java   |  9 ++--
 189 files changed, 778 insertions(+), 663 deletions(-)

diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-bedrock-agent-runtime-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-bedrock-agent-runtime-sink-sink.json
index 98fb63aed3..8774f9728a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-bedrock-agent-runtime-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-bedrock-agent-runtime-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-bedrock-agent-runtime-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send data for invoking a knowledge base from AWS Bedrock.\n\nThe basic authentication method for the Bedrock service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the Bedrock client loads the credentials through this provider and doesn't use the basic authentication method."
+		"description": "Send data for invoking a knowledge base from AWS Bedrock."
 	},
 	"properties": {
 		"camel.kamelet.aws-bedrock-agent-runtime-sink.modelId": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-bedrock-text-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-bedrock-text-sink-sink.json
index f228ea6dad..c6a291b995 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-bedrock-text-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-bedrock-text-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-bedrock-text-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send data for invoking a text model of Amazon Bedrock.\n\nThe basic authentication method for the Bedrock service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the Bedrock client loads the credentials through this provider and doesn't use the basic authentication method."
+		"description": "Send data for invoking a text model of Amazon Bedrock."
 	},
 	"properties": {
 		"camel.kamelet.aws-bedrock-text-sink.modelId": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cloudtrail-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cloudtrail-source-source.json
index 72f3f3851b..8ab0e2e04c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cloudtrail-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cloudtrail-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-cloudtrail-source-source",
 		"type": "source",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Receive data from an AWS Cloudtrail.\n\nThe basic authentication method for the Cloudtrail service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider."
+		"description": "Receive data from an AWS Cloudtrail."
 	},
 	"properties": {
 		"camel.kamelet.aws-cloudtrail-source.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cloudwatch-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cloudwatch-sink-sink.json
index a0d6202a32..79d9424727 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cloudwatch-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cloudwatch-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-cloudwatch-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send data to Amazon CloudWatch metrics.\n\nThe basic authentication method for the AWS CloudWatch metrics service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the CloudWatch client loads the credentials through this provider and doesn't use the basic authentication method.\n\nYou can set the following properties in the header:\n\n`m [...]
+		"description": "Send data to Amazon CloudWatch metrics."
 	},
 	"properties": {
 		"camel.kamelet.aws-cloudwatch-sink.cwNamespace": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-sink-sink.json
index 1e5709c36f..5475b50eb3 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-ddb-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send data to Amazon DynamoDB. The sent data inserts, updates, or deletes an item on the specified AWS DynamoDB table.\n\nThe basic authentication method for the AWS DynamoDB service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the DynamoDB client loads the credentials through this provider and doesn't use the basic authentication me [...]
+		"description": "Send data to Amazon DynamoDB. The sent data inserts, updates, or deletes an item on the specified AWS DynamoDB table."
 	},
 	"properties": {
 		"camel.kamelet.aws-ddb-sink.table": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-streams-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-streams-source-source.json
index e86614113d..92730bbf07 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-streams-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-streams-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-ddb-streams-source-source",
 		"type": "source",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Receive events from Amazon DynamoDB Streams.\n\nThe basic authentication method for the AWS DynamoDB Streams service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the DynamoDB Streams client loads the credentials through this provider and doesn't use the basic authentication method."
+		"description": "Receive events from Amazon DynamoDB Streams."
 	},
 	"properties": {
 		"camel.kamelet.aws-ddb-streams-source.table": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ec2-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ec2-sink-sink.json
index baa7bdb938..29b231734b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ec2-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ec2-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-ec2-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Check the status of EC2 instances\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS EC2 Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the EC2 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.\n\nThe K [...]
+		"description": "Check the status of EC2 instances"
 	},
 	"properties": {
 		"camel.kamelet.aws-ec2-sink.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-eventbridge-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-eventbridge-sink-sink.json
index 3d7ab3d09a..adaf32bd31 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-eventbridge-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-eventbridge-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-eventbridge-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send events to an Amazon Eventbridge Eventbus.\n\nThe basic authentication method for the Eventbridge service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the Eventbridge client loads the credentials through this provider and doesn't use the basic authentication method.\n\nIn the headers, you need to set the `resources-arn` \/ `ce-r [...]
+		"description": "Send events to an Amazon Eventbridge Eventbus.\nIn the headers, you need to set the `resources-arn` \/ `ce-resources-arn` property to specify the ARN of resources related to the event.\nIn the headers, you need to set the `detail-type` \/ `ce-detail-type` property to specify the detail type related to the event.\nIn the headers, you need to set the `event-source` \/ `ce-event-source` property to specify the event source related to the event.\nIf you do not set the prope [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-eventbridge-sink.eventbusNameOrArn": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-firehose-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-firehose-sink-sink.json
index 2b53692dba..1b4ab64acd 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-firehose-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-firehose-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-kinesis-firehose-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send message to an AWS Kinesis Firehose Stream\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS Kinesis Firehose Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the Kinesis Firehose client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandato [...]
+		"description": "Send message to an AWS Kinesis Firehose Stream."
 	},
 	"properties": {
 		"camel.kamelet.aws-kinesis-firehose-sink.streamName": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-sink-sink.json
index a2598e21fe..211f16b521 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-kinesis-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send data to AWS Kinesis.\n\nThe basic authentication method for the Kinesis service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the Kinesis client loads the credentials through this provider and doesn't use the basic authentication method.\n\nIn the header, you can optionally set the `file` \/ `ce-partition` property to set the Ki [...]
+		"description": "Send data to AWS Kinesis."
 	},
 	"properties": {
 		"camel.kamelet.aws-kinesis-sink.stream": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-source-source.json
index 472aa96d96..30cc9c3bff 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-kinesis-source-source",
 		"type": "source",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Receive data from AWS Kinesis.\n\nThe basic authentication method for the Kinesis service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the Kinesis client loads the credentials through this provider and doesn't use the basic authentication method.\n\nTwo headers will be duplicated with different names for clarity at sink level, Camel [...]
+		"description": "Receive data from AWS Kinesis."
 	},
 	"properties": {
 		"camel.kamelet.aws-kinesis-source.stream": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-lambda-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-lambda-sink-sink.json
index ddd18b6312..e95fb867fc 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-lambda-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-lambda-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-lambda-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send a payload to an AWS Lambda function.\n\nThe basic authentication method for the Lambda service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the Lambda client loads the credentials through this provider and doesn't use the basic authentication method."
+		"description": "Send a payload to an AWS Lambda function."
 	},
 	"properties": {
 		"camel.kamelet.aws-lambda-sink.function": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-redshift-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-redshift-sink-sink.json
index 6194c7184f..9afe916d90 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-redshift-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-redshift-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-redshift-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send data to an AWS Redshift Database.\n\nThis Kamelet expects a JSON-formatted body. Use key:value pairs to map the JSON fields and parameters. For example, here is a query:\n\n'INSERT INTO accounts (username,city) VALUES (:#username,:#city)'\n\nHere is example input for the example query:\n\n'{ \"username\":\"oscerd\", \"city\":\"Rome\"}'"
+		"description": "Send data to an AWS Redshift Database."
 	},
 	"properties": {
 		"camel.kamelet.aws-redshift-sink.serverName": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-event-based-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-event-based-source-source.json
index b72a48b27c..be92ce5b5c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-event-based-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-event-based-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-s3-event-based-source-source",
 		"type": "source",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Receive data from AWS SQS subscribed to Eventbridge Bus reporting events related to an S3 bucket or multiple buckets.\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SQS Service.\nTo use this Kamelet you'll need to set up Eventbridge on your bucket and subscribe Eventbridge bus to an SQS Queue.\nFor doing this you'll need to enable Evenbridge notification on your bucket and creating a rule on Eventbridge console related to all the events on S3 [...]
+		"description": "Receive data from AWS SQS subscribed to Eventbridge Bus reporting events related to an S3 bucket or multiple buckets."
 	},
 	"properties": {
 		"camel.kamelet.aws-s3-event-based-source.queueNameOrArn": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-sink-sink.json
index 13d7355393..2d029cce87 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-s3-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Upload data to an Amazon S3 Bucket.\n\nThe basic authentication method for the S3 service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the S3 client loads the credentials through this provider and doesn't use the basic authentication method.\n\nIn the header, you can optionally set the `file` \/ `ce-partition` property to specify th [...]
+		"description": "Upload data to an Amazon S3 Bucket."
 	},
 	"properties": {
 		"camel.kamelet.aws-s3-sink.bucketNameOrArn": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-streaming-upload-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-streaming-upload-sink-sink.json
index dd9d308b53..c3623f05bb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-streaming-upload-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-streaming-upload-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-s3-streaming-upload-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Upload data to AWS S3 in streaming upload mode.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS S3 Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the S3 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
+		"description": "Upload data to AWS S3 in streaming upload mode."
 	},
 	"properties": {
 		"camel.kamelet.aws-s3-streaming-upload-sink.bucketNameOrArn": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-secrets-manager-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-secrets-manager-sink-sink.json
index 6c839197fb..777f0f9b7d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-secrets-manager-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-secrets-manager-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-secrets-manager-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Create a secret in AWS Secrets Manager.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS Secrets Manager Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the Secrets Manager client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parame [...]
+		"description": "Create a secret in AWS Secrets Manager."
 	},
 	"properties": {
 		"camel.kamelet.aws-secrets-manager-sink.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ses-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ses-sink-sink.json
index a55329c43e..795c89c62b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ses-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ses-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-ses-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send email through the Amazon Simple Email Service (SES).\n\nThe basic authentication method for the SES service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the SES client loads the credentials through this provider and doesn't use the basic authentication method.\n\nIn the header, you can optionally set the following properties:\n [...]
+		"description": "Send email through the Amazon Simple Email Service (SES)."
 	},
 	"properties": {
 		"camel.kamelet.aws-ses-sink.from": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-fifo-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-fifo-sink-sink.json
index 58ddae159c..536b1a2f3e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-fifo-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-fifo-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sns-fifo-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send message to an AWS SNS FIFO Topic.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SNS Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SNS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.\n\n [...]
+		"description": "Send message to an AWS SNS FIFO Topic."
 	},
 	"properties": {
 		"camel.kamelet.aws-sns-fifo-sink.topicNameOrArn": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-sink-sink.json
index 571944fb01..0c492a8587 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sns-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send message to an Amazon Simple Notification Service (SNS) topic.\n\nThe basic authentication method for the SNS service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the SNS client loads the credentials through this provider and doesn't use the basic authentication method.\n\nIn the header, you can optionally set the `subject` \/ ` [...]
+		"description": "Send message to an Amazon Simple Notification Service (SNS) topic."
 	},
 	"properties": {
 		"camel.kamelet.aws-sns-sink.topicNameOrArn": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-batch-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-batch-sink-sink.json
index 8ab534cbcb..a763ae364d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-batch-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-batch-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sqs-batch-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send Batch message to an AWS SQS Queue.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
+		"description": "Send Batch message to an AWS SQS Queue."
 	},
 	"properties": {
 		"camel.kamelet.aws-sqs-batch-sink.queueNameOrArn": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-fifo-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-fifo-sink-sink.json
index 9c7802d2b7..e4acc958e1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-fifo-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-fifo-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sqs-fifo-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send message to an AWS SQS FIFO Queue.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
+		"description": "Send message to an AWS SQS FIFO Queue."
 	},
 	"properties": {
 		"camel.kamelet.aws-sqs-fifo-sink.queueNameOrArn": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-sink-sink.json
index 4c0936872a..79c9a2ec7b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sqs-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send messages to an Amazon Simple Queue Service (SQS) queue.\n\nThe basic authentication method for the SQS service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the SQS client loads the credentials through this provider and doesn't use the basic authentication method."
+		"description": "Send messages to an Amazon Simple Queue Service (SQS) queue."
 	},
 	"properties": {
 		"camel.kamelet.aws-sqs-sink.queueNameOrArn": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-source-source.json
index 8ae2ee3700..9905004462 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sqs-source-source",
 		"type": "source",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Receive data from AWS SQS.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.\n\nTwo headers  [...]
+		"description": "Receive data from AWS SQS."
 	},
 	"properties": {
 		"camel.kamelet.aws-sqs-source.queueNameOrArn": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-timestream-query-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-timestream-query-sink-sink.json
index 0c0999a125..0e8f470faf 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-timestream-query-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-timestream-query-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-timestream-query-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Query an AWS Timestream Database\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS Timestream Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the Timestream client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kame [...]
+		"description": "Query an AWS Timestream Database"
 	},
 	"properties": {
 		"camel.kamelet.aws-timestream-query-sink.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-cosmosdb-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-cosmosdb-sink-sink.json
index 899738aa30..40dec1f044 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-cosmosdb-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-cosmosdb-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-azure-cosmosdb-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send Data to an Azure CosmosDB instance\n\nIn the headers, you can optionally set the `itemPartitionKey` \/ `ce-itemPartitionKey` property to specify the partition key for a specific item.\n\nIf you do not set the property in the header, you'll need to use the static property itemPartitonKey.\n\nThere are two different mechanism of authentication `SHARED_ACCOUNT_KEY` and `AZURE_IDENTITY`, you could specify with credentialType property. If you're using `SHARED_ACCOUNT_KE [...]
+		"description": "Send Data to an Azure CosmosDB instance"
 	},
 	"properties": {
 		"camel.kamelet.azure-cosmosdb-sink.databaseName": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-cosmosdb-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-cosmosdb-source-source.json
index 8289121762..7966179e7a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-cosmosdb-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-cosmosdb-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-azure-cosmosdb-source-source",
 		"type": "source",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Consume Changes from a CosmosDB instance.\n\nThere are two different mechanism of authentication `SHARED_ACCOUNT_KEY` and `AZURE_IDENTITY`, you could specify with credentialType property. If you're using `SHARED_ACCOUNT_KEY` accountKey property will be needed.\n\nIn case of `AZURE_IDENTITY` selection, the DefaultAzureCredential will attempt to authenticate via the following mechanisms in the following order enviroment, Workload Identity, Managed Identity, Azure Develope [...]
+		"description": "Consume Changes from a CosmosDB instance."
 	},
 	"properties": {
 		"camel.kamelet.azure-cosmosdb-source.databaseName": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-sink-sink.json
index 991e8868e6..de5958989d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-azure-eventhubs-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send events to Azure Event Hubs.\n\nThe Kamelet checks for the `partition-id` \/ `ce-partition-id` header which is an identifier of the Event Hub partition that the event will be sent to. If the identifier is not specified, the Event Hubs service will be responsible for routing events that are sent to an available partition.\n   \nA header is optional. If the header is not set, the partition is assigned by Event Hubs.\n\nThere are two different mechanism of authenticati [...]
+		"description": "Send events to Azure Event Hubs."
 	},
 	"properties": {
 		"camel.kamelet.azure-eventhubs-sink.namespaceName": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-source-source.json
index aed5382b79..14a5534218 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-azure-eventhubs-source-source",
 		"type": "source",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Receive events from Azure Event Hubs.\n\nThere are two different mechanism of authentication `CONNECTION_STRING` and `AZURE_IDENTITY`, you could specify with credentialType property. If you're using `CONNECTION_STRING` sharedAccessName and sharedAccessKey properties will be needed.\n\nIn case of `AZURE_IDENTITY` selection, the DefaultAzureCredential will attempt to authenticate via the following mechanisms in the following order enviroment, Workload Identity, Managed Id [...]
+		"description": "Receive events from Azure Event Hubs."
 	},
 	"properties": {
 		"camel.kamelet.azure-eventhubs-source.namespaceName": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-servicebus-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-servicebus-source-source.json
index 63346453da..25935926e5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-servicebus-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-servicebus-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-azure-servicebus-source-source",
 		"type": "source",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Consume Messages from Azure Servicebus.\n\nThe subscribtion name parameter needs to be populated in case of consuming from a Topic."
+		"description": "Consume Messages from Azure Servicebus."
 	},
 	"properties": {
 		"camel.kamelet.azure-servicebus-source.topicOrQueueName": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-append-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-append-sink-sink.json
index 5c06aa94be..e25f05cc89 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-append-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-append-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-azure-storage-blob-append-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Upload data in append mode to Azure Storage Blob.\n\nIn the header, you can set the `file` \/ `ce-file` property to specify the filename to upload. If you do set property in the header, the Kamelet uses the exchange ID as filename."
+		"description": "Upload data in append mode to Azure Storage Blob."
 	},
 	"properties": {
 		"camel.kamelet.azure-storage-blob-append-sink.accountName": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-event-based-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-event-based-source-source.json
index 52e015ff8e..793cc0155f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-event-based-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-event-based-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-azure-storage-blob-event-based-source-source",
 		"type": "source",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Receive data from Azure Service Bus subscribed to Azure Eventgrid reporting events related to a Azure Storage Blob account.\n\nConnection string is the basic method for authenticating to the Azure Servicebus Queue.\n\nTo use this Kamelet you'll need to set up Events on your Azure Storage Blob account and select as an endpoint an Azure Servicebus Queue."
+		"description": "Receive data from Azure Service Bus subscribed to Azure Eventgrid reporting events related to a Azure Storage Blob account."
 	},
 	"properties": {
 		"camel.kamelet.azure-storage-blob-event-based-source.topicOrQueueName": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-source-source.json
index baa6a250d0..410b993720 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-source-source.json
@@ -34,6 +34,18 @@
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.google-storage-source.prefix": {
+			"name": "camel.kamelet.google-storage-source.prefix",
+			"description": "The prefix which is used in the BlobListOptions to only consume objects we are interested in.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.google-storage-source.filter": {
+			"name": "camel.kamelet.google-storage-source.filter",
+			"description": "A regular expression to include only blobs with name matching it.",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json
index 945b3bb6aa..9b67e25f7e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json
@@ -58,6 +58,13 @@
 				"PATCH"
 			]
 		},
+		"camel.sink.endpoint.logHttpActivity": {
+			"name": "camel.sink.endpoint.logHttpActivity",
+			"description": "To enable logging HTTP request and response. You can use a custom LoggingHttpActivityListener as httpActivityListener to control logging options.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.skipRequestHeaders": {
 			"name": "camel.sink.endpoint.skipRequestHeaders",
 			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
@@ -132,6 +139,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.httpActivityListener": {
+			"name": "camel.sink.endpoint.httpActivityListener",
+			"description": "To use a custom activity listener",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.ignoreResponseBody": {
 			"name": "camel.sink.endpoint.ignoreResponseBody",
 			"description": "If this option is true, The http producer won't read response body and cache the input stream",
@@ -224,7 +237,7 @@
 		},
 		"camel.sink.endpoint.useSystemProperties": {
 			"name": "camel.sink.endpoint.useSystemProperties",
-			"description": "To use System Properties as fallback for configuration",
+			"description": "To use System Properties as fallback for configuration for configuring HTTP Client",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -346,6 +359,27 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.oauth2CachedTokensDefaultExpirySeconds": {
+			"name": "camel.sink.endpoint.oauth2CachedTokensDefaultExpirySeconds",
+			"description": "Default expiration time for cached OAuth2 tokens, in seconds. Used if token response does not contain 'expires_in' field.",
+			"defaultValue": "3600L",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.oauth2CachedTokensExpirationMarginSeconds": {
+			"name": "camel.sink.endpoint.oauth2CachedTokensExpirationMarginSeconds",
+			"description": "Amount of time which is deducted from OAuth2 tokens expiry time to compensate for the time it takes OAuth2 Token Endpoint to send the token over http, in seconds. Set this parameter to high value if you OAuth2 Token Endpoint answers slowly or you tokens expire quickly. If you set this parameter to too small value, you can get 4xx http errors because camel will think that the received token is still valid, while in reality the token is expired for the Authentication server.",
+			"defaultValue": "5L",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.oauth2CacheTokens": {
+			"name": "camel.sink.endpoint.oauth2CacheTokens",
+			"description": "Whether to cache OAuth2 client tokens.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.oauth2ClientId": {
 			"name": "camel.sink.endpoint.oauth2ClientId",
 			"description": "OAuth2 client id",
@@ -389,6 +423,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.logHttpActivity": {
+			"name": "camel.component.https.logHttpActivity",
+			"description": "To enable logging HTTP request and response. You can use a custom LoggingHttpActivityListener as httpActivityListener to control logging options.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.skipRequestHeaders": {
 			"name": "camel.component.https.skipRequestHeaders",
 			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
@@ -423,6 +464,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.httpActivityListener": {
+			"name": "camel.component.https.httpActivityListener",
+			"description": "To use a custom activity listener",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.responsePayloadStreamingThreshold": {
 			"name": "camel.component.https.responsePayloadStreamingThreshold",
 			"description": "This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode.",
@@ -430,6 +477,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.userAgent": {
+			"name": "camel.component.https.userAgent",
+			"description": "To set a custom HTTP User-Agent request header",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.allowJavaSerializedObject": {
 			"name": "camel.component.https.allowJavaSerializedObject",
 			"description": "Whether to allow java serialization when a request uses context-type=application\/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.",
@@ -543,6 +596,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.useSystemProperties": {
+			"name": "camel.component.https.useSystemProperties",
+			"description": "To use System Properties as fallback for configuration for configuring HTTP Client",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.headerFilterStrategy": {
 			"name": "camel.component.https.headerFilterStrategy",
 			"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-ssl-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-ssl-source-source.json
index 46edf9ff0b..f94b5dbbf6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-ssl-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-ssl-source-source.json
@@ -114,6 +114,12 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.kamelet.kafka-ssl-source.sslTruststorePassword": {
+			"name": "camel.kamelet.kafka-ssl-source.sslTruststorePassword",
+			"description": "The store password for the trust store file.",
+			"priority": "HIGH",
+			"required": "true"
+		},
 		"camel.kamelet.kafka-ssl-source.sslEnabledProtocols": {
 			"name": "camel.kamelet.kafka-ssl-source.sslEnabledProtocols",
 			"description": "The list of protocols enabled for SSL connections. TLSv1.2, TLSv1.1 and TLSv1 are enabled by default.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json
index 6b9d4aa0fd..846c3f851f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json
@@ -163,7 +163,7 @@
 		},
 		"camel.sink.endpoint.producerPoolMaxTotal": {
 			"name": "camel.sink.endpoint.producerPoolMaxTotal",
-			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.",
+			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit. Be careful to not set this value too low (such as 1) as the pool must have space to create a producer such as when performing retries. Be mindful that the option producerPoolBlockWhenExhausted is default true, and the pool will then block when there is no space, which can lead to the application  [...]
 			"defaultValue": "-1",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -509,7 +509,7 @@
 		},
 		"camel.component.netty-http.producerPoolMaxTotal": {
 			"name": "camel.component.netty-http.producerPoolMaxTotal",
-			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.",
+			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit. Be careful to not set this value too low (such as 1) as the pool must have space to create a producer such as when performing retries. Be mindful that the option producerPoolBlockWhenExhausted is default true, and the pool will then block when there is no space, which can lead to the application  [...]
 			"defaultValue": "-1",
 			"priority": "MEDIUM",
 			"required": "false"
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json
index 3aa790d830..d9c86a0a61 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json
@@ -135,7 +135,7 @@
 		},
 		"camel.sink.endpoint.producerPoolMaxTotal": {
 			"name": "camel.sink.endpoint.producerPoolMaxTotal",
-			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.",
+			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit. Be careful to not set this value too low (such as 1) as the pool must have space to create a producer such as when performing retries. Be mindful that the option producerPoolBlockWhenExhausted is default true, and the pool will then block when there is no space, which can lead to the application  [...]
 			"defaultValue": "-1",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -508,7 +508,7 @@
 		},
 		"camel.component.netty.producerPoolMaxTotal": {
 			"name": "camel.component.netty.producerPoolMaxTotal",
-			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.",
+			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit. Be careful to not set this value too low (such as 1) as the pool must have space to create a producer such as when performing retries. Be mindful that the option producerPoolBlockWhenExhausted is default true, and the pool will then block when there is no space, which can lead to the application  [...]
 			"defaultValue": "-1",
 			"priority": "MEDIUM",
 			"required": "false"
diff --git a/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/generated/resources/camel-aws-bedrock-agent-runtime-sink-sink.json b/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/generated/resources/camel-aws-bedrock-agent-runtime-sink-sink.json
index 98fb63aed3..8774f9728a 100644
--- a/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/generated/resources/camel-aws-bedrock-agent-runtime-sink-sink.json
+++ b/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/generated/resources/camel-aws-bedrock-agent-runtime-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-bedrock-agent-runtime-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send data for invoking a knowledge base from AWS Bedrock.\n\nThe basic authentication method for the Bedrock service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the Bedrock client loads the credentials through this provider and doesn't use the basic authentication method."
+		"description": "Send data for invoking a knowledge base from AWS Bedrock."
 	},
 	"properties": {
 		"camel.kamelet.aws-bedrock-agent-runtime-sink.modelId": {
diff --git a/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/main/resources/kamelets/aws-bedrock-agent-runtime-sink.kamelet.yaml b/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/main/resources/kamelets/aws-bedrock-agent-runtime-sink.kamelet.yaml
index 0102c5100d..2ae92a9e59 100644
--- a/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/main/resources/kamelets/aws-bedrock-agent-runtime-sink.kamelet.yaml
+++ b/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/main/resources/kamelets/aws-bedrock-agent-runtime-sink.kamelet.yaml
@@ -31,12 +31,7 @@ metadata:
 spec:
   definition:
     title: "AWS Bedrock Agent Runtime Sink"
-    description: |-
-      Send data for invoking a knowledge base from AWS Bedrock.
-
-      The basic authentication method for the Bedrock service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.
-
-      If you use the default credentials provider, the Bedrock client loads the credentials through this provider and doesn't use the basic authentication method.
+    description: Send data for invoking a knowledge base from AWS Bedrock.
     required:
       - modelId
       - knowledgeBaseId
diff --git a/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/generated/resources/camel-aws-bedrock-text-sink-sink.json b/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/generated/resources/camel-aws-bedrock-text-sink-sink.json
index f228ea6dad..c6a291b995 100644
--- a/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/generated/resources/camel-aws-bedrock-text-sink-sink.json
+++ b/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/generated/resources/camel-aws-bedrock-text-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-bedrock-text-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send data for invoking a text model of Amazon Bedrock.\n\nThe basic authentication method for the Bedrock service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the Bedrock client loads the credentials through this provider and doesn't use the basic authentication method."
+		"description": "Send data for invoking a text model of Amazon Bedrock."
 	},
 	"properties": {
 		"camel.kamelet.aws-bedrock-text-sink.modelId": {
diff --git a/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/main/resources/kamelets/aws-bedrock-text-sink.kamelet.yaml b/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/main/resources/kamelets/aws-bedrock-text-sink.kamelet.yaml
index 770c51e99c..f50d1cf094 100644
--- a/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/main/resources/kamelets/aws-bedrock-text-sink.kamelet.yaml
+++ b/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/main/resources/kamelets/aws-bedrock-text-sink.kamelet.yaml
@@ -31,12 +31,7 @@ metadata:
 spec:
   definition:
     title: "AWS Bedrock Text Sink"
-    description: |-
-      Send data for invoking a text model of Amazon Bedrock.
-
-      The basic authentication method for the Bedrock service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.
-
-      If you use the default credentials provider, the Bedrock client loads the credentials through this provider and doesn't use the basic authentication method.
+    description: Send data for invoking a text model of Amazon Bedrock.
     required:
       - modelId
       - region
diff --git a/connectors/camel-aws-cloudtrail-source-kafka-connector/src/generated/resources/camel-aws-cloudtrail-source-source.json b/connectors/camel-aws-cloudtrail-source-kafka-connector/src/generated/resources/camel-aws-cloudtrail-source-source.json
index 72f3f3851b..8ab0e2e04c 100644
--- a/connectors/camel-aws-cloudtrail-source-kafka-connector/src/generated/resources/camel-aws-cloudtrail-source-source.json
+++ b/connectors/camel-aws-cloudtrail-source-kafka-connector/src/generated/resources/camel-aws-cloudtrail-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-cloudtrail-source-source",
 		"type": "source",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Receive data from an AWS Cloudtrail.\n\nThe basic authentication method for the Cloudtrail service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider."
+		"description": "Receive data from an AWS Cloudtrail."
 	},
 	"properties": {
 		"camel.kamelet.aws-cloudtrail-source.accessKey": {
diff --git a/connectors/camel-aws-cloudtrail-source-kafka-connector/src/main/resources/kamelets/aws-cloudtrail-source.kamelet.yaml b/connectors/camel-aws-cloudtrail-source-kafka-connector/src/main/resources/kamelets/aws-cloudtrail-source.kamelet.yaml
index 41756d7d3f..8a27427168 100644
--- a/connectors/camel-aws-cloudtrail-source-kafka-connector/src/main/resources/kamelets/aws-cloudtrail-source.kamelet.yaml
+++ b/connectors/camel-aws-cloudtrail-source-kafka-connector/src/main/resources/kamelets/aws-cloudtrail-source.kamelet.yaml
@@ -31,10 +31,7 @@ metadata:
 spec:
   definition:
     title: "AWS Cloudtrail Source"
-    description: |-
-      Receive data from an AWS Cloudtrail.
-
-      The basic authentication method for the Cloudtrail service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.
+    description: Receive data from an AWS Cloudtrail.
     required:
       - region
     type: object
diff --git a/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/generated/resources/camel-aws-cloudwatch-sink-sink.json b/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/generated/resources/camel-aws-cloudwatch-sink-sink.json
index a0d6202a32..79d9424727 100644
--- a/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/generated/resources/camel-aws-cloudwatch-sink-sink.json
+++ b/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/generated/resources/camel-aws-cloudwatch-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-cloudwatch-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send data to Amazon CloudWatch metrics.\n\nThe basic authentication method for the AWS CloudWatch metrics service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the CloudWatch client loads the credentials through this provider and doesn't use the basic authentication method.\n\nYou can set the following properties in the header:\n\n`m [...]
+		"description": "Send data to Amazon CloudWatch metrics."
 	},
 	"properties": {
 		"camel.kamelet.aws-cloudwatch-sink.cwNamespace": {
diff --git a/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/resources/kamelets/aws-cloudwatch-sink.kamelet.yaml b/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/resources/kamelets/aws-cloudwatch-sink.kamelet.yaml
index 4161c89ac8..0fba0a5f5a 100644
--- a/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/resources/kamelets/aws-cloudwatch-sink.kamelet.yaml
+++ b/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/resources/kamelets/aws-cloudwatch-sink.kamelet.yaml
@@ -31,21 +31,7 @@ metadata:
 spec:
   definition:
     title: "AWS CloudWatch Metrics Sink"
-    description: |-
-      Send data to Amazon CloudWatch metrics.
-
-      The basic authentication method for the AWS CloudWatch metrics service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.
-      
-      If you use the default credentials provider, the CloudWatch client loads the credentials through this provider and doesn't use the basic authentication method.
-      
-      You can set the following properties in the header:
-
-      `metric-name` / `ce-metricname` for the metric name.
-      `metric-value` / `ce-metricvalue` for the metric value.
-      `metric-unit` / `ce-metricunit` for the metric unit.
-      `metric-timestamp` / `ce-metrictimestamp` for the metric timestamp.
-      `metric-dimension-name` / `ce-metricdimensionname` for the dimension name.
-      `metric-dimension-value` / `ce-metricdimensionvalue` for the dimension value.
+    description: Send data to Amazon CloudWatch metrics.
     required:
       - cwNamespace
       - region
diff --git a/connectors/camel-aws-ddb-sink-kafka-connector/src/generated/resources/camel-aws-ddb-sink-sink.json b/connectors/camel-aws-ddb-sink-kafka-connector/src/generated/resources/camel-aws-ddb-sink-sink.json
index 1e5709c36f..5475b50eb3 100644
--- a/connectors/camel-aws-ddb-sink-kafka-connector/src/generated/resources/camel-aws-ddb-sink-sink.json
+++ b/connectors/camel-aws-ddb-sink-kafka-connector/src/generated/resources/camel-aws-ddb-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-ddb-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send data to Amazon DynamoDB. The sent data inserts, updates, or deletes an item on the specified AWS DynamoDB table.\n\nThe basic authentication method for the AWS DynamoDB service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the DynamoDB client loads the credentials through this provider and doesn't use the basic authentication me [...]
+		"description": "Send data to Amazon DynamoDB. The sent data inserts, updates, or deletes an item on the specified AWS DynamoDB table."
 	},
 	"properties": {
 		"camel.kamelet.aws-ddb-sink.table": {
diff --git a/connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/kamelets/aws-ddb-sink.kamelet.yaml b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/kamelets/aws-ddb-sink.kamelet.yaml
index 0f77412e88..2a33686c39 100644
--- a/connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/kamelets/aws-ddb-sink.kamelet.yaml
+++ b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/kamelets/aws-ddb-sink.kamelet.yaml
@@ -31,25 +31,7 @@ metadata:
 spec:
   definition:
     title: "AWS DynamoDB Sink"
-    description: |-
-      Send data to Amazon DynamoDB. The sent data inserts, updates, or deletes an item on the specified AWS DynamoDB table.
-
-      The basic authentication method for the AWS DynamoDB service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.
-
-      If you use the default credentials provider, the DynamoDB client loads the credentials through this provider and doesn't use the basic authentication method.
-
-      This Kamelet expects a JSON-formatted body and it must include the primary key values that define the DynamoDB item. The mapping between the JSON fields and table attribute values is done by key. For example, for  '{"username":"oscerd", "city":"Rome"}' input, the Kamelet inserts or update an item in the specified AWS DynamoDB table and sets the values for the 'username' and 'city' attributes. 
-      
-      For PutItem operation the Json body defines all item attributes.
-      For DeleteItem operation the Json body defines only the primary key attributes that identify the item to delete.
-      For UpdateItem operation the Json body defines both key attributes to identify the item to be updated and all item attributes tht get updated on the item.
-      
-      The given Json body can use "operation", "key" and "item" as top level properties that will be mapped to respective attribute value maps.
-      {
-        "operation": "PutItem"
-        "key": {},
-        "item": {}
-      }
+    description: Send data to Amazon DynamoDB. The sent data inserts, updates, or deletes an item on the specified AWS DynamoDB table.
     required:
       - table
       - region
diff --git a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/generated/resources/camel-aws-ddb-streams-source-source.json b/connectors/camel-aws-ddb-streams-source-kafka-connector/src/generated/resources/camel-aws-ddb-streams-source-source.json
index e86614113d..92730bbf07 100644
--- a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/generated/resources/camel-aws-ddb-streams-source-source.json
+++ b/connectors/camel-aws-ddb-streams-source-kafka-connector/src/generated/resources/camel-aws-ddb-streams-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-ddb-streams-source-source",
 		"type": "source",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Receive events from Amazon DynamoDB Streams.\n\nThe basic authentication method for the AWS DynamoDB Streams service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the DynamoDB Streams client loads the credentials through this provider and doesn't use the basic authentication method."
+		"description": "Receive events from Amazon DynamoDB Streams."
 	},
 	"properties": {
 		"camel.kamelet.aws-ddb-streams-source.table": {
diff --git a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml b/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml
index c59783a65d..8fb3f64b10 100644
--- a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml
+++ b/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml
@@ -31,12 +31,7 @@ metadata:
 spec:
   definition:
     title: "AWS DynamoDB Streams Source"
-    description: |-
-      Receive events from Amazon DynamoDB Streams.
-
-      The basic authentication method for the AWS DynamoDB Streams service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.
-
-      If you use the default credentials provider, the DynamoDB Streams client loads the credentials through this provider and doesn't use the basic authentication method.
+    description: Receive events from Amazon DynamoDB Streams.
     required:
       - table
       - region
diff --git a/connectors/camel-aws-ec2-sink-kafka-connector/src/generated/resources/camel-aws-ec2-sink-sink.json b/connectors/camel-aws-ec2-sink-kafka-connector/src/generated/resources/camel-aws-ec2-sink-sink.json
index baa7bdb938..29b231734b 100644
--- a/connectors/camel-aws-ec2-sink-kafka-connector/src/generated/resources/camel-aws-ec2-sink-sink.json
+++ b/connectors/camel-aws-ec2-sink-kafka-connector/src/generated/resources/camel-aws-ec2-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-ec2-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Check the status of EC2 instances\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS EC2 Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the EC2 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.\n\nThe K [...]
+		"description": "Check the status of EC2 instances"
 	},
 	"properties": {
 		"camel.kamelet.aws-ec2-sink.accessKey": {
diff --git a/connectors/camel-aws-ec2-sink-kafka-connector/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml b/connectors/camel-aws-ec2-sink-kafka-connector/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml
index 6a3b53e0eb..ca3f9d1c07 100644
--- a/connectors/camel-aws-ec2-sink-kafka-connector/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml
+++ b/connectors/camel-aws-ec2-sink-kafka-connector/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml
@@ -31,16 +31,7 @@ metadata:
 spec:
   definition:
     title: AWS EC2 Sink
-    description: |-
-      Check the status of EC2 instances
-
-      Access Key/Secret Key are the basic method for authenticating to the AWS EC2 Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.
-      
-      When using a default Credentials Provider the EC2 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
-
-      The Kamelet expects the following headers to be set:
-
-      - `instanceIds` / `ce-instanceids`: as a comma separated list of EC2 instance ids.
+    description: Check the status of EC2 instances
     required:
       - region
     type: object
diff --git a/connectors/camel-aws-eventbridge-sink-kafka-connector/src/generated/resources/camel-aws-eventbridge-sink-sink.json b/connectors/camel-aws-eventbridge-sink-kafka-connector/src/generated/resources/camel-aws-eventbridge-sink-sink.json
index 3d7ab3d09a..adaf32bd31 100644
--- a/connectors/camel-aws-eventbridge-sink-kafka-connector/src/generated/resources/camel-aws-eventbridge-sink-sink.json
+++ b/connectors/camel-aws-eventbridge-sink-kafka-connector/src/generated/resources/camel-aws-eventbridge-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-eventbridge-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send events to an Amazon Eventbridge Eventbus.\n\nThe basic authentication method for the Eventbridge service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the Eventbridge client loads the credentials through this provider and doesn't use the basic authentication method.\n\nIn the headers, you need to set the `resources-arn` \/ `ce-r [...]
+		"description": "Send events to an Amazon Eventbridge Eventbus.\nIn the headers, you need to set the `resources-arn` \/ `ce-resources-arn` property to specify the ARN of resources related to the event.\nIn the headers, you need to set the `detail-type` \/ `ce-detail-type` property to specify the detail type related to the event.\nIn the headers, you need to set the `event-source` \/ `ce-event-source` property to specify the event source related to the event.\nIf you do not set the prope [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-eventbridge-sink.eventbusNameOrArn": {
diff --git a/connectors/camel-aws-eventbridge-sink-kafka-connector/src/main/resources/kamelets/aws-eventbridge-sink.kamelet.yaml b/connectors/camel-aws-eventbridge-sink-kafka-connector/src/main/resources/kamelets/aws-eventbridge-sink.kamelet.yaml
index f5af5d4638..ac5b54db87 100644
--- a/connectors/camel-aws-eventbridge-sink-kafka-connector/src/main/resources/kamelets/aws-eventbridge-sink.kamelet.yaml
+++ b/connectors/camel-aws-eventbridge-sink-kafka-connector/src/main/resources/kamelets/aws-eventbridge-sink.kamelet.yaml
@@ -31,12 +31,7 @@ metadata:
 spec:
   definition:
     title: "AWS Eventbridge Sink"
-    description: |-
-      Send events to an Amazon Eventbridge Eventbus.
-
-      The basic authentication method for the Eventbridge service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.
-      
-      If you use the default credentials provider, the Eventbridge client loads the credentials through this provider and doesn't use the basic authentication method.
+    description: Send events to an Amazon Eventbridge Eventbus.
 
       In the headers, you need to set the `resources-arn` / `ce-resources-arn` property to specify the ARN of resources related to the event.
 
diff --git a/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-sink-sink.json b/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-sink-sink.json
index 2b53692dba..1b4ab64acd 100644
--- a/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-sink-sink.json
+++ b/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-kinesis-firehose-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send message to an AWS Kinesis Firehose Stream\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS Kinesis Firehose Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the Kinesis Firehose client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandato [...]
+		"description": "Send message to an AWS Kinesis Firehose Stream."
 	},
 	"properties": {
 		"camel.kamelet.aws-kinesis-firehose-sink.streamName": {
diff --git a/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml b/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml
index d8800206d7..af2b2becea 100644
--- a/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml
+++ b/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml
@@ -31,12 +31,7 @@ metadata:
 spec:
   definition:
     title: AWS Kinesis Firehose Sink
-    description: |-
-      Send message to an AWS Kinesis Firehose Stream
-
-      Access Key/Secret Key are the basic method for authenticating to the AWS Kinesis Firehose Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.
-      
-      When using a default Credentials Provider the Kinesis Firehose client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
+    description: Send message to an AWS Kinesis Firehose Stream.
     required:
       - streamName
       - region
diff --git a/connectors/camel-aws-kinesis-sink-kafka-connector/src/generated/resources/camel-aws-kinesis-sink-sink.json b/connectors/camel-aws-kinesis-sink-kafka-connector/src/generated/resources/camel-aws-kinesis-sink-sink.json
index a2598e21fe..211f16b521 100644
--- a/connectors/camel-aws-kinesis-sink-kafka-connector/src/generated/resources/camel-aws-kinesis-sink-sink.json
+++ b/connectors/camel-aws-kinesis-sink-kafka-connector/src/generated/resources/camel-aws-kinesis-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-kinesis-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send data to AWS Kinesis.\n\nThe basic authentication method for the Kinesis service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the Kinesis client loads the credentials through this provider and doesn't use the basic authentication method.\n\nIn the header, you can optionally set the `file` \/ `ce-partition` property to set the Ki [...]
+		"description": "Send data to AWS Kinesis."
 	},
 	"properties": {
 		"camel.kamelet.aws-kinesis-sink.stream": {
diff --git a/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml b/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml
index 437a729356..5f3d71d8e6 100644
--- a/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml
+++ b/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml
@@ -31,19 +31,7 @@ metadata:
 spec:
   definition:
     title: "AWS Kinesis Sink"
-    description: |-
-      Send data to AWS Kinesis.
-
-      The basic authentication method for the Kinesis service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.
-      
-      If you use the default credentials provider, the Kinesis client loads the credentials through this provider and doesn't use the basic authentication method.
-      
-      In the header, you can optionally set the `file` / `ce-partition` property to set the Kinesis partition key.
-
-      If you do not set the property in the header, the Kamelet uses the exchange ID for the partition key.
-
-      You can also set the `sequence-number` / `ce-sequencenumber` property in the header to specify the Sequence number.
-
+    description: Send data to AWS Kinesis.
     required:
       - stream
       - region
diff --git a/connectors/camel-aws-kinesis-source-kafka-connector/src/generated/resources/camel-aws-kinesis-source-source.json b/connectors/camel-aws-kinesis-source-kafka-connector/src/generated/resources/camel-aws-kinesis-source-source.json
index 472aa96d96..30cc9c3bff 100644
--- a/connectors/camel-aws-kinesis-source-kafka-connector/src/generated/resources/camel-aws-kinesis-source-source.json
+++ b/connectors/camel-aws-kinesis-source-kafka-connector/src/generated/resources/camel-aws-kinesis-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-kinesis-source-source",
 		"type": "source",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Receive data from AWS Kinesis.\n\nThe basic authentication method for the Kinesis service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the Kinesis client loads the credentials through this provider and doesn't use the basic authentication method.\n\nTwo headers will be duplicated with different names for clarity at sink level, Camel [...]
+		"description": "Receive data from AWS Kinesis."
 	},
 	"properties": {
 		"camel.kamelet.aws-kinesis-source.stream": {
diff --git a/connectors/camel-aws-kinesis-source-kafka-connector/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml b/connectors/camel-aws-kinesis-source-kafka-connector/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml
index 9486d1c44a..75c3fa1582 100644
--- a/connectors/camel-aws-kinesis-source-kafka-connector/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml
+++ b/connectors/camel-aws-kinesis-source-kafka-connector/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml
@@ -31,14 +31,7 @@ metadata:
 spec:
   definition:
     title: "AWS Kinesis Source"
-    description: |-
-      Receive data from AWS Kinesis.
-
-      The basic authentication method for the Kinesis service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.
-      
-      If you use the default credentials provider, the Kinesis client loads the credentials through this provider and doesn't use the basic authentication method.
-
-      Two headers will be duplicated with different names for clarity at sink level, CamelAwsKinesisPartitionKey will be duplicated into aws.kinesis.partition.key and CamelAwsKinesisSequenceNumber will be duplicated in aws.kinesis.sequence.number
+    description: Receive data from AWS Kinesis.
     required:
       - stream
       - region
diff --git a/connectors/camel-aws-lambda-sink-kafka-connector/src/generated/resources/camel-aws-lambda-sink-sink.json b/connectors/camel-aws-lambda-sink-kafka-connector/src/generated/resources/camel-aws-lambda-sink-sink.json
index ddd18b6312..e95fb867fc 100644
--- a/connectors/camel-aws-lambda-sink-kafka-connector/src/generated/resources/camel-aws-lambda-sink-sink.json
+++ b/connectors/camel-aws-lambda-sink-kafka-connector/src/generated/resources/camel-aws-lambda-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-lambda-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send a payload to an AWS Lambda function.\n\nThe basic authentication method for the Lambda service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the Lambda client loads the credentials through this provider and doesn't use the basic authentication method."
+		"description": "Send a payload to an AWS Lambda function."
 	},
 	"properties": {
 		"camel.kamelet.aws-lambda-sink.function": {
diff --git a/connectors/camel-aws-lambda-sink-kafka-connector/src/main/resources/kamelets/aws-lambda-sink.kamelet.yaml b/connectors/camel-aws-lambda-sink-kafka-connector/src/main/resources/kamelets/aws-lambda-sink.kamelet.yaml
index 1ba7e872fd..40c3debf41 100644
--- a/connectors/camel-aws-lambda-sink-kafka-connector/src/main/resources/kamelets/aws-lambda-sink.kamelet.yaml
+++ b/connectors/camel-aws-lambda-sink-kafka-connector/src/main/resources/kamelets/aws-lambda-sink.kamelet.yaml
@@ -31,12 +31,7 @@ metadata:
 spec:
   definition:
     title: AWS Lambda Sink
-    description: |-
-      Send a payload to an AWS Lambda function.
-
-      The basic authentication method for the Lambda service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.
-      
-      If you use the default credentials provider, the Lambda client loads the credentials through this provider and doesn't use the basic authentication method.
+    description: Send a payload to an AWS Lambda function.
     required:
       - function
       - region
diff --git a/connectors/camel-aws-redshift-sink-kafka-connector/pom.xml b/connectors/camel-aws-redshift-sink-kafka-connector/pom.xml
index 1411b004f2..0d507fea3b 100644
--- a/connectors/camel-aws-redshift-sink-kafka-connector/pom.xml
+++ b/connectors/camel-aws-redshift-sink-kafka-connector/pom.xml
@@ -45,6 +45,11 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.13.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
@@ -58,18 +63,13 @@
       <artifactId>camel-yaml-dsl</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-dbcp2</artifactId>
-      <version>2.12.0</version>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-kamelet</artifactId>
     </dependency>
     <dependency>
       <groupId>com.amazon.redshift</groupId>
       <artifactId>redshift-jdbc42</artifactId>
-      <version>2.1.0.30</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-kamelet</artifactId>
+      <version>2.1.0.32</version>
     </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
diff --git a/connectors/camel-aws-redshift-sink-kafka-connector/src/generated/resources/camel-aws-redshift-sink-sink.json b/connectors/camel-aws-redshift-sink-kafka-connector/src/generated/resources/camel-aws-redshift-sink-sink.json
index 6194c7184f..9afe916d90 100644
--- a/connectors/camel-aws-redshift-sink-kafka-connector/src/generated/resources/camel-aws-redshift-sink-sink.json
+++ b/connectors/camel-aws-redshift-sink-kafka-connector/src/generated/resources/camel-aws-redshift-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-redshift-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send data to an AWS Redshift Database.\n\nThis Kamelet expects a JSON-formatted body. Use key:value pairs to map the JSON fields and parameters. For example, here is a query:\n\n'INSERT INTO accounts (username,city) VALUES (:#username,:#city)'\n\nHere is example input for the example query:\n\n'{ \"username\":\"oscerd\", \"city\":\"Rome\"}'"
+		"description": "Send data to an AWS Redshift Database."
 	},
 	"properties": {
 		"camel.kamelet.aws-redshift-sink.serverName": {
diff --git a/connectors/camel-aws-redshift-sink-kafka-connector/src/main/resources/kamelets/aws-redshift-sink.kamelet.yaml b/connectors/camel-aws-redshift-sink-kafka-connector/src/main/resources/kamelets/aws-redshift-sink.kamelet.yaml
index c03c9d1284..7c9a7885ed 100644
--- a/connectors/camel-aws-redshift-sink-kafka-connector/src/main/resources/kamelets/aws-redshift-sink.kamelet.yaml
+++ b/connectors/camel-aws-redshift-sink-kafka-connector/src/main/resources/kamelets/aws-redshift-sink.kamelet.yaml
@@ -30,16 +30,7 @@ metadata:
 spec:
   definition:
     title: "AWS Redshift Sink"
-    description: |-
-      Send data to an AWS Redshift Database.
-
-      This Kamelet expects a JSON-formatted body. Use key:value pairs to map the JSON fields and parameters. For example, here is a query:
-
-      'INSERT INTO accounts (username,city) VALUES (:#username,:#city)'
-
-      Here is example input for the example query:
-
-      '{ "username":"oscerd", "city":"Rome"}'
+    description: Send data to an AWS Redshift Database.
     required:
       - serverName
       - username
@@ -87,10 +78,14 @@ spec:
   - "camel:jackson"
   - "camel:kamelet"
   - "camel:sql"
-  - "mvn:com.amazon.redshift:redshift-jdbc42:2.1.0.30"
-  - "mvn:org.apache.commons:commons-dbcp2:2.12.0"
+  - "mvn:com.amazon.redshift:redshift-jdbc42:2.1.0.32"
+  - "mvn:org.apache.commons:commons-dbcp2:2.13.0"
   template:
     beans:
+      - name: local-sql-redshift-sink
+        type: "#class:org.apache.camel.component.sql.SqlComponent"
+        properties:
+          autowiredEnabled: "false"
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
         properties:
@@ -105,6 +100,6 @@ spec:
           json: 
             library: Jackson
       - to: 
-          uri: "sql:{{query}}"
+          uri: "{{local-sql-redshift-sink}}:{{query}}"
           parameters:
             dataSource: "#bean:{{dsBean}}"
\ No newline at end of file
diff --git a/connectors/camel-aws-redshift-source-kafka-connector/pom.xml b/connectors/camel-aws-redshift-source-kafka-connector/pom.xml
index 91f2d8c541..f8d577b49a 100644
--- a/connectors/camel-aws-redshift-source-kafka-connector/pom.xml
+++ b/connectors/camel-aws-redshift-source-kafka-connector/pom.xml
@@ -45,6 +45,11 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.13.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
@@ -58,18 +63,13 @@
       <artifactId>camel-yaml-dsl</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-dbcp2</artifactId>
-      <version>2.12.0</version>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-kamelet</artifactId>
     </dependency>
     <dependency>
       <groupId>com.amazon.redshift</groupId>
       <artifactId>redshift-jdbc42</artifactId>
-      <version>2.1.0.30</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-kamelet</artifactId>
+      <version>2.1.0.32</version>
     </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
diff --git a/connectors/camel-aws-redshift-source-kafka-connector/src/main/resources/kamelets/aws-redshift-source.kamelet.yaml b/connectors/camel-aws-redshift-source-kafka-connector/src/main/resources/kamelets/aws-redshift-source.kamelet.yaml
index 2b9cd5c854..4999611dcd 100644
--- a/connectors/camel-aws-redshift-source-kafka-connector/src/main/resources/kamelets/aws-redshift-source.kamelet.yaml
+++ b/connectors/camel-aws-redshift-source-kafka-connector/src/main/resources/kamelets/aws-redshift-source.kamelet.yaml
@@ -30,8 +30,7 @@ metadata:
 spec:
   definition:
     title: "AWS Redshift Source"
-    description: |-
-      Query data from an AWS RedShift Database.
+    description: Query data from an AWS RedShift Database.
     required:
       - serverName
       - username
@@ -89,10 +88,14 @@ spec:
   - "camel:jackson"
   - "camel:kamelet"
   - "camel:sql"
-  - "mvn:com.amazon.redshift:redshift-jdbc42:2.1.0.30"
-  - "mvn:org.apache.commons:commons-dbcp2:2.12.0"
+  - "mvn:com.amazon.redshift:redshift-jdbc42:2.1.0.32"
+  - "mvn:org.apache.commons:commons-dbcp2:2.13.0"
   template:
     beans:
+      - name: local-sql-redshift-source
+        type: "#class:org.apache.camel.component.sql.SqlComponent"
+        properties:
+          autowiredEnabled: "false"
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
         properties:
@@ -101,7 +104,7 @@ spec:
           url: 'jdbc:redshift://{{serverName}}:{{serverPort}}/{{databaseName}}'
           driverClassName: 'com.amazon.redshift.jdbc.Driver'
     from:
-      uri: "sql:{{query}}"
+      uri: "{{local-sql-redshift-source}}:{{query}}"
       parameters:
         dataSource: "#bean:{{dsBean}}"
         onConsume: "{{?consumedQuery}}"
diff --git a/connectors/camel-aws-s3-event-based-source-kafka-connector/src/generated/resources/camel-aws-s3-event-based-source-source.json b/connectors/camel-aws-s3-event-based-source-kafka-connector/src/generated/resources/camel-aws-s3-event-based-source-source.json
index b72a48b27c..be92ce5b5c 100644
--- a/connectors/camel-aws-s3-event-based-source-kafka-connector/src/generated/resources/camel-aws-s3-event-based-source-source.json
+++ b/connectors/camel-aws-s3-event-based-source-kafka-connector/src/generated/resources/camel-aws-s3-event-based-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-s3-event-based-source-source",
 		"type": "source",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Receive data from AWS SQS subscribed to Eventbridge Bus reporting events related to an S3 bucket or multiple buckets.\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SQS Service.\nTo use this Kamelet you'll need to set up Eventbridge on your bucket and subscribe Eventbridge bus to an SQS Queue.\nFor doing this you'll need to enable Evenbridge notification on your bucket and creating a rule on Eventbridge console related to all the events on S3 [...]
+		"description": "Receive data from AWS SQS subscribed to Eventbridge Bus reporting events related to an S3 bucket or multiple buckets."
 	},
 	"properties": {
 		"camel.kamelet.aws-s3-event-based-source.queueNameOrArn": {
diff --git a/connectors/camel-aws-s3-event-based-source-kafka-connector/src/main/resources/kamelets/aws-s3-event-based-source.kamelet.yaml b/connectors/camel-aws-s3-event-based-source-kafka-connector/src/main/resources/kamelets/aws-s3-event-based-source.kamelet.yaml
index 214e8b1f0d..ac134a600e 100644
--- a/connectors/camel-aws-s3-event-based-source-kafka-connector/src/main/resources/kamelets/aws-s3-event-based-source.kamelet.yaml
+++ b/connectors/camel-aws-s3-event-based-source-kafka-connector/src/main/resources/kamelets/aws-s3-event-based-source.kamelet.yaml
@@ -33,15 +33,7 @@ metadata:
 spec:
   definition:
     title: AWS S3 Event Based Source
-    description: >-
-      Receive data from AWS SQS subscribed to Eventbridge Bus reporting events related to an S3 bucket or multiple buckets.
-
-      Access Key/Secret Key are the basic method for authenticating to the AWS
-      SQS Service.
-
-      To use this Kamelet you'll need to set up Eventbridge on your bucket and subscribe Eventbridge bus to an SQS Queue.
-      
-      For doing this you'll need to enable Evenbridge notification on your bucket and creating a rule on Eventbridge console related to all the events on S3 bucket and pointing to the SQS Queue specified as parameter in this Kamelet.
+    description: Receive data from AWS SQS subscribed to Eventbridge Bus reporting events related to an S3 bucket or multiple buckets.
     required:
       - accessKey
       - secretKey
diff --git a/connectors/camel-aws-s3-sink-kafka-connector/src/generated/resources/camel-aws-s3-sink-sink.json b/connectors/camel-aws-s3-sink-kafka-connector/src/generated/resources/camel-aws-s3-sink-sink.json
index 13d7355393..2d029cce87 100644
--- a/connectors/camel-aws-s3-sink-kafka-connector/src/generated/resources/camel-aws-s3-sink-sink.json
+++ b/connectors/camel-aws-s3-sink-kafka-connector/src/generated/resources/camel-aws-s3-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-s3-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Upload data to an Amazon S3 Bucket.\n\nThe basic authentication method for the S3 service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the S3 client loads the credentials through this provider and doesn't use the basic authentication method.\n\nIn the header, you can optionally set the `file` \/ `ce-partition` property to specify th [...]
+		"description": "Upload data to an Amazon S3 Bucket."
 	},
 	"properties": {
 		"camel.kamelet.aws-s3-sink.bucketNameOrArn": {
diff --git a/connectors/camel-aws-s3-sink-kafka-connector/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml b/connectors/camel-aws-s3-sink-kafka-connector/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
index 6352409e63..9146da0e8e 100644
--- a/connectors/camel-aws-s3-sink-kafka-connector/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
+++ b/connectors/camel-aws-s3-sink-kafka-connector/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
@@ -31,16 +31,7 @@ metadata:
 spec:
   definition:
     title: "AWS S3 Sink"
-    description: |-
-      Upload data to an Amazon S3 Bucket.
-
-      The basic authentication method for the S3 service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.
-
-      If you use the default credentials provider, the S3 client loads the credentials through this provider and doesn't use the basic authentication method.
-
-      In the header, you can optionally set the `file` / `ce-partition` property to specify the name of the file to upload.
-
-      If you do not set the property in the header, the Kamelet uses the exchange ID for the file name.
+    description: Upload data to an Amazon S3 Bucket.
     required:
       - bucketNameOrArn
       - region
diff --git a/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/generated/resources/camel-aws-s3-streaming-upload-sink-sink.json b/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/generated/resources/camel-aws-s3-streaming-upload-sink-sink.json
index dd9d308b53..c3623f05bb 100644
--- a/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/generated/resources/camel-aws-s3-streaming-upload-sink-sink.json
+++ b/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/generated/resources/camel-aws-s3-streaming-upload-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-s3-streaming-upload-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Upload data to AWS S3 in streaming upload mode.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS S3 Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the S3 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
+		"description": "Upload data to AWS S3 in streaming upload mode."
 	},
 	"properties": {
 		"camel.kamelet.aws-s3-streaming-upload-sink.bucketNameOrArn": {
diff --git a/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml b/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml
index b7fa22ff0d..0abe21a916 100644
--- a/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml
+++ b/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml
@@ -31,12 +31,7 @@ metadata:
 spec:
   definition:
     title: "AWS S3 Streaming upload Sink"
-    description: |-
-      Upload data to AWS S3 in streaming upload mode.
-
-      Access Key/Secret Key are the basic method for authenticating to the AWS S3 Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.
-      
-      When using a default Credentials Provider the S3 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
+    description: Upload data to AWS S3 in streaming upload mode.
     required:
       - bucketNameOrArn
       - region
diff --git a/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/generated/resources/camel-aws-secrets-manager-sink-sink.json b/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/generated/resources/camel-aws-secrets-manager-sink-sink.json
index 6c839197fb..777f0f9b7d 100644
--- a/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/generated/resources/camel-aws-secrets-manager-sink-sink.json
+++ b/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/generated/resources/camel-aws-secrets-manager-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-secrets-manager-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Create a secret in AWS Secrets Manager.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS Secrets Manager Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the Secrets Manager client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parame [...]
+		"description": "Create a secret in AWS Secrets Manager."
 	},
 	"properties": {
 		"camel.kamelet.aws-secrets-manager-sink.accessKey": {
diff --git a/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/resources/kamelets/aws-secrets-manager-sink.kamelet.yaml b/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/resources/kamelets/aws-secrets-manager-sink.kamelet.yaml
index 97bb0cc6a9..0a05216110 100644
--- a/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/resources/kamelets/aws-secrets-manager-sink.kamelet.yaml
+++ b/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/resources/kamelets/aws-secrets-manager-sink.kamelet.yaml
@@ -31,18 +31,7 @@ metadata:
 spec:
   definition:
     title: "AWS Secrets Manager Sink"
-    description: |-
-      Create a secret in AWS Secrets Manager.
-
-      Access Key/Secret Key are the basic method for authenticating to the AWS Secrets Manager Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.
-      
-      When using a default Credentials Provider the Secrets Manager client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
-
-      The Kamelet expects the following headers to be set:
-
-      - `secret-name` / `ce-secret-name`: as the secret name to create.
-
-      If the header won't be set the exchange ID will be used as secret name.
+    description: Create a secret in AWS Secrets Manager.
     required:
       - region
     type: object
diff --git a/connectors/camel-aws-ses-sink-kafka-connector/src/generated/resources/camel-aws-ses-sink-sink.json b/connectors/camel-aws-ses-sink-kafka-connector/src/generated/resources/camel-aws-ses-sink-sink.json
index a55329c43e..795c89c62b 100644
--- a/connectors/camel-aws-ses-sink-kafka-connector/src/generated/resources/camel-aws-ses-sink-sink.json
+++ b/connectors/camel-aws-ses-sink-kafka-connector/src/generated/resources/camel-aws-ses-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-ses-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send email through the Amazon Simple Email Service (SES).\n\nThe basic authentication method for the SES service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the SES client loads the credentials through this provider and doesn't use the basic authentication method.\n\nIn the header, you can optionally set the following properties:\n [...]
+		"description": "Send email through the Amazon Simple Email Service (SES)."
 	},
 	"properties": {
 		"camel.kamelet.aws-ses-sink.from": {
diff --git a/connectors/camel-aws-ses-sink-kafka-connector/src/main/resources/kamelets/aws-ses-sink.kamelet.yaml b/connectors/camel-aws-ses-sink-kafka-connector/src/main/resources/kamelets/aws-ses-sink.kamelet.yaml
index eeb25c721a..ca320ccfd5 100644
--- a/connectors/camel-aws-ses-sink-kafka-connector/src/main/resources/kamelets/aws-ses-sink.kamelet.yaml
+++ b/connectors/camel-aws-ses-sink-kafka-connector/src/main/resources/kamelets/aws-ses-sink.kamelet.yaml
@@ -31,21 +31,7 @@ metadata:
 spec:
   definition:
     title: "AWS SES Sink"
-    description: |-
-      Send email through the Amazon Simple Email Service (SES).
-
-      The basic authentication method for the SES service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.
-      
-      If you use the default credentials provider, the SES client loads the credentials through this provider and doesn't use the basic authentication method.
-      
-      In the header, you can optionally set the following properties:
-      
-      - `subject` / `ce-subject` property to specify the email subject. If you do not set this property in the header, the Kamelet uses the exchange ID for the email subject.
-
-      - `to` / `ce-to` to provide a comma-separated list of email addresses.
-
-      - `reply-to-addresses` / `ce-reply-to-addresses`to provider a comma-separated list of reply-to email addresses.
-
+    description: Send email through the Amazon Simple Email Service (SES).
     required:
       - from
       - region
diff --git a/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/generated/resources/camel-aws-sns-fifo-sink-sink.json b/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/generated/resources/camel-aws-sns-fifo-sink-sink.json
index 58ddae159c..536b1a2f3e 100644
--- a/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/generated/resources/camel-aws-sns-fifo-sink-sink.json
+++ b/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/generated/resources/camel-aws-sns-fifo-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sns-fifo-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send message to an AWS SNS FIFO Topic.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SNS Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SNS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.\n\n [...]
+		"description": "Send message to an AWS SNS FIFO Topic."
 	},
 	"properties": {
 		"camel.kamelet.aws-sns-fifo-sink.topicNameOrArn": {
diff --git a/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/resources/kamelets/aws-sns-fifo-sink.kamelet.yaml b/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/resources/kamelets/aws-sns-fifo-sink.kamelet.yaml
index 9ee64904a7..633952fa4f 100644
--- a/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/resources/kamelets/aws-sns-fifo-sink.kamelet.yaml
+++ b/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/resources/kamelets/aws-sns-fifo-sink.kamelet.yaml
@@ -31,16 +31,7 @@ metadata:
 spec:
   definition:
     title: AWS SNS FIFO Sink
-    description: |- 
-      Send message to an AWS SNS FIFO Topic.
-
-      Access Key/Secret Key are the basic method for authenticating to the AWS SNS Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.
-      
-      When using a default Credentials Provider the SNS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
-
-      The Kamelet expects the following headers to be set:
-
-      - `subject` / `ce-subject`: the subject of the message
+    description: Send message to an AWS SNS FIFO Topic.
     required:
       - topicNameOrArn
       - region
diff --git a/connectors/camel-aws-sns-sink-kafka-connector/src/generated/resources/camel-aws-sns-sink-sink.json b/connectors/camel-aws-sns-sink-kafka-connector/src/generated/resources/camel-aws-sns-sink-sink.json
index 571944fb01..0c492a8587 100644
--- a/connectors/camel-aws-sns-sink-kafka-connector/src/generated/resources/camel-aws-sns-sink-sink.json
+++ b/connectors/camel-aws-sns-sink-kafka-connector/src/generated/resources/camel-aws-sns-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sns-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send message to an Amazon Simple Notification Service (SNS) topic.\n\nThe basic authentication method for the SNS service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the SNS client loads the credentials through this provider and doesn't use the basic authentication method.\n\nIn the header, you can optionally set the `subject` \/ ` [...]
+		"description": "Send message to an Amazon Simple Notification Service (SNS) topic."
 	},
 	"properties": {
 		"camel.kamelet.aws-sns-sink.topicNameOrArn": {
diff --git a/connectors/camel-aws-sns-sink-kafka-connector/src/main/resources/kamelets/aws-sns-sink.kamelet.yaml b/connectors/camel-aws-sns-sink-kafka-connector/src/main/resources/kamelets/aws-sns-sink.kamelet.yaml
index 2bd4c717e4..4ac24a9e0c 100644
--- a/connectors/camel-aws-sns-sink-kafka-connector/src/main/resources/kamelets/aws-sns-sink.kamelet.yaml
+++ b/connectors/camel-aws-sns-sink-kafka-connector/src/main/resources/kamelets/aws-sns-sink.kamelet.yaml
@@ -31,14 +31,7 @@ metadata:
 spec:
   definition:
     title: AWS SNS Sink
-    description: |-
-      Send message to an Amazon Simple Notification Service (SNS) topic.
-
-      The basic authentication method for the SNS service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.
-      
-      If you use the default credentials provider, the SNS client loads the credentials through this provider and doesn't use the basic authentication method.
-
-      In the header, you can optionally set the `subject` / `ce-subject` property to specify the subject of the message.
+    description: Send message to an Amazon Simple Notification Service (SNS) topic.
     required:
       - topicNameOrArn
       - region
diff --git a/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/generated/resources/camel-aws-sqs-batch-sink-sink.json b/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/generated/resources/camel-aws-sqs-batch-sink-sink.json
index 8ab534cbcb..a763ae364d 100644
--- a/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/generated/resources/camel-aws-sqs-batch-sink-sink.json
+++ b/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/generated/resources/camel-aws-sqs-batch-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sqs-batch-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send Batch message to an AWS SQS Queue.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
+		"description": "Send Batch message to an AWS SQS Queue."
 	},
 	"properties": {
 		"camel.kamelet.aws-sqs-batch-sink.queueNameOrArn": {
diff --git a/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-batch-sink.kamelet.yaml b/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-batch-sink.kamelet.yaml
index 82557a36fc..ec8fc03fce 100644
--- a/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-batch-sink.kamelet.yaml
+++ b/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-batch-sink.kamelet.yaml
@@ -31,12 +31,7 @@ metadata:
 spec:
   definition:
     title: AWS SQS Batch Sink
-    description: |-
-      Send Batch message to an AWS SQS Queue.
-
-      Access Key/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.
-      
-      When using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
+    description: Send Batch message to an AWS SQS Queue.
     required:
       - queueNameOrArn
       - region
diff --git a/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/generated/resources/camel-aws-sqs-fifo-sink-sink.json b/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/generated/resources/camel-aws-sqs-fifo-sink-sink.json
index 9c7802d2b7..e4acc958e1 100644
--- a/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/generated/resources/camel-aws-sqs-fifo-sink-sink.json
+++ b/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/generated/resources/camel-aws-sqs-fifo-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sqs-fifo-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send message to an AWS SQS FIFO Queue.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
+		"description": "Send message to an AWS SQS FIFO Queue."
 	},
 	"properties": {
 		"camel.kamelet.aws-sqs-fifo-sink.queueNameOrArn": {
diff --git a/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-fifo-sink.kamelet.yaml b/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-fifo-sink.kamelet.yaml
index 6110d4a4c1..1470d3dcfc 100644
--- a/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-fifo-sink.kamelet.yaml
+++ b/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-fifo-sink.kamelet.yaml
@@ -31,12 +31,7 @@ metadata:
 spec:
   definition:
     title: AWS SQS FIFO Sink
-    description: |-
-      Send message to an AWS SQS FIFO Queue.
-
-      Access Key/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.
-      
-      When using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
+    description: Send message to an AWS SQS FIFO Queue.
     required:
       - queueNameOrArn
       - region
diff --git a/connectors/camel-aws-sqs-sink-kafka-connector/src/generated/resources/camel-aws-sqs-sink-sink.json b/connectors/camel-aws-sqs-sink-kafka-connector/src/generated/resources/camel-aws-sqs-sink-sink.json
index 4c0936872a..79c9a2ec7b 100644
--- a/connectors/camel-aws-sqs-sink-kafka-connector/src/generated/resources/camel-aws-sqs-sink-sink.json
+++ b/connectors/camel-aws-sqs-sink-kafka-connector/src/generated/resources/camel-aws-sqs-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sqs-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send messages to an Amazon Simple Queue Service (SQS) queue.\n\nThe basic authentication method for the SQS service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the SQS client loads the credentials through this provider and doesn't use the basic authentication method."
+		"description": "Send messages to an Amazon Simple Queue Service (SQS) queue."
 	},
 	"properties": {
 		"camel.kamelet.aws-sqs-sink.queueNameOrArn": {
diff --git a/connectors/camel-aws-sqs-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-sink.kamelet.yaml b/connectors/camel-aws-sqs-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-sink.kamelet.yaml
index b86ced390c..f01381a63f 100644
--- a/connectors/camel-aws-sqs-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-sink.kamelet.yaml
+++ b/connectors/camel-aws-sqs-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-sink.kamelet.yaml
@@ -31,12 +31,7 @@ metadata:
 spec:
   definition:
     title: AWS SQS Sink
-    description: |-
-      Send messages to an Amazon Simple Queue Service (SQS) queue.
-
-      The basic authentication method for the SQS service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.
-      
-      If you use the default credentials provider, the SQS client loads the credentials through this provider and doesn't use the basic authentication method.
+    description: Send messages to an Amazon Simple Queue Service (SQS) queue.
     required:
       - queueNameOrArn
       - region
diff --git a/connectors/camel-aws-sqs-source-kafka-connector/src/generated/resources/camel-aws-sqs-source-source.json b/connectors/camel-aws-sqs-source-kafka-connector/src/generated/resources/camel-aws-sqs-source-source.json
index 8ae2ee3700..9905004462 100644
--- a/connectors/camel-aws-sqs-source-kafka-connector/src/generated/resources/camel-aws-sqs-source-source.json
+++ b/connectors/camel-aws-sqs-source-kafka-connector/src/generated/resources/camel-aws-sqs-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sqs-source-source",
 		"type": "source",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Receive data from AWS SQS.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.\n\nTwo headers  [...]
+		"description": "Receive data from AWS SQS."
 	},
 	"properties": {
 		"camel.kamelet.aws-sqs-source.queueNameOrArn": {
diff --git a/connectors/camel-aws-sqs-source-kafka-connector/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml b/connectors/camel-aws-sqs-source-kafka-connector/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml
index c07d7c5e30..d6d89adff0 100644
--- a/connectors/camel-aws-sqs-source-kafka-connector/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml
+++ b/connectors/camel-aws-sqs-source-kafka-connector/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml
@@ -32,14 +32,7 @@ metadata:
 spec:
   definition:
     title: "AWS SQS Source"
-    description: |-
-      Receive data from AWS SQS.
-
-      Access Key/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.
-      
-      When using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
-
-      Two headers will be duplicated with different names for clarity at sink level, CamelAwsSqsMessageId will be duplicated into aws.sqs.message.id and CamelAwsSqsReceiptHandle will be duplicated in aws.sqs.receipt.handle
+    description: Receive data from AWS SQS.
     required:
       - queueNameOrArn
       - region
@@ -152,19 +145,19 @@ spec:
         title: Max Messages Per Poll
         description: The maximum number of messages to return. Amazon SQS never returns more messages than this value (however, fewer messages might be returned). Valid values 1 to 10. Default 1.
         type: integer
-        minimum: 1
-        maximum: 10
+        minimum: "1"
+        maximum: "10"
         default: 1
       waitTimeSeconds:
         title: Wait Time Seconds
         description: The duration (in seconds) for which the call waits for a message to arrive in the queue before returning. If a message is available, the call returns sooner than WaitTimeSeconds. If no messages are available and the wait time expires, the call does not return a message list.
         type: integer
-        minimum: 0
+        minimum: "0"
       visibilityTimeout:
         title: Visibility Timeout
         description: The duration (in seconds) that the received messages are hidden from subsequent retrieve requests after being retrieved by a ReceiveMessage request.
         type: integer
-        minimum: 0
+        minimum: "0"
   dataTypes:
     out:
       default: text
diff --git a/connectors/camel-aws-timestream-query-sink-kafka-connector/src/generated/resources/camel-aws-timestream-query-sink-sink.json b/connectors/camel-aws-timestream-query-sink-kafka-connector/src/generated/resources/camel-aws-timestream-query-sink-sink.json
index 0c0999a125..0e8f470faf 100644
--- a/connectors/camel-aws-timestream-query-sink-kafka-connector/src/generated/resources/camel-aws-timestream-query-sink-sink.json
+++ b/connectors/camel-aws-timestream-query-sink-kafka-connector/src/generated/resources/camel-aws-timestream-query-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-timestream-query-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Query an AWS Timestream Database\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS Timestream Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the Timestream client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kame [...]
+		"description": "Query an AWS Timestream Database"
 	},
 	"properties": {
 		"camel.kamelet.aws-timestream-query-sink.accessKey": {
diff --git a/connectors/camel-aws-timestream-query-sink-kafka-connector/src/main/resources/kamelets/aws-timestream-query-sink.kamelet.yaml b/connectors/camel-aws-timestream-query-sink-kafka-connector/src/main/resources/kamelets/aws-timestream-query-sink.kamelet.yaml
index 481fb3aa6d..f6efa2ffc1 100644
--- a/connectors/camel-aws-timestream-query-sink-kafka-connector/src/main/resources/kamelets/aws-timestream-query-sink.kamelet.yaml
+++ b/connectors/camel-aws-timestream-query-sink-kafka-connector/src/main/resources/kamelets/aws-timestream-query-sink.kamelet.yaml
@@ -31,16 +31,7 @@ metadata:
 spec:
   definition:
     title: AWS Timestream Query Sink
-    description: |-
-      Query an AWS Timestream Database
-
-      Access Key/Secret Key are the basic method for authenticating to the AWS Timestream Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.
-      
-      When using a default Credentials Provider the Timestream client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
-
-      The Kamelet expects the following headers to be set:
-
-      - `query` / `ce-query`: as a Timestream Query
+    description: Query an AWS Timestream Database
     required:
       - region
     type: object
diff --git a/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/generated/resources/camel-azure-cosmosdb-sink-sink.json b/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/generated/resources/camel-azure-cosmosdb-sink-sink.json
index 899738aa30..40dec1f044 100644
--- a/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/generated/resources/camel-azure-cosmosdb-sink-sink.json
+++ b/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/generated/resources/camel-azure-cosmosdb-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-azure-cosmosdb-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send Data to an Azure CosmosDB instance\n\nIn the headers, you can optionally set the `itemPartitionKey` \/ `ce-itemPartitionKey` property to specify the partition key for a specific item.\n\nIf you do not set the property in the header, you'll need to use the static property itemPartitonKey.\n\nThere are two different mechanism of authentication `SHARED_ACCOUNT_KEY` and `AZURE_IDENTITY`, you could specify with credentialType property. If you're using `SHARED_ACCOUNT_KE [...]
+		"description": "Send Data to an Azure CosmosDB instance"
 	},
 	"properties": {
 		"camel.kamelet.azure-cosmosdb-sink.databaseName": {
diff --git a/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/main/resources/kamelets/azure-cosmosdb-sink.kamelet.yaml b/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/main/resources/kamelets/azure-cosmosdb-sink.kamelet.yaml
index b947cb7120..0ccc391223 100644
--- a/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/main/resources/kamelets/azure-cosmosdb-sink.kamelet.yaml
+++ b/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/main/resources/kamelets/azure-cosmosdb-sink.kamelet.yaml
@@ -31,16 +31,7 @@ metadata:
 spec:
   definition:
     title: "Azure CosmosDB Sink"
-    description: |-
-      Send Data to an Azure CosmosDB instance
-      
-      In the headers, you can optionally set the `itemPartitionKey` / `ce-itemPartitionKey` property to specify the partition key for a specific item.
-
-      If you do not set the property in the header, you'll need to use the static property itemPartitonKey.
-      
-      There are two different mechanism of authentication `SHARED_ACCOUNT_KEY` and `AZURE_IDENTITY`, you could specify with credentialType property. If you're using `SHARED_ACCOUNT_KEY` accountKey property will be needed.
-      
-      In case of `AZURE_IDENTITY` selection, the DefaultAzureCredential will attempt to authenticate via the following mechanisms in the following order enviroment, Workload Identity, Managed Identity, Azure Developer CLI, IntelliJ, Azure CLI and Azure Powershell. 
+    description: Send Data to an Azure CosmosDB instance
     required:
       - databaseName
       - containerName
diff --git a/connectors/camel-azure-cosmosdb-source-kafka-connector/src/generated/resources/camel-azure-cosmosdb-source-source.json b/connectors/camel-azure-cosmosdb-source-kafka-connector/src/generated/resources/camel-azure-cosmosdb-source-source.json
index 8289121762..7966179e7a 100644
--- a/connectors/camel-azure-cosmosdb-source-kafka-connector/src/generated/resources/camel-azure-cosmosdb-source-source.json
+++ b/connectors/camel-azure-cosmosdb-source-kafka-connector/src/generated/resources/camel-azure-cosmosdb-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-azure-cosmosdb-source-source",
 		"type": "source",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Consume Changes from a CosmosDB instance.\n\nThere are two different mechanism of authentication `SHARED_ACCOUNT_KEY` and `AZURE_IDENTITY`, you could specify with credentialType property. If you're using `SHARED_ACCOUNT_KEY` accountKey property will be needed.\n\nIn case of `AZURE_IDENTITY` selection, the DefaultAzureCredential will attempt to authenticate via the following mechanisms in the following order enviroment, Workload Identity, Managed Identity, Azure Develope [...]
+		"description": "Consume Changes from a CosmosDB instance."
 	},
 	"properties": {
 		"camel.kamelet.azure-cosmosdb-source.databaseName": {
diff --git a/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/resources/kamelets/azure-cosmosdb-source.kamelet.yaml b/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/resources/kamelets/azure-cosmosdb-source.kamelet.yaml
index 0e000b00de..b2a8c8fca2 100644
--- a/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/resources/kamelets/azure-cosmosdb-source.kamelet.yaml
+++ b/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/resources/kamelets/azure-cosmosdb-source.kamelet.yaml
@@ -31,12 +31,7 @@ metadata:
 spec:
   definition:
     title: "Azure CosmosDB Source"
-    description: |-
-      Consume Changes from a CosmosDB instance.
-      
-      There are two different mechanism of authentication `SHARED_ACCOUNT_KEY` and `AZURE_IDENTITY`, you could specify with credentialType property. If you're using `SHARED_ACCOUNT_KEY` accountKey property will be needed.
-      
-      In case of `AZURE_IDENTITY` selection, the DefaultAzureCredential will attempt to authenticate via the following mechanisms in the following order enviroment, Workload Identity, Managed Identity, Azure Developer CLI, IntelliJ, Azure CLI and Azure Powershell. 
+    description: Consume Changes from a CosmosDB instance.
     required:
       - databaseName
       - containerName
diff --git a/connectors/camel-azure-eventhubs-sink-kafka-connector/src/generated/resources/camel-azure-eventhubs-sink-sink.json b/connectors/camel-azure-eventhubs-sink-kafka-connector/src/generated/resources/camel-azure-eventhubs-sink-sink.json
index 991e8868e6..de5958989d 100644
--- a/connectors/camel-azure-eventhubs-sink-kafka-connector/src/generated/resources/camel-azure-eventhubs-sink-sink.json
+++ b/connectors/camel-azure-eventhubs-sink-kafka-connector/src/generated/resources/camel-azure-eventhubs-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-azure-eventhubs-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Send events to Azure Event Hubs.\n\nThe Kamelet checks for the `partition-id` \/ `ce-partition-id` header which is an identifier of the Event Hub partition that the event will be sent to. If the identifier is not specified, the Event Hubs service will be responsible for routing events that are sent to an available partition.\n   \nA header is optional. If the header is not set, the partition is assigned by Event Hubs.\n\nThere are two different mechanism of authenticati [...]
+		"description": "Send events to Azure Event Hubs."
 	},
 	"properties": {
 		"camel.kamelet.azure-eventhubs-sink.namespaceName": {
diff --git a/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/resources/kamelets/azure-eventhubs-sink.kamelet.yaml b/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/resources/kamelets/azure-eventhubs-sink.kamelet.yaml
index cf6e666fb8..7ba806a78d 100644
--- a/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/resources/kamelets/azure-eventhubs-sink.kamelet.yaml
+++ b/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/resources/kamelets/azure-eventhubs-sink.kamelet.yaml
@@ -31,16 +31,7 @@ metadata:
 spec:
   definition:
     title: "Azure Eventhubs Sink"
-    description: |-
-      Send events to Azure Event Hubs.
-
-      The Kamelet checks for the `partition-id` / `ce-partition-id` header which is an identifier of the Event Hub partition that the event will be sent to. If the identifier is not specified, the Event Hubs service will be responsible for routing events that are sent to an available partition.
-         
-      A header is optional. If the header is not set, the partition is assigned by Event Hubs.
-      
-      There are two different mechanism of authentication `CONNECTION_STRING` and `AZURE_IDENTITY`, you could specify with credentialType property. If you're using `CONNECTION_STRING` sharedAccessName and sharedAccessKey properties will be needed.
-      
-      In case of `AZURE_IDENTITY` selection, the DefaultAzureCredential will attempt to authenticate via the following mechanisms in the following order enviroment, Workload Identity, Managed Identity, Azure Developer CLI, IntelliJ, Azure CLI and Azure Powershell. 
+    description: Send events to Azure Event Hubs.        
     required:
       - namespaceName
       - eventhubName
diff --git a/connectors/camel-azure-eventhubs-source-kafka-connector/src/generated/resources/camel-azure-eventhubs-source-source.json b/connectors/camel-azure-eventhubs-source-kafka-connector/src/generated/resources/camel-azure-eventhubs-source-source.json
index aed5382b79..14a5534218 100644
--- a/connectors/camel-azure-eventhubs-source-kafka-connector/src/generated/resources/camel-azure-eventhubs-source-source.json
+++ b/connectors/camel-azure-eventhubs-source-kafka-connector/src/generated/resources/camel-azure-eventhubs-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-azure-eventhubs-source-source",
 		"type": "source",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Receive events from Azure Event Hubs.\n\nThere are two different mechanism of authentication `CONNECTION_STRING` and `AZURE_IDENTITY`, you could specify with credentialType property. If you're using `CONNECTION_STRING` sharedAccessName and sharedAccessKey properties will be needed.\n\nIn case of `AZURE_IDENTITY` selection, the DefaultAzureCredential will attempt to authenticate via the following mechanisms in the following order enviroment, Workload Identity, Managed Id [...]
+		"description": "Receive events from Azure Event Hubs."
 	},
 	"properties": {
 		"camel.kamelet.azure-eventhubs-source.namespaceName": {
diff --git a/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/resources/kamelets/azure-eventhubs-source.kamelet.yaml b/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/resources/kamelets/azure-eventhubs-source.kamelet.yaml
index 1b52a831ec..892c2710ab 100644
--- a/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/resources/kamelets/azure-eventhubs-source.kamelet.yaml
+++ b/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/resources/kamelets/azure-eventhubs-source.kamelet.yaml
@@ -31,12 +31,7 @@ metadata:
 spec:
   definition:
     title: "Azure Eventhubs Source"
-    description: |-
-      Receive events from Azure Event Hubs.
-      
-      There are two different mechanism of authentication `CONNECTION_STRING` and `AZURE_IDENTITY`, you could specify with credentialType property. If you're using `CONNECTION_STRING` sharedAccessName and sharedAccessKey properties will be needed.
-      
-      In case of `AZURE_IDENTITY` selection, the DefaultAzureCredential will attempt to authenticate via the following mechanisms in the following order enviroment, Workload Identity, Managed Identity, Azure Developer CLI, IntelliJ, Azure CLI and Azure Powershell. 
+    description: Receive events from Azure Event Hubs.
     required:
       - namespaceName
       - eventhubName
diff --git a/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/resources/kamelets/azure-servicebus-sink.kamelet.yaml b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/resources/kamelets/azure-servicebus-sink.kamelet.yaml
index 063b48deaa..e4e0b38988 100644
--- a/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/resources/kamelets/azure-servicebus-sink.kamelet.yaml
+++ b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/resources/kamelets/azure-servicebus-sink.kamelet.yaml
@@ -31,8 +31,7 @@ metadata:
 spec:
   definition:
     title: "Azure Servicebus Sink"
-    description: |-
-      Send Messages to Azure Servicebus.
+    description: Send Messages to Azure Servicebus.
     required:
       - topicOrQueueName
       - connectionString
diff --git a/connectors/camel-azure-servicebus-source-kafka-connector/src/generated/resources/camel-azure-servicebus-source-source.json b/connectors/camel-azure-servicebus-source-kafka-connector/src/generated/resources/camel-azure-servicebus-source-source.json
index 63346453da..25935926e5 100644
--- a/connectors/camel-azure-servicebus-source-kafka-connector/src/generated/resources/camel-azure-servicebus-source-source.json
+++ b/connectors/camel-azure-servicebus-source-kafka-connector/src/generated/resources/camel-azure-servicebus-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-azure-servicebus-source-source",
 		"type": "source",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Consume Messages from Azure Servicebus.\n\nThe subscribtion name parameter needs to be populated in case of consuming from a Topic."
+		"description": "Consume Messages from Azure Servicebus."
 	},
 	"properties": {
 		"camel.kamelet.azure-servicebus-source.topicOrQueueName": {
diff --git a/connectors/camel-azure-servicebus-source-kafka-connector/src/main/resources/kamelets/azure-servicebus-source.kamelet.yaml b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/resources/kamelets/azure-servicebus-source.kamelet.yaml
index 42de3ab2cb..0c95181c0b 100644
--- a/connectors/camel-azure-servicebus-source-kafka-connector/src/main/resources/kamelets/azure-servicebus-source.kamelet.yaml
+++ b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/resources/kamelets/azure-servicebus-source.kamelet.yaml
@@ -31,10 +31,7 @@ metadata:
 spec:
   definition:
     title: "Azure Servicebus Source"
-    description: |-
-      Consume Messages from Azure Servicebus.
-
-      The subscribtion name parameter needs to be populated in case of consuming from a Topic.
+    description: Consume Messages from Azure Servicebus.
     required:
       - topicOrQueueName
       - connectionString
diff --git a/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/generated/resources/camel-azure-storage-blob-append-sink-sink.json b/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/generated/resources/camel-azure-storage-blob-append-sink-sink.json
index 5c06aa94be..e25f05cc89 100644
--- a/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/generated/resources/camel-azure-storage-blob-append-sink-sink.json
+++ b/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/generated/resources/camel-azure-storage-blob-append-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-azure-storage-blob-append-sink-sink",
 		"type": "sink",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Upload data in append mode to Azure Storage Blob.\n\nIn the header, you can set the `file` \/ `ce-file` property to specify the filename to upload. If you do set property in the header, the Kamelet uses the exchange ID as filename."
+		"description": "Upload data in append mode to Azure Storage Blob."
 	},
 	"properties": {
 		"camel.kamelet.azure-storage-blob-append-sink.accountName": {
diff --git a/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/main/resources/kamelets/azure-storage-blob-append-sink.kamelet.yaml b/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/main/resources/kamelets/azure-storage-blob-append-sink.kamelet.yaml
index 90dd4e2aeb..5117f05911 100644
--- a/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/main/resources/kamelets/azure-storage-blob-append-sink.kamelet.yaml
+++ b/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/main/resources/kamelets/azure-storage-blob-append-sink.kamelet.yaml
@@ -31,10 +31,7 @@ metadata:
 spec:
   definition:
     title: "Azure Storage Blob Append Sink"
-    description: |-
-      Upload data in append mode to Azure Storage Blob.
-
-      In the header, you can set the `file` / `ce-file` property to specify the filename to upload. If you do set property in the header, the Kamelet uses the exchange ID as filename.
+    description: Upload data in append mode to Azure Storage Blob.
     required:
       - accountName
       - containerName
diff --git a/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-changefeed-source.kamelet.yaml b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-changefeed-source.kamelet.yaml
index 554ac3bb60..414f18d9a8 100644
--- a/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-changefeed-source.kamelet.yaml
+++ b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-changefeed-source.kamelet.yaml
@@ -31,8 +31,7 @@ metadata:
 spec:
   definition:
     title: "Azure Storage Blob Changefeed Source"
-    description: |-
-      Consume events from an Azure Storage Blob change feed.
+    description: Consume events from an Azure Storage Blob change feed.
     required:
       - period
       - accountName
diff --git a/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/generated/resources/camel-azure-storage-blob-event-based-source-source.json b/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/generated/resources/camel-azure-storage-blob-event-based-source-source.json
index 52e015ff8e..793cc0155f 100644
--- a/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/generated/resources/camel-azure-storage-blob-event-based-source-source.json
+++ b/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/generated/resources/camel-azure-storage-blob-event-based-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-azure-storage-blob-event-based-source-source",
 		"type": "source",
 		"version": "4.10.0-SNAPSHOT",
-		"description": "Receive data from Azure Service Bus subscribed to Azure Eventgrid reporting events related to a Azure Storage Blob account.\n\nConnection string is the basic method for authenticating to the Azure Servicebus Queue.\n\nTo use this Kamelet you'll need to set up Events on your Azure Storage Blob account and select as an endpoint an Azure Servicebus Queue."
+		"description": "Receive data from Azure Service Bus subscribed to Azure Eventgrid reporting events related to a Azure Storage Blob account."
 	},
 	"properties": {
 		"camel.kamelet.azure-storage-blob-event-based-source.topicOrQueueName": {
diff --git a/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-event-based-source.kamelet.yaml b/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-event-based-source.kamelet.yaml
index 95ac8ee73a..6fdeb32d18 100644
--- a/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-event-based-source.kamelet.yaml
+++ b/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-event-based-source.kamelet.yaml
@@ -31,12 +31,7 @@ metadata:
 spec:
   definition:
     title: Azure Storage Blob Event-based Source
-    description: |-
-      Receive data from Azure Service Bus subscribed to Azure Eventgrid reporting events related to a Azure Storage Blob account.
-
-      Connection string is the basic method for authenticating to the Azure Servicebus Queue.
-
-      To use this Kamelet you'll need to set up Events on your Azure Storage Blob account and select as an endpoint an Azure Servicebus Queue.
+    description: Receive data from Azure Service Bus subscribed to Azure Eventgrid reporting events related to a Azure Storage Blob account.
     required:
       - topicOrQueueName
       - connectionString
diff --git a/connectors/camel-cassandra-sink-kafka-connector/src/main/resources/kamelets/cassandra-sink.kamelet.yaml b/connectors/camel-cassandra-sink-kafka-connector/src/main/resources/kamelets/cassandra-sink.kamelet.yaml
index 0f13ecacbd..f5b1c846ce 100644
--- a/connectors/camel-cassandra-sink-kafka-connector/src/main/resources/kamelets/cassandra-sink.kamelet.yaml
+++ b/connectors/camel-cassandra-sink-kafka-connector/src/main/resources/kamelets/cassandra-sink.kamelet.yaml
@@ -103,6 +103,11 @@ spec:
   - "camel:cassandraql"
   - "camel:core"
   template:
+    beans:
+      - name: local-sql-cassandraql-sink
+        type: "#class:org.apache.camel.component.cassandra.CassandraComponent"
+        properties:
+          autowiredEnabled: "false"
     from:
       uri: "kamelet:source"
       steps:
@@ -116,7 +121,7 @@ spec:
                       library: Jackson
                       useList: true
       - to: 
-          uri: "cql://{{connectionHost}}:{{connectionPort}}/{{keyspace}}"
+          uri: "{{local-sql-cassandraql-sink}}://{{connectionHost}}:{{connectionPort}}/{{keyspace}}"
           parameters:
             username: "{{?username}}"
             password: "{{?password}}"
diff --git a/connectors/camel-cassandra-source-kafka-connector/src/main/resources/kamelets/cassandra-source.kamelet.yaml b/connectors/camel-cassandra-source-kafka-connector/src/main/resources/kamelets/cassandra-source.kamelet.yaml
index 0c546714cf..e1f5f88d37 100644
--- a/connectors/camel-cassandra-source-kafka-connector/src/main/resources/kamelets/cassandra-source.kamelet.yaml
+++ b/connectors/camel-cassandra-source-kafka-connector/src/main/resources/kamelets/cassandra-source.kamelet.yaml
@@ -96,8 +96,13 @@ spec:
   - "camel:kamelet"
   - "camel:cassandraql"
   template:
+    beans:
+      - name: local-sql-cassandraql-source
+        type: "#class:org.apache.camel.component.cassandra.CassandraComponent"
+        properties:
+          autowiredEnabled: "false"
     from:
-      uri: "cql://{{connectionHost}}:{{connectionPort}}/{{keyspace}}"
+      uri: "{{local-sql-cassandraql-source}}://{{connectionHost}}:{{connectionPort}}/{{keyspace}}"
       parameters:
         username: "{{?username}}"
         password: "{{?password}}"
diff --git a/connectors/camel-google-storage-source-kafka-connector/src/generated/resources/camel-google-storage-source-source.json b/connectors/camel-google-storage-source-kafka-connector/src/generated/resources/camel-google-storage-source-source.json
index baa6a250d0..410b993720 100644
--- a/connectors/camel-google-storage-source-kafka-connector/src/generated/resources/camel-google-storage-source-source.json
+++ b/connectors/camel-google-storage-source-kafka-connector/src/generated/resources/camel-google-storage-source-source.json
@@ -34,6 +34,18 @@
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.google-storage-source.prefix": {
+			"name": "camel.kamelet.google-storage-source.prefix",
+			"description": "The prefix which is used in the BlobListOptions to only consume objects we are interested in.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.google-storage-source.filter": {
+			"name": "camel.kamelet.google-storage-source.filter",
+			"description": "A regular expression to include only blobs with name matching it.",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/connectors/camel-google-storage-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestoragesource/CamelGooglestoragesourceSourceConnectorConfig.java b/connectors/camel-google-storage-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestoragesource/CamelGooglestoragesourceSourceConnectorConfig.java
index 16df86272f..5c5ed10337 100644
--- a/connectors/camel-google-storage-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestoragesource/CamelGooglestoragesourceSourceConnectorConfig.java
+++ b/connectors/camel-google-storage-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestoragesource/CamelGooglestoragesourceSourceConnectorConfig.java
@@ -38,6 +38,12 @@ public class CamelGooglestoragesourceSourceConnectorConfig
     public static final String CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_AUTO_CREATE_BUCKET_CONF = "camel.kamelet.google-storage-source.autoCreateBucket";
     public static final String CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_AUTO_CREATE_BUCKET_DOC = "Specifies to automatically create the Google Cloud Storage bucket.";
     public static final Boolean CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_AUTO_CREATE_BUCKET_DEFAULT = false;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_PREFIX_CONF = "camel.kamelet.google-storage-source.prefix";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_PREFIX_DOC = "The prefix which is used in the BlobListOptions to only consume objects we are interested in.";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_PREFIX_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_FILTER_CONF = "camel.kamelet.google-storage-source.filter";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_FILTER_DOC = "A regular expression to include only blobs with name matching it.";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_FILTER_DEFAULT = null;
 
     public CamelGooglestoragesourceSourceConnectorConfig(
             ConfigDef config,
@@ -56,6 +62,8 @@ public class CamelGooglestoragesourceSourceConnectorConfig
         conf.define(CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_SERVICE_ACCOUNT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_SERVICE_ACCOUNT_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_SERVICE_ACCOUNT_KEY_DOC);
         conf.define(CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_DELETE_AFTER_READ_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_DELETE_AFTER_READ_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_DELETE_AFTER_READ_DOC);
         conf.define(CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_AUTO_CREATE_BUCKET_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_AUTO_CREATE_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_AUTO_CREATE_BUCKET_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_PREFIX_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_PREFIX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_PREFIX_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_FILTER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_FILTER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLESTORAGESOURCE_KAMELET_FILTER_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-google-storage-source-kafka-connector/src/main/resources/kamelets/google-storage-source.kamelet.yaml b/connectors/camel-google-storage-source-kafka-connector/src/main/resources/kamelets/google-storage-source.kamelet.yaml
index 86f3865fab..04186902fe 100644
--- a/connectors/camel-google-storage-source-kafka-connector/src/main/resources/kamelets/google-storage-source.kamelet.yaml
+++ b/connectors/camel-google-storage-source-kafka-connector/src/main/resources/kamelets/google-storage-source.kamelet.yaml
@@ -58,6 +58,14 @@ spec:
         description: Specifies to automatically create the Google Cloud Storage bucket.
         type: boolean
         default: false
+      prefix:
+        title: Prefix
+        description: The prefix which is used in the BlobListOptions to only consume objects we are interested in.
+        type: string
+      filter:
+        title: Filter
+        description: A regular expression to include only blobs with name matching it.
+        type: string
   dataTypes:
     out:
       default: binary
@@ -124,5 +132,7 @@ spec:
         autoCreateBucket: "{{autoCreateBucket}}"
         serviceAccountKey: "base64:{{?serviceAccountKey}}"
         deleteAfterRead: "{{deleteAfterRead}}"
+        filter: "{{?filter}}"
+        prefix: "{{?prefix}}"
       steps:
       - to: kamelet:sink
\ No newline at end of file
diff --git a/connectors/camel-https-kafka-connector/src/generated/resources/camel-https-sink.json b/connectors/camel-https-kafka-connector/src/generated/resources/camel-https-sink.json
index 945b3bb6aa..9b67e25f7e 100644
--- a/connectors/camel-https-kafka-connector/src/generated/resources/camel-https-sink.json
+++ b/connectors/camel-https-kafka-connector/src/generated/resources/camel-https-sink.json
@@ -58,6 +58,13 @@
 				"PATCH"
 			]
 		},
+		"camel.sink.endpoint.logHttpActivity": {
+			"name": "camel.sink.endpoint.logHttpActivity",
+			"description": "To enable logging HTTP request and response. You can use a custom LoggingHttpActivityListener as httpActivityListener to control logging options.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.skipRequestHeaders": {
 			"name": "camel.sink.endpoint.skipRequestHeaders",
 			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
@@ -132,6 +139,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.httpActivityListener": {
+			"name": "camel.sink.endpoint.httpActivityListener",
+			"description": "To use a custom activity listener",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.ignoreResponseBody": {
 			"name": "camel.sink.endpoint.ignoreResponseBody",
 			"description": "If this option is true, The http producer won't read response body and cache the input stream",
@@ -224,7 +237,7 @@
 		},
 		"camel.sink.endpoint.useSystemProperties": {
 			"name": "camel.sink.endpoint.useSystemProperties",
-			"description": "To use System Properties as fallback for configuration",
+			"description": "To use System Properties as fallback for configuration for configuring HTTP Client",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -346,6 +359,27 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.oauth2CachedTokensDefaultExpirySeconds": {
+			"name": "camel.sink.endpoint.oauth2CachedTokensDefaultExpirySeconds",
+			"description": "Default expiration time for cached OAuth2 tokens, in seconds. Used if token response does not contain 'expires_in' field.",
+			"defaultValue": "3600L",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.oauth2CachedTokensExpirationMarginSeconds": {
+			"name": "camel.sink.endpoint.oauth2CachedTokensExpirationMarginSeconds",
+			"description": "Amount of time which is deducted from OAuth2 tokens expiry time to compensate for the time it takes OAuth2 Token Endpoint to send the token over http, in seconds. Set this parameter to high value if you OAuth2 Token Endpoint answers slowly or you tokens expire quickly. If you set this parameter to too small value, you can get 4xx http errors because camel will think that the received token is still valid, while in reality the token is expired for the Authentication server.",
+			"defaultValue": "5L",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.oauth2CacheTokens": {
+			"name": "camel.sink.endpoint.oauth2CacheTokens",
+			"description": "Whether to cache OAuth2 client tokens.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.oauth2ClientId": {
 			"name": "camel.sink.endpoint.oauth2ClientId",
 			"description": "OAuth2 client id",
@@ -389,6 +423,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.logHttpActivity": {
+			"name": "camel.component.https.logHttpActivity",
+			"description": "To enable logging HTTP request and response. You can use a custom LoggingHttpActivityListener as httpActivityListener to control logging options.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.skipRequestHeaders": {
 			"name": "camel.component.https.skipRequestHeaders",
 			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
@@ -423,6 +464,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.httpActivityListener": {
+			"name": "camel.component.https.httpActivityListener",
+			"description": "To use a custom activity listener",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.responsePayloadStreamingThreshold": {
 			"name": "camel.component.https.responsePayloadStreamingThreshold",
 			"description": "This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode.",
@@ -430,6 +477,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.userAgent": {
+			"name": "camel.component.https.userAgent",
+			"description": "To set a custom HTTP User-Agent request header",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.allowJavaSerializedObject": {
 			"name": "camel.component.https.allowJavaSerializedObject",
 			"description": "Whether to allow java serialization when a request uses context-type=application\/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.",
@@ -543,6 +596,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.useSystemProperties": {
+			"name": "camel.component.https.useSystemProperties",
+			"description": "To use System Properties as fallback for configuration for configuring HTTP Client",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.headerFilterStrategy": {
 			"name": "camel.component.https.headerFilterStrategy",
 			"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.",
diff --git a/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkConnectorConfig.java b/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkConnectorConfig.java
index 458ef49681..a479128450 100644
--- a/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkConnectorConfig.java
+++ b/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkConnectorConfig.java
@@ -42,6 +42,9 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_HTTP_METHOD_CONF = "camel.sink.endpoint.httpMethod";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_HTTP_METHOD_DOC = "Configure the HTTP method to use. The HttpMethod header cannot override this option if set. One of: [GET] [POST] [PUT] [DELETE] [HEAD] [OPTIONS] [TRACE] [PATCH]";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_HTTP_METHOD_DEFAULT = null;
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_LOG_HTTP_ACTIVITY_CONF = "camel.sink.endpoint.logHttpActivity";
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_LOG_HTTP_ACTIVITY_DOC = "To enable logging HTTP request and response. You can use a custom LoggingHttpActivityListener as httpActivityListener to control logging options.";
+    public static final Boolean CAMEL_SINK_HTTPS_ENDPOINT_LOG_HTTP_ACTIVITY_DEFAULT = false;
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_SKIP_REQUEST_HEADERS_CONF = "camel.sink.endpoint.skipRequestHeaders";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_SKIP_REQUEST_HEADERS_DOC = "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
     public static final Boolean CAMEL_SINK_HTTPS_ENDPOINT_SKIP_REQUEST_HEADERS_DEFAULT = false;
@@ -75,6 +78,9 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_GET_WITH_BODY_CONF = "camel.sink.endpoint.getWithBody";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_GET_WITH_BODY_DOC = "Whether the HTTP GET should include the message body or not. By default HTTP GET do not include any HTTP body. However in some rare cases users may need to be able to include the message body.";
     public static final Boolean CAMEL_SINK_HTTPS_ENDPOINT_GET_WITH_BODY_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_HTTP_ACTIVITY_LISTENER_CONF = "camel.sink.endpoint.httpActivityListener";
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_HTTP_ACTIVITY_LISTENER_DOC = "To use a custom activity listener";
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_HTTP_ACTIVITY_LISTENER_DEFAULT = null;
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_IGNORE_RESPONSE_BODY_CONF = "camel.sink.endpoint.ignoreResponseBody";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_IGNORE_RESPONSE_BODY_DOC = "If this option is true, The http producer won't read response body and cache the input stream";
     public static final Boolean CAMEL_SINK_HTTPS_ENDPOINT_IGNORE_RESPONSE_BODY_DEFAULT = false;
@@ -118,7 +124,7 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_MAX_TOTAL_CONNECTIONS_DOC = "The maximum number of connections.";
     public static final Integer CAMEL_SINK_HTTPS_ENDPOINT_MAX_TOTAL_CONNECTIONS_DEFAULT = 200;
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_USE_SYSTEM_PROPERTIES_CONF = "camel.sink.endpoint.useSystemProperties";
-    public static final String CAMEL_SINK_HTTPS_ENDPOINT_USE_SYSTEM_PROPERTIES_DOC = "To use System Properties as fallback for configuration";
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_USE_SYSTEM_PROPERTIES_DOC = "To use System Properties as fallback for configuration for configuring HTTP Client";
     public static final Boolean CAMEL_SINK_HTTPS_ENDPOINT_USE_SYSTEM_PROPERTIES_DEFAULT = false;
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_PROXY_AUTH_DOMAIN_CONF = "camel.sink.endpoint.proxyAuthDomain";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_PROXY_AUTH_DOMAIN_DOC = "Proxy authentication domain to use with NTML";
@@ -171,6 +177,15 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_AUTH_USERNAME_CONF = "camel.sink.endpoint.authUsername";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_AUTH_USERNAME_DOC = "Authentication username";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_AUTH_USERNAME_DEFAULT = null;
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CACHED_TOKENS_DEFAULT_EXPIRY_SECONDS_CONF = "camel.sink.endpoint.oauth2CachedTokensDefaultExpirySeconds";
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CACHED_TOKENS_DEFAULT_EXPIRY_SECONDS_DOC = "Default expiration time for cached OAuth2 tokens, in seconds. Used if token response does not contain 'expires_in' field.";
+    public static final Long CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CACHED_TOKENS_DEFAULT_EXPIRY_SECONDS_DEFAULT = 3600L;
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CACHED_TOKENS_EXPIRATION_MARGIN_SECONDS_CONF = "camel.sink.endpoint.oauth2CachedTokensExpirationMarginSeconds";
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CACHED_TOKENS_EXPIRATION_MARGIN_SECONDS_DOC = "Amount of time which is deducted from OAuth2 tokens expiry time to compensate for the time it takes OAuth2 Token Endpoint to send the token over http, in seconds. Set this parameter to high value if you OAuth2 Token Endpoint answers slowly or you tokens expire quickly. If you set this parameter to too small value, you can get 4xx http errors because camel will think that the rec [...]
+    public static final Long CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CACHED_TOKENS_EXPIRATION_MARGIN_SECONDS_DEFAULT = 5L;
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CACHE_TOKENS_CONF = "camel.sink.endpoint.oauth2CacheTokens";
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CACHE_TOKENS_DOC = "Whether to cache OAuth2 client tokens.";
+    public static final Boolean CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CACHE_TOKENS_DEFAULT = false;
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CLIENT_ID_CONF = "camel.sink.endpoint.oauth2ClientId";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CLIENT_ID_DOC = "OAuth2 client id";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CLIENT_ID_DEFAULT = null;
@@ -192,6 +207,9 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTPS_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.https.lazyStartProducer";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that whe [...]
     public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_LOG_HTTP_ACTIVITY_CONF = "camel.component.https.logHttpActivity";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_LOG_HTTP_ACTIVITY_DOC = "To enable logging HTTP request and response. You can use a custom LoggingHttpActivityListener as httpActivityListener to control logging options.";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_LOG_HTTP_ACTIVITY_DEFAULT = false;
     public static final String CAMEL_SINK_HTTPS_COMPONENT_SKIP_REQUEST_HEADERS_CONF = "camel.component.https.skipRequestHeaders";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_SKIP_REQUEST_HEADERS_DOC = "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
     public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_SKIP_REQUEST_HEADERS_DEFAULT = false;
@@ -207,9 +225,15 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTPS_COMPONENT_FOLLOW_REDIRECTS_CONF = "camel.component.https.followRedirects";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_FOLLOW_REDIRECTS_DOC = "Whether to the HTTP request should follow redirects. By default the HTTP request does not follow redirects";
     public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_FOLLOW_REDIRECTS_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_HTTP_ACTIVITY_LISTENER_CONF = "camel.component.https.httpActivityListener";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_HTTP_ACTIVITY_LISTENER_DOC = "To use a custom activity listener";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_HTTP_ACTIVITY_LISTENER_DEFAULT = null;
     public static final String CAMEL_SINK_HTTPS_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_CONF = "camel.component.https.responsePayloadStreamingThreshold";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DOC = "This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode.";
     public static final Integer CAMEL_SINK_HTTPS_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DEFAULT = 8192;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_USER_AGENT_CONF = "camel.component.https.userAgent";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_USER_AGENT_DOC = "To set a custom HTTP User-Agent request header";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_USER_AGENT_DEFAULT = null;
     public static final String CAMEL_SINK_HTTPS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.https.allowJavaSerializedObject";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
@@ -261,6 +285,9 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTPS_COMPONENT_REDIRECT_HANDLING_DISABLED_CONF = "camel.component.https.redirectHandlingDisabled";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_REDIRECT_HANDLING_DISABLED_DOC = "Disables automatic redirect handling";
     public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_REDIRECT_HANDLING_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_USE_SYSTEM_PROPERTIES_CONF = "camel.component.https.useSystemProperties";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_USE_SYSTEM_PROPERTIES_DOC = "To use System Properties as fallback for configuration for configuring HTTP Client";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_USE_SYSTEM_PROPERTIES_DEFAULT = false;
     public static final String CAMEL_SINK_HTTPS_COMPONENT_HEADER_FILTER_STRATEGY_CONF = "camel.component.https.headerFilterStrategy";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_HEADER_FILTER_STRATEGY_DOC = "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT = null;
@@ -328,6 +355,7 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_BRIDGE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_BRIDGE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_BRIDGE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_CONNECTION_CLOSE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_CONNECTION_CLOSE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_CONNECTION_CLOSE_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_HTTP_METHOD_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_HTTP_METHOD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_HTTP_METHOD_DOC);
+        conf.define(CAMEL_SINK_HTTPS_ENDPOINT_LOG_HTTP_ACTIVITY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_LOG_HTTP_ACTIVITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_LOG_HTTP_ACTIVITY_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_SKIP_REQUEST_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_SKIP_REQUEST_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_SKIP_REQUEST_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_SKIP_RESPONSE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_SKIP_RESPONSE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_SKIP_RESPONSE_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_THROW_EXCEPTION_ON_FAILURE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_THROW_EXCEPTION_ON_FAILURE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_THROW_EXCEPTION_ON_FAILURE_DOC);
@@ -339,6 +367,7 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_DELETE_WITH_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_DELETE_WITH_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_DELETE_WITH_BODY_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_FOLLOW_REDIRECTS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_FOLLOW_REDIRECTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_FOLLOW_REDIRECTS_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_GET_WITH_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_GET_WITH_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_GET_WITH_BODY_DOC);
+        conf.define(CAMEL_SINK_HTTPS_ENDPOINT_HTTP_ACTIVITY_LISTENER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_HTTP_ACTIVITY_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_HTTP_ACTIVITY_LISTENER_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_IGNORE_RESPONSE_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_IGNORE_RESPONSE_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_IGNORE_RESPONSE_BODY_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_OK_STATUS_CODE_RANGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_OK_STATUS_CODE_RANGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_OK_STATUS_CODE_RANGE_DOC);
@@ -371,6 +400,9 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_AUTH_METHOD_PRIORITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_AUTH_METHOD_PRIORITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_AUTH_METHOD_PRIORITY_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_AUTH_PASSWORD_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_HTTPS_ENDPOINT_AUTH_PASSWORD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_AUTH_PASSWORD_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_AUTH_USERNAME_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_HTTPS_ENDPOINT_AUTH_USERNAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_AUTH_USERNAME_DOC);
+        conf.define(CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CACHED_TOKENS_DEFAULT_EXPIRY_SECONDS_CONF, ConfigDef.Type.LONG, CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CACHED_TOKENS_DEFAULT_EXPIRY_SECONDS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CACHED_TOKENS_DEFAULT_EXPIRY_SECONDS_DOC);
+        conf.define(CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CACHED_TOKENS_EXPIRATION_MARGIN_SECONDS_CONF, ConfigDef.Type.LONG, CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CACHED_TOKENS_EXPIRATION_MARGIN_SECONDS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CACHED_TOKENS_EXPIRATION_MARGIN_SECONDS_DOC);
+        conf.define(CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CACHE_TOKENS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CACHE_TOKENS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CACHE_TOKENS_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CLIENT_ID_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CLIENT_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CLIENT_ID_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CLIENT_SECRET_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CLIENT_SECRET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2CLIENT_SECRET_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_OAUTH_2SCOPE_DOC);
@@ -378,12 +410,15 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_SSL_CONTEXT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_X509HOSTNAME_VERIFIER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_X509HOSTNAME_VERIFIER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_X509HOSTNAME_VERIFIER_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_LOG_HTTP_ACTIVITY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_LOG_HTTP_ACTIVITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_LOG_HTTP_ACTIVITY_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_SKIP_REQUEST_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_SKIP_REQUEST_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_SKIP_REQUEST_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_SKIP_RESPONSE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_SKIP_RESPONSE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_SKIP_RESPONSE_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_COOKIE_STORE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_COOKIE_STORE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_COOKIE_STORE_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_COPY_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_COPY_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_COPY_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_FOLLOW_REDIRECTS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_FOLLOW_REDIRECTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_FOLLOW_REDIRECTS_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_HTTP_ACTIVITY_LISTENER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_HTTP_ACTIVITY_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_HTTP_ACTIVITY_LISTENER_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTPS_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_USER_AGENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_USER_AGENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_USER_AGENT_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_AUTH_CACHING_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_AUTH_CACHING_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_AUTH_CACHING_DISABLED_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_AUTOMATIC_RETRIES_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DOC);
@@ -401,6 +436,7 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_HTTP_CONTEXT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_HTTP_CONTEXT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_HTTP_CONTEXT_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_MAX_TOTAL_CONNECTIONS_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTPS_COMPONENT_MAX_TOTAL_CONNECTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_MAX_TOTAL_CONNECTIONS_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_REDIRECT_HANDLING_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_REDIRECT_HANDLING_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_REDIRECT_HANDLING_DISABLED_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_USE_SYSTEM_PROPERTIES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_USE_SYSTEM_PROPERTIES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_USE_SYSTEM_PROPERTIES_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_HEADER_FILTER_STRATEGY_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_PROXY_AUTH_DOMAIN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_PROXY_AUTH_DOMAIN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_PROXY_AUTH_DOMAIN_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_PROXY_AUTH_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_PROXY_AUTH_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_PROXY_AUTH_HOST_DOC);
diff --git a/connectors/camel-jms-apache-artemis-sink-kafka-connector/pom.xml b/connectors/camel-jms-apache-artemis-sink-kafka-connector/pom.xml
index 17ebfd2c52..83fcd8f7f6 100644
--- a/connectors/camel-jms-apache-artemis-sink-kafka-connector/pom.xml
+++ b/connectors/camel-jms-apache-artemis-sink-kafka-connector/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-jakarta-client-all</artifactId>
-      <version>2.37.0</version>
+      <version>2.39.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
diff --git a/connectors/camel-jms-apache-artemis-sink-kafka-connector/src/main/resources/kamelets/jms-apache-artemis-sink.kamelet.yaml b/connectors/camel-jms-apache-artemis-sink-kafka-connector/src/main/resources/kamelets/jms-apache-artemis-sink.kamelet.yaml
index 6c7b9c2149..f0814c4873 100644
--- a/connectors/camel-jms-apache-artemis-sink-kafka-connector/src/main/resources/kamelets/jms-apache-artemis-sink.kamelet.yaml
+++ b/connectors/camel-jms-apache-artemis-sink-kafka-connector/src/main/resources/kamelets/jms-apache-artemis-sink.kamelet.yaml
@@ -55,7 +55,7 @@ spec:
   dependencies:
   - "camel:jms"
   - "camel:kamelet"
-  - "mvn:org.apache.activemq:artemis-jakarta-client-all:2.37.0"
+  - "mvn:org.apache.activemq:artemis-jakarta-client-all:2.39.0"
   template:
     beans:
       - name: connectionFactoryBean
diff --git a/connectors/camel-jms-apache-artemis-source-kafka-connector/pom.xml b/connectors/camel-jms-apache-artemis-source-kafka-connector/pom.xml
index 5c332da3c4..b366d78b32 100644
--- a/connectors/camel-jms-apache-artemis-source-kafka-connector/pom.xml
+++ b/connectors/camel-jms-apache-artemis-source-kafka-connector/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-jakarta-client-all</artifactId>
-      <version>2.37.0</version>
+      <version>2.39.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
diff --git a/connectors/camel-jms-apache-artemis-source-kafka-connector/src/main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml b/connectors/camel-jms-apache-artemis-source-kafka-connector/src/main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml
index d16a218dca..01d8e18380 100644
--- a/connectors/camel-jms-apache-artemis-source-kafka-connector/src/main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml
+++ b/connectors/camel-jms-apache-artemis-source-kafka-connector/src/main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml
@@ -54,7 +54,7 @@ spec:
   dependencies:
   - "camel:jms"
   - "camel:kamelet"
-  - "mvn:org.apache.activemq:artemis-jakarta-client-all:2.37.0"
+  - "mvn:org.apache.activemq:artemis-jakarta-client-all:2.39.0"
   template:
     beans:
       - name: connectionFactoryBean
diff --git a/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/pom.xml b/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/pom.xml
index dfbc531159..ff839c5303 100644
--- a/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/pom.xml
+++ b/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/pom.xml
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-jakarta-client-all</artifactId>
-      <version>2.37.0</version>
+      <version>2.39.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
diff --git a/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/src/main/resources/kamelets/jms-pooled-apache-artemis-sink.kamelet.yaml b/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/src/main/resources/kamelets/jms-pooled-apache-artemis-sink.kamelet.yaml
index e30062bc8c..0f4bf23a19 100644
--- a/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/src/main/resources/kamelets/jms-pooled-apache-artemis-sink.kamelet.yaml
+++ b/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/src/main/resources/kamelets/jms-pooled-apache-artemis-sink.kamelet.yaml
@@ -86,7 +86,7 @@ spec:
   dependencies:
   - "camel:jms"
   - "camel:kamelet"
-  - "mvn:org.apache.activemq:artemis-jakarta-client-all:2.37.0"
+  - "mvn:org.apache.activemq:artemis-jakarta-client-all:2.39.0"
   - "mvn:org.messaginghub:pooled-jms:3.1.7"
   template:
     beans:
diff --git a/connectors/camel-jms-pooled-apache-artemis-source-kafka-connector/pom.xml b/connectors/camel-jms-pooled-apache-artemis-source-kafka-connector/pom.xml
index 96590f0ea9..99b0167d41 100644
--- a/connectors/camel-jms-pooled-apache-artemis-source-kafka-connector/pom.xml
+++ b/connectors/camel-jms-pooled-apache-artemis-source-kafka-connector/pom.xml
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-jakarta-client-all</artifactId>
-      <version>2.37.0</version>
+      <version>2.39.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
diff --git a/connectors/camel-jms-pooled-apache-artemis-source-kafka-connector/src/main/resources/kamelets/jms-pooled-apache-artemis-source.kamelet.yaml b/connectors/camel-jms-pooled-apache-artemis-source-kafka-connector/src/main/resources/kamelets/jms-pooled-apache-artemis-source.kamelet.yaml
index ef10b225c2..7c40daff6f 100644
--- a/connectors/camel-jms-pooled-apache-artemis-source-kafka-connector/src/main/resources/kamelets/jms-pooled-apache-artemis-source.kamelet.yaml
+++ b/connectors/camel-jms-pooled-apache-artemis-source-kafka-connector/src/main/resources/kamelets/jms-pooled-apache-artemis-source.kamelet.yaml
@@ -85,7 +85,7 @@ spec:
   dependencies:
   - "camel:jms"
   - "camel:kamelet"
-  - "mvn:org.apache.activemq:artemis-jakarta-client-all:2.37.0"
+  - "mvn:org.apache.activemq:artemis-jakarta-client-all:2.39.0"
   - "mvn:org.messaginghub:pooled-jms:3.1.7"
   template:
     beans:
diff --git a/connectors/camel-kafka-azure-schema-registry-sink-kafka-connector/pom.xml b/connectors/camel-kafka-azure-schema-registry-sink-kafka-connector/pom.xml
index 42674093e1..772c7b93c0 100644
--- a/connectors/camel-kafka-azure-schema-registry-sink-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-azure-schema-registry-sink-kafka-connector/pom.xml
@@ -49,19 +49,14 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kafkaconnector</groupId>
-      <artifactId>camel-kafka-connector</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-data-schemaregistry-apacheavro</artifactId>
-      <version>1.1.20</version>
+      <version>1.1.22</version>
     </dependency>
     <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-identity</artifactId>
-      <version>1.13.2</version>
+      <groupId>org.apache.camel.kafkaconnector</groupId>
+      <artifactId>camel-kafka-connector</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
@@ -76,6 +71,11 @@
       <artifactId>azure-schemaregistry-kafka-avro</artifactId>
       <version>1.1.1</version>
     </dependency>
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-identity</artifactId>
+      <version>1.14.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
diff --git a/connectors/camel-kafka-azure-schema-registry-sink-kafka-connector/src/main/resources/kamelets/kafka-azure-schema-registry-sink.kamelet.yaml b/connectors/camel-kafka-azure-schema-registry-sink-kafka-connector/src/main/resources/kamelets/kafka-azure-schema-registry-sink.kamelet.yaml
index fb22171888..79023dd9d3 100644
--- a/connectors/camel-kafka-azure-schema-registry-sink-kafka-connector/src/main/resources/kamelets/kafka-azure-schema-registry-sink.kamelet.yaml
+++ b/connectors/camel-kafka-azure-schema-registry-sink-kafka-connector/src/main/resources/kamelets/kafka-azure-schema-registry-sink.kamelet.yaml
@@ -95,8 +95,8 @@ spec:
     - "camel:kamelet"
     - "camel:azure-schema-registry"
     - "mvn:com.microsoft.azure:azure-schemaregistry-kafka-avro:1.1.1"
-    - "mvn:com.azure:azure-data-schemaregistry-apacheavro:1.1.20"
-    - "mvn:com.azure:azure-identity:1.13.2"
+    - "mvn:com.azure:azure-data-schemaregistry-apacheavro:1.1.22"
+    - "mvn:com.azure:azure-identity:1.14.0"
   template:
     beans:
       - name: defaultAzureCredential
diff --git a/connectors/camel-kafka-azure-schema-registry-source-kafka-connector/pom.xml b/connectors/camel-kafka-azure-schema-registry-source-kafka-connector/pom.xml
index 2ec815c667..adf46ba179 100644
--- a/connectors/camel-kafka-azure-schema-registry-source-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-azure-schema-registry-source-kafka-connector/pom.xml
@@ -49,19 +49,14 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kafkaconnector</groupId>
-      <artifactId>camel-kafka-connector</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-data-schemaregistry-apacheavro</artifactId>
-      <version>1.1.20</version>
+      <version>1.1.22</version>
     </dependency>
     <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-identity</artifactId>
-      <version>1.13.2</version>
+      <groupId>org.apache.camel.kafkaconnector</groupId>
+      <artifactId>camel-kafka-connector</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
@@ -76,6 +71,11 @@
       <artifactId>azure-schemaregistry-kafka-avro</artifactId>
       <version>1.1.1</version>
     </dependency>
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-identity</artifactId>
+      <version>1.14.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
diff --git a/connectors/camel-kafka-azure-schema-registry-source-kafka-connector/src/main/resources/kamelets/kafka-azure-schema-registry-source.kamelet.yaml b/connectors/camel-kafka-azure-schema-registry-source-kafka-connector/src/main/resources/kamelets/kafka-azure-schema-registry-source.kamelet.yaml
index 0193299f17..152f405f42 100644
--- a/connectors/camel-kafka-azure-schema-registry-source-kafka-connector/src/main/resources/kamelets/kafka-azure-schema-registry-source.kamelet.yaml
+++ b/connectors/camel-kafka-azure-schema-registry-source-kafka-connector/src/main/resources/kamelets/kafka-azure-schema-registry-source.kamelet.yaml
@@ -136,8 +136,8 @@ spec:
     - "camel:kamelet"
     - "camel:azure-schema-registry"
     - "mvn:com.microsoft.azure:azure-schemaregistry-kafka-avro:1.1.1"
-    - "mvn:com.azure:azure-data-schemaregistry-apacheavro:1.1.20"
-    - "mvn:com.azure:azure-identity:1.13.2"
+    - "mvn:com.azure:azure-data-schemaregistry-apacheavro:1.1.22"
+    - "mvn:com.azure:azure-identity:1.14.0"
   template:
     beans:
       - name: defaultAzureCredential
diff --git a/connectors/camel-kafka-batch-azure-schema-registry-source-kafka-connector/pom.xml b/connectors/camel-kafka-batch-azure-schema-registry-source-kafka-connector/pom.xml
index 7c84077295..8ef04a89b2 100644
--- a/connectors/camel-kafka-batch-azure-schema-registry-source-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-batch-azure-schema-registry-source-kafka-connector/pom.xml
@@ -49,19 +49,14 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kafkaconnector</groupId>
-      <artifactId>camel-kafka-connector</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-data-schemaregistry-apacheavro</artifactId>
-      <version>1.1.20</version>
+      <version>1.1.22</version>
     </dependency>
     <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-identity</artifactId>
-      <version>1.13.2</version>
+      <groupId>org.apache.camel.kafkaconnector</groupId>
+      <artifactId>camel-kafka-connector</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
@@ -76,6 +71,11 @@
       <artifactId>azure-schemaregistry-kafka-avro</artifactId>
       <version>1.1.1</version>
     </dependency>
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-identity</artifactId>
+      <version>1.14.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
diff --git a/connectors/camel-kafka-batch-azure-schema-registry-source-kafka-connector/src/main/resources/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml b/connectors/camel-kafka-batch-azure-schema-registry-source-kafka-connector/src/main/resources/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
index 2be04e6f39..bef54baea1 100644
--- a/connectors/camel-kafka-batch-azure-schema-registry-source-kafka-connector/src/main/resources/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
+++ b/connectors/camel-kafka-batch-azure-schema-registry-source-kafka-connector/src/main/resources/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
@@ -150,8 +150,8 @@ spec:
     - "camel:kamelet"
     - "camel:azure-schema-registry"
     - "mvn:com.microsoft.azure:azure-schemaregistry-kafka-avro:1.1.1"
-    - "mvn:com.azure:azure-data-schemaregistry-apacheavro:1.1.20"
-    - "mvn:com.azure:azure-identity:1.13.2"
+    - "mvn:com.azure:azure-data-schemaregistry-apacheavro:1.1.22"
+    - "mvn:com.azure:azure-identity:1.14.0"
   template:
     beans:
       - name: defaultAzureCredential
diff --git a/connectors/camel-kafka-ssl-source-kafka-connector/src/generated/resources/camel-kafka-ssl-source-source.json b/connectors/camel-kafka-ssl-source-kafka-connector/src/generated/resources/camel-kafka-ssl-source-source.json
index 46edf9ff0b..f94b5dbbf6 100644
--- a/connectors/camel-kafka-ssl-source-kafka-connector/src/generated/resources/camel-kafka-ssl-source-source.json
+++ b/connectors/camel-kafka-ssl-source-kafka-connector/src/generated/resources/camel-kafka-ssl-source-source.json
@@ -114,6 +114,12 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.kamelet.kafka-ssl-source.sslTruststorePassword": {
+			"name": "camel.kamelet.kafka-ssl-source.sslTruststorePassword",
+			"description": "The store password for the trust store file.",
+			"priority": "HIGH",
+			"required": "true"
+		},
 		"camel.kamelet.kafka-ssl-source.sslEnabledProtocols": {
 			"name": "camel.kamelet.kafka-ssl-source.sslEnabledProtocols",
 			"description": "The list of protocols enabled for SSL connections. TLSv1.2, TLSv1.1 and TLSv1 are enabled by default.",
diff --git a/connectors/camel-kafka-ssl-source-kafka-connector/src/main/docs/examples/CamelKafkasslsourceSourceConnector.properties b/connectors/camel-kafka-ssl-source-kafka-connector/src/main/docs/examples/CamelKafkasslsourceSourceConnector.properties
index eaebced101..33fbc3013e 100644
--- a/connectors/camel-kafka-ssl-source-kafka-connector/src/main/docs/examples/CamelKafkasslsourceSourceConnector.properties
+++ b/connectors/camel-kafka-ssl-source-kafka-connector/src/main/docs/examples/CamelKafkasslsourceSourceConnector.properties
@@ -34,5 +34,7 @@ camel.kamelet.kafka-ssl-source.bootstrapServers=
 camel.kamelet.kafka-ssl-source.sslKeyPassword=
 # The location of the trust store file.
 camel.kamelet.kafka-ssl-source.sslTruststoreLocation=
+# The store password for the trust store file.
+camel.kamelet.kafka-ssl-source.sslTruststorePassword=
 # Comma separated list of Kafka topic names
 camel.kamelet.kafka-ssl-source.topic=
diff --git a/connectors/camel-kafka-ssl-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafkasslsource/CamelKafkasslsourceSourceConnectorConfig.java b/connectors/camel-kafka-ssl-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafkasslsource/CamelKafkasslsourceSourceConnectorConfig.java
index a43c2f5b84..5972926a38 100644
--- a/connectors/camel-kafka-ssl-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafkasslsource/CamelKafkasslsourceSourceConnectorConfig.java
+++ b/connectors/camel-kafka-ssl-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafkasslsource/CamelKafkasslsourceSourceConnectorConfig.java
@@ -74,6 +74,9 @@ public class CamelKafkasslsourceSourceConnectorConfig
     public static final String CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_TRUSTSTORE_LOCATION_CONF = "camel.kamelet.kafka-ssl-source.sslTruststoreLocation";
     public static final String CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_TRUSTSTORE_LOCATION_DOC = "The location of the trust store file.";
     public static final String CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_TRUSTSTORE_LOCATION_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_TRUSTSTORE_PASSWORD_CONF = "camel.kamelet.kafka-ssl-source.sslTruststorePassword";
+    public static final String CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_TRUSTSTORE_PASSWORD_DOC = "The store password for the trust store file.";
+    public static final String CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_TRUSTSTORE_PASSWORD_DEFAULT = null;
     public static final String CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_ENABLED_PROTOCOLS_CONF = "camel.kamelet.kafka-ssl-source.sslEnabledProtocols";
     public static final String CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_ENABLED_PROTOCOLS_DOC = "The list of protocols enabled for SSL connections. TLSv1.2, TLSv1.1 and TLSv1 are enabled by default.";
     public static final String CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_ENABLED_PROTOCOLS_DEFAULT = "TLSv1.2,TLSv1.1,TLSv1";
@@ -113,6 +116,7 @@ public class CamelKafkasslsourceSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_KEYSTORE_LOCATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_KEYSTORE_LOCATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_KEYSTORE_LOCATION_DOC);
         conf.define(CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_TRUSTSTORE_LOCATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_TRUSTSTORE_LOCATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_TRUSTSTORE_LOCATION_DOC);
+        conf.define(CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_TRUSTSTORE_PASSWORD_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_TRUSTSTORE_PASSWORD_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_TRUSTSTORE_PASSWORD_DOC);
         conf.define(CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_ENABLED_PROTOCOLS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_ENABLED_PROTOCOLS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SSL_ENABLED_PROTOCOLS_DOC);
         conf.define(CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SASL_JAAS_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SASL_JAAS_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_SASL_JAAS_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_TOPIC_IS_PATTERN_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_TOPIC_IS_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKASSLSOURCE_KAMELET_TOPIC_IS_PATTERN_DOC);
diff --git a/connectors/camel-kafka-ssl-source-kafka-connector/src/main/resources/kamelets/kafka-ssl-source.kamelet.yaml b/connectors/camel-kafka-ssl-source-kafka-connector/src/main/resources/kamelets/kafka-ssl-source.kamelet.yaml
index 9a1d60a8bb..69edb3e225 100644
--- a/connectors/camel-kafka-ssl-source-kafka-connector/src/main/resources/kamelets/kafka-ssl-source.kamelet.yaml
+++ b/connectors/camel-kafka-ssl-source-kafka-connector/src/main/resources/kamelets/kafka-ssl-source.kamelet.yaml
@@ -36,6 +36,7 @@ spec:
       - topic
       - bootstrapServers
       - sslTruststoreLocation
+      - sslTruststorePassword
       - sslKeyPassword
     type: object
     properties:
@@ -133,6 +134,14 @@ spec:
         description: The location of the trust store file.
         title: SSL Truststore Location
         type: string
+      sslTruststorePassword:
+        description: The store password for the trust store file.
+        title: SSL Truststore Password
+        type: string
+        format: password
+        x-descriptors:
+          - urn:camel:group:credentials
+          - urn:keda:authentication:password
       sslEnabledProtocols:
         description:   The list of protocols enabled for SSL connections. TLSv1.2, TLSv1.1 and TLSv1 are enabled by default.
         title: SSL Enabled Protocols
@@ -163,6 +172,7 @@ spec:
           sslKeyPassword: '{{sslKeyPassword}}'
           sslKeystorePassword: '{{sslKeystorePassword}}'
           sslTruststoreLocation: '{{sslTruststoreLocation}}'
+          sslTruststorePassword: '{{sslTruststorePassword}}'
           sslProtocol: '{{sslProtocol}}'
           sslEnabledProtocols: '{{sslEnabledProtocols}}'
           sslEndpointAlgorithm: '{{sslEndpointAlgorithm}}'
diff --git a/connectors/camel-mariadb-sink-kafka-connector/pom.xml b/connectors/camel-mariadb-sink-kafka-connector/pom.xml
index 1b0a5407ae..6eb97b8404 100644
--- a/connectors/camel-mariadb-sink-kafka-connector/pom.xml
+++ b/connectors/camel-mariadb-sink-kafka-connector/pom.xml
@@ -45,6 +45,11 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.13.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
@@ -57,11 +62,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-yaml-dsl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-dbcp2</artifactId>
-      <version>2.12.0</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
diff --git a/connectors/camel-mariadb-sink-kafka-connector/src/main/resources/kamelets/mariadb-sink.kamelet.yaml b/connectors/camel-mariadb-sink-kafka-connector/src/main/resources/kamelets/mariadb-sink.kamelet.yaml
index 9a13c4403c..1264e1b233 100644
--- a/connectors/camel-mariadb-sink-kafka-connector/src/main/resources/kamelets/mariadb-sink.kamelet.yaml
+++ b/connectors/camel-mariadb-sink-kafka-connector/src/main/resources/kamelets/mariadb-sink.kamelet.yaml
@@ -91,9 +91,13 @@ spec:
   - "camel:jackson"
   - "camel:kamelet"
   - "camel:sql"
-  - "mvn:org.apache.commons:commons-dbcp2:2.12.0"
+  - "mvn:org.apache.commons:commons-dbcp2:2.13.0"
   template:
     beans:
+      - name: local-sql-mariadb-sink
+        type: "#class:org.apache.camel.component.sql.SqlComponent"
+        properties:
+          autowiredEnabled: "false"
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
         properties:
@@ -108,6 +112,6 @@ spec:
           json: 
             library: Jackson
       - to: 
-          uri: "sql:{{query}}"
+          uri: "{{local-sql-mariadb-sink}}:{{query}}"
           parameters:
             dataSource: "#bean:{{dsBean}}"
\ No newline at end of file
diff --git a/connectors/camel-mariadb-source-kafka-connector/pom.xml b/connectors/camel-mariadb-source-kafka-connector/pom.xml
index 04c6227f68..bb76781e3e 100644
--- a/connectors/camel-mariadb-source-kafka-connector/pom.xml
+++ b/connectors/camel-mariadb-source-kafka-connector/pom.xml
@@ -45,6 +45,11 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.13.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
@@ -57,11 +62,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-yaml-dsl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-dbcp2</artifactId>
-      <version>2.12.0</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
diff --git a/connectors/camel-mariadb-source-kafka-connector/src/main/resources/kamelets/mariadb-source.kamelet.yaml b/connectors/camel-mariadb-source-kafka-connector/src/main/resources/kamelets/mariadb-source.kamelet.yaml
index 9503dbe091..deb4ee3e7e 100644
--- a/connectors/camel-mariadb-source-kafka-connector/src/main/resources/kamelets/mariadb-source.kamelet.yaml
+++ b/connectors/camel-mariadb-source-kafka-connector/src/main/resources/kamelets/mariadb-source.kamelet.yaml
@@ -93,9 +93,13 @@ spec:
   - "camel:jackson"
   - "camel:kamelet"
   - "camel:sql"
-  - "mvn:org.apache.commons:commons-dbcp2:2.12.0"
+  - "mvn:org.apache.commons:commons-dbcp2:2.13.0"
   template:
     beans:
+      - name: local-sql-mariadb-source
+        type: "#class:org.apache.camel.component.sql.SqlComponent"
+        properties:
+          autowiredEnabled: "false"
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
         properties:
@@ -104,7 +108,7 @@ spec:
           url: 'jdbc:mariadb://{{serverName}}:{{serverPort}}/{{databaseName}}'
           driverClassName: 'org.mariadb.jdbc.Driver'
     from:
-      uri: "sql:{{query}}"
+      uri: "{{local-sql-mariadb-source}}:{{query}}"
       parameters:
         dataSource: "#bean:{{dsBean}}"
         onConsume: "{{?consumedQuery}}"
diff --git a/connectors/camel-mysql-sink-kafka-connector/pom.xml b/connectors/camel-mysql-sink-kafka-connector/pom.xml
index a933b9549e..ad6f9de588 100644
--- a/connectors/camel-mysql-sink-kafka-connector/pom.xml
+++ b/connectors/camel-mysql-sink-kafka-connector/pom.xml
@@ -45,6 +45,11 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.13.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
@@ -57,11 +62,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-yaml-dsl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-dbcp2</artifactId>
-      <version>2.12.0</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
diff --git a/connectors/camel-mysql-sink-kafka-connector/src/main/resources/kamelets/mysql-sink.kamelet.yaml b/connectors/camel-mysql-sink-kafka-connector/src/main/resources/kamelets/mysql-sink.kamelet.yaml
index f252f8646e..c8b57fcabe 100644
--- a/connectors/camel-mysql-sink-kafka-connector/src/main/resources/kamelets/mysql-sink.kamelet.yaml
+++ b/connectors/camel-mysql-sink-kafka-connector/src/main/resources/kamelets/mysql-sink.kamelet.yaml
@@ -91,9 +91,13 @@ spec:
   - "camel:jackson"
   - "camel:kamelet"
   - "camel:sql"
-  - "mvn:org.apache.commons:commons-dbcp2:2.12.0"
+  - "mvn:org.apache.commons:commons-dbcp2:2.13.0"
   template:
     beans:
+      - name: local-sql-mysql-sink
+        type: "#class:org.apache.camel.component.sql.SqlComponent"
+        properties:
+          autowiredEnabled: "false"
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
         properties:
@@ -108,6 +112,6 @@ spec:
           json: 
             library: Jackson
       - to: 
-          uri: "sql:{{query}}"
+          uri: "{{local-sql-mysql-sink}}:{{query}}"
           parameters:
             dataSource: "#bean:{{dsBean}}"
\ No newline at end of file
diff --git a/connectors/camel-mysql-source-kafka-connector/pom.xml b/connectors/camel-mysql-source-kafka-connector/pom.xml
index 9c71ca6b55..fdb5aef29c 100644
--- a/connectors/camel-mysql-source-kafka-connector/pom.xml
+++ b/connectors/camel-mysql-source-kafka-connector/pom.xml
@@ -45,6 +45,11 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.13.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
@@ -57,11 +62,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-yaml-dsl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-dbcp2</artifactId>
-      <version>2.12.0</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
diff --git a/connectors/camel-mysql-source-kafka-connector/src/main/resources/kamelets/mysql-source.kamelet.yaml b/connectors/camel-mysql-source-kafka-connector/src/main/resources/kamelets/mysql-source.kamelet.yaml
index d9d1a9e529..34591752d2 100644
--- a/connectors/camel-mysql-source-kafka-connector/src/main/resources/kamelets/mysql-source.kamelet.yaml
+++ b/connectors/camel-mysql-source-kafka-connector/src/main/resources/kamelets/mysql-source.kamelet.yaml
@@ -93,9 +93,13 @@ spec:
   - "camel:jackson"
   - "camel:kamelet"
   - "camel:sql"
-  - "mvn:org.apache.commons:commons-dbcp2:2.12.0"
+  - "mvn:org.apache.commons:commons-dbcp2:2.13.0"
   template:
     beans:
+      - name: local-sql-mysql-source
+        type: "#class:org.apache.camel.component.sql.SqlComponent"
+        properties:
+          autowiredEnabled: "false"
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
         properties:
@@ -104,7 +108,7 @@ spec:
           url: 'jdbc:mysql://{{serverName}}:{{serverPort}}/{{databaseName}}'
           driverClassName: 'com.mysql.cj.jdbc.Driver'
     from:
-      uri: "sql:{{query}}"
+      uri: "{{local-sql-mysql-source}}:{{query}}"
       parameters:
         dataSource: "#bean:{{dsBean}}"
         onConsume: "{{?consumedQuery}}"
diff --git a/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-sink.json b/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-sink.json
index 6b9d4aa0fd..846c3f851f 100644
--- a/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-sink.json
+++ b/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-sink.json
@@ -163,7 +163,7 @@
 		},
 		"camel.sink.endpoint.producerPoolMaxTotal": {
 			"name": "camel.sink.endpoint.producerPoolMaxTotal",
-			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.",
+			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit. Be careful to not set this value too low (such as 1) as the pool must have space to create a producer such as when performing retries. Be mindful that the option producerPoolBlockWhenExhausted is default true, and the pool will then block when there is no space, which can lead to the application  [...]
 			"defaultValue": "-1",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -509,7 +509,7 @@
 		},
 		"camel.component.netty-http.producerPoolMaxTotal": {
 			"name": "camel.component.netty-http.producerPoolMaxTotal",
-			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.",
+			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit. Be careful to not set this value too low (such as 1) as the pool must have space to create a producer such as when performing retries. Be mindful that the option producerPoolBlockWhenExhausted is default true, and the pool will then block when there is no space, which can lead to the application  [...]
 			"defaultValue": "-1",
 			"priority": "MEDIUM",
 			"required": "false"
diff --git a/connectors/camel-netty-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/nettyhttp/CamelNettyhttpSinkConnectorConfig.java b/connectors/camel-netty-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/nettyhttp/CamelNettyhttpSinkConnectorConfig.java
index 6bf5bd78bf..68664fb8d3 100644
--- a/connectors/camel-netty-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/nettyhttp/CamelNettyhttpSinkConnectorConfig.java
+++ b/connectors/camel-netty-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/nettyhttp/CamelNettyhttpSinkConnectorConfig.java
@@ -93,7 +93,7 @@ public class CamelNettyhttpSinkConnectorConfig
     public static final String CAMEL_SINK_NETTYHTTP_ENDPOINT_PRODUCER_POOL_MAX_IDLE_DOC = "Sets the cap on the number of idle instances in the pool.";
     public static final Integer CAMEL_SINK_NETTYHTTP_ENDPOINT_PRODUCER_POOL_MAX_IDLE_DEFAULT = 100;
     public static final String CAMEL_SINK_NETTYHTTP_ENDPOINT_PRODUCER_POOL_MAX_TOTAL_CONF = "camel.sink.endpoint.producerPoolMaxTotal";
-    public static final String CAMEL_SINK_NETTYHTTP_ENDPOINT_PRODUCER_POOL_MAX_TOTAL_DOC = "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.";
+    public static final String CAMEL_SINK_NETTYHTTP_ENDPOINT_PRODUCER_POOL_MAX_TOTAL_DOC = "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit. Be careful to not set this value too low (such as 1) as the pool must have space to create a producer such as when performing retries. Be mindful that the option producerPoolBlockWhenExhausted is default true, and the pool w [...]
     public static final Integer CAMEL_SINK_NETTYHTTP_ENDPOINT_PRODUCER_POOL_MAX_TOTAL_DEFAULT = -1;
     public static final String CAMEL_SINK_NETTYHTTP_ENDPOINT_PRODUCER_POOL_MAX_WAIT_CONF = "camel.sink.endpoint.producerPoolMaxWait";
     public static final String CAMEL_SINK_NETTYHTTP_ENDPOINT_PRODUCER_POOL_MAX_WAIT_DOC = "Sets the maximum duration (value in millis) the borrowObject() method should block before throwing an exception when the pool is exhausted and producerPoolBlockWhenExhausted is true. When less than 0, the borrowObject() method may block indefinitely.";
@@ -252,7 +252,7 @@ public class CamelNettyhttpSinkConnectorConfig
     public static final String CAMEL_SINK_NETTYHTTP_COMPONENT_PRODUCER_POOL_MAX_IDLE_DOC = "Sets the cap on the number of idle instances in the pool.";
     public static final Integer CAMEL_SINK_NETTYHTTP_COMPONENT_PRODUCER_POOL_MAX_IDLE_DEFAULT = 100;
     public static final String CAMEL_SINK_NETTYHTTP_COMPONENT_PRODUCER_POOL_MAX_TOTAL_CONF = "camel.component.netty-http.producerPoolMaxTotal";
-    public static final String CAMEL_SINK_NETTYHTTP_COMPONENT_PRODUCER_POOL_MAX_TOTAL_DOC = "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.";
+    public static final String CAMEL_SINK_NETTYHTTP_COMPONENT_PRODUCER_POOL_MAX_TOTAL_DOC = "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit. Be careful to not set this value too low (such as 1) as the pool must have space to create a producer such as when performing retries. Be mindful that the option producerPoolBlockWhenExhausted is default true, and the pool  [...]
     public static final Integer CAMEL_SINK_NETTYHTTP_COMPONENT_PRODUCER_POOL_MAX_TOTAL_DEFAULT = -1;
     public static final String CAMEL_SINK_NETTYHTTP_COMPONENT_PRODUCER_POOL_MAX_WAIT_CONF = "camel.component.netty-http.producerPoolMaxWait";
     public static final String CAMEL_SINK_NETTYHTTP_COMPONENT_PRODUCER_POOL_MAX_WAIT_DOC = "Sets the maximum duration (value in millis) the borrowObject() method should block before throwing an exception when the pool is exhausted and producerPoolBlockWhenExhausted is true. When less than 0, the borrowObject() method may block indefinitely.";
diff --git a/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-sink.json b/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-sink.json
index 3aa790d830..d9c86a0a61 100644
--- a/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-sink.json
+++ b/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-sink.json
@@ -135,7 +135,7 @@
 		},
 		"camel.sink.endpoint.producerPoolMaxTotal": {
 			"name": "camel.sink.endpoint.producerPoolMaxTotal",
-			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.",
+			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit. Be careful to not set this value too low (such as 1) as the pool must have space to create a producer such as when performing retries. Be mindful that the option producerPoolBlockWhenExhausted is default true, and the pool will then block when there is no space, which can lead to the application  [...]
 			"defaultValue": "-1",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -508,7 +508,7 @@
 		},
 		"camel.component.netty.producerPoolMaxTotal": {
 			"name": "camel.component.netty.producerPoolMaxTotal",
-			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.",
+			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit. Be careful to not set this value too low (such as 1) as the pool must have space to create a producer such as when performing retries. Be mindful that the option producerPoolBlockWhenExhausted is default true, and the pool will then block when there is no space, which can lead to the application  [...]
 			"defaultValue": "-1",
 			"priority": "MEDIUM",
 			"required": "false"
diff --git a/connectors/camel-netty-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/netty/CamelNettySinkConnectorConfig.java b/connectors/camel-netty-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/netty/CamelNettySinkConnectorConfig.java
index d85666eb82..9f6a301ca8 100644
--- a/connectors/camel-netty-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/netty/CamelNettySinkConnectorConfig.java
+++ b/connectors/camel-netty-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/netty/CamelNettySinkConnectorConfig.java
@@ -79,7 +79,7 @@ public class CamelNettySinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_NETTY_ENDPOINT_PRODUCER_POOL_MAX_IDLE_DOC = "Sets the cap on the number of idle instances in the pool.";
     public static final Integer CAMEL_SINK_NETTY_ENDPOINT_PRODUCER_POOL_MAX_IDLE_DEFAULT = 100;
     public static final String CAMEL_SINK_NETTY_ENDPOINT_PRODUCER_POOL_MAX_TOTAL_CONF = "camel.sink.endpoint.producerPoolMaxTotal";
-    public static final String CAMEL_SINK_NETTY_ENDPOINT_PRODUCER_POOL_MAX_TOTAL_DOC = "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.";
+    public static final String CAMEL_SINK_NETTY_ENDPOINT_PRODUCER_POOL_MAX_TOTAL_DOC = "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit. Be careful to not set this value too low (such as 1) as the pool must have space to create a producer such as when performing retries. Be mindful that the option producerPoolBlockWhenExhausted is default true, and the pool will  [...]
     public static final Integer CAMEL_SINK_NETTY_ENDPOINT_PRODUCER_POOL_MAX_TOTAL_DEFAULT = -1;
     public static final String CAMEL_SINK_NETTY_ENDPOINT_PRODUCER_POOL_MAX_WAIT_CONF = "camel.sink.endpoint.producerPoolMaxWait";
     public static final String CAMEL_SINK_NETTY_ENDPOINT_PRODUCER_POOL_MAX_WAIT_DOC = "Sets the maximum duration (value in millis) the borrowObject() method should block before throwing an exception when the pool is exhausted and producerPoolBlockWhenExhausted is true. When less than 0, the borrowObject() method may block indefinitely.";
@@ -247,7 +247,7 @@ public class CamelNettySinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_NETTY_COMPONENT_PRODUCER_POOL_MAX_IDLE_DOC = "Sets the cap on the number of idle instances in the pool.";
     public static final Integer CAMEL_SINK_NETTY_COMPONENT_PRODUCER_POOL_MAX_IDLE_DEFAULT = 100;
     public static final String CAMEL_SINK_NETTY_COMPONENT_PRODUCER_POOL_MAX_TOTAL_CONF = "camel.component.netty.producerPoolMaxTotal";
-    public static final String CAMEL_SINK_NETTY_COMPONENT_PRODUCER_POOL_MAX_TOTAL_DOC = "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.";
+    public static final String CAMEL_SINK_NETTY_COMPONENT_PRODUCER_POOL_MAX_TOTAL_DOC = "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit. Be careful to not set this value too low (such as 1) as the pool must have space to create a producer such as when performing retries. Be mindful that the option producerPoolBlockWhenExhausted is default true, and the pool will [...]
     public static final Integer CAMEL_SINK_NETTY_COMPONENT_PRODUCER_POOL_MAX_TOTAL_DEFAULT = -1;
     public static final String CAMEL_SINK_NETTY_COMPONENT_PRODUCER_POOL_MAX_WAIT_CONF = "camel.component.netty.producerPoolMaxWait";
     public static final String CAMEL_SINK_NETTY_COMPONENT_PRODUCER_POOL_MAX_WAIT_DOC = "Sets the maximum duration (value in millis) the borrowObject() method should block before throwing an exception when the pool is exhausted and producerPoolBlockWhenExhausted is true. When less than 0, the borrowObject() method may block indefinitely.";
diff --git a/connectors/camel-oracle-database-sink-kafka-connector/pom.xml b/connectors/camel-oracle-database-sink-kafka-connector/pom.xml
index 98f0658425..438235ec6f 100644
--- a/connectors/camel-oracle-database-sink-kafka-connector/pom.xml
+++ b/connectors/camel-oracle-database-sink-kafka-connector/pom.xml
@@ -45,6 +45,11 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.13.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
@@ -57,11 +62,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-yaml-dsl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-dbcp2</artifactId>
-      <version>2.12.0</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
diff --git a/connectors/camel-oracle-database-sink-kafka-connector/src/main/resources/kamelets/oracle-database-sink.kamelet.yaml b/connectors/camel-oracle-database-sink-kafka-connector/src/main/resources/kamelets/oracle-database-sink.kamelet.yaml
index 2f080881cb..17a44be04f 100644
--- a/connectors/camel-oracle-database-sink-kafka-connector/src/main/resources/kamelets/oracle-database-sink.kamelet.yaml
+++ b/connectors/camel-oracle-database-sink-kafka-connector/src/main/resources/kamelets/oracle-database-sink.kamelet.yaml
@@ -91,9 +91,13 @@ spec:
   - "camel:jackson"
   - "camel:kamelet"
   - "camel:sql"
-  - "mvn:org.apache.commons:commons-dbcp2:2.12.0"
+  - "mvn:org.apache.commons:commons-dbcp2:2.13.0"
   template:
     beans:
+      - name: local-sql-oracle-sink
+        type: "#class:org.apache.camel.component.sql.SqlComponent"
+        properties:
+          autowiredEnabled: "false"
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
         properties:
@@ -108,6 +112,6 @@ spec:
           json: 
             library: Jackson
       - to: 
-          uri: "sql:{{query}}"
+          uri: "{{local-sql-oracle-sink}}:{{query}}"
           parameters:
             dataSource: "#bean:{{dsBean}}"
\ No newline at end of file
diff --git a/connectors/camel-oracle-database-source-kafka-connector/pom.xml b/connectors/camel-oracle-database-source-kafka-connector/pom.xml
index 9836863528..3c263f6b61 100644
--- a/connectors/camel-oracle-database-source-kafka-connector/pom.xml
+++ b/connectors/camel-oracle-database-source-kafka-connector/pom.xml
@@ -45,6 +45,11 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.13.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
@@ -57,11 +62,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-yaml-dsl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-dbcp2</artifactId>
-      <version>2.12.0</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
diff --git a/connectors/camel-oracle-database-source-kafka-connector/src/main/resources/kamelets/oracle-database-source.kamelet.yaml b/connectors/camel-oracle-database-source-kafka-connector/src/main/resources/kamelets/oracle-database-source.kamelet.yaml
index 3473c88689..eee1d38adb 100644
--- a/connectors/camel-oracle-database-source-kafka-connector/src/main/resources/kamelets/oracle-database-source.kamelet.yaml
+++ b/connectors/camel-oracle-database-source-kafka-connector/src/main/resources/kamelets/oracle-database-source.kamelet.yaml
@@ -88,9 +88,13 @@ spec:
   - "camel:jackson"
   - "camel:kamelet"
   - "camel:sql"
-  - "mvn:org.apache.commons:commons-dbcp2:2.12.0"
+  - "mvn:org.apache.commons:commons-dbcp2:2.13.0"
   template:
     beans:
+      - name: local-sql-oracle-source
+        type: "#class:org.apache.camel.component.sql.SqlComponent"
+        properties:
+          autowiredEnabled: "false"
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
         properties:
@@ -99,7 +103,7 @@ spec:
           url: 'jdbc:oracle:thin:@{{serverName}}:{{serverPort}}/{{databaseName}}'
           driverClassName: 'oracle.jdbc.driver.OracleDriver'
     from:
-      uri: "sql:{{query}}"
+      uri: "{{local-sql-oracle-source}}:{{query}}"
       parameters:
         dataSource: "#bean:{{dsBean}}"
         onConsume: "{{?consumedQuery}}"
diff --git a/connectors/camel-postgresql-sink-kafka-connector/pom.xml b/connectors/camel-postgresql-sink-kafka-connector/pom.xml
index 3755a5717b..b08737c71a 100644
--- a/connectors/camel-postgresql-sink-kafka-connector/pom.xml
+++ b/connectors/camel-postgresql-sink-kafka-connector/pom.xml
@@ -45,10 +45,15 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.13.0</version>
+    </dependency>
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.7.4</version>
+      <version>42.7.5</version>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
@@ -62,11 +67,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-yaml-dsl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-dbcp2</artifactId>
-      <version>2.12.0</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
diff --git a/connectors/camel-postgresql-sink-kafka-connector/src/main/resources/kamelets/postgresql-sink.kamelet.yaml b/connectors/camel-postgresql-sink-kafka-connector/src/main/resources/kamelets/postgresql-sink.kamelet.yaml
index 37d5b59e30..175d8bb5b8 100644
--- a/connectors/camel-postgresql-sink-kafka-connector/src/main/resources/kamelets/postgresql-sink.kamelet.yaml
+++ b/connectors/camel-postgresql-sink-kafka-connector/src/main/resources/kamelets/postgresql-sink.kamelet.yaml
@@ -87,10 +87,14 @@ spec:
   - "camel:jackson"
   - "camel:kamelet"
   - "camel:sql"
-  - "mvn:org.postgresql:postgresql:42.7.4"
-  - "mvn:org.apache.commons:commons-dbcp2:2.12.0"
+  - "mvn:org.postgresql:postgresql:42.7.5"
+  - "mvn:org.apache.commons:commons-dbcp2:2.13.0"
   template:
     beans:
+      - name: local-sql-postgres-sink
+        type: "#class:org.apache.camel.component.sql.SqlComponent"
+        properties:
+          autowiredEnabled: "false"
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
         properties:
@@ -105,6 +109,6 @@ spec:
           json: 
             library: Jackson
       - to: 
-          uri: "sql:{{query}}"
+          uri: "{{local-sql-postgres-sink}}:{{query}}"
           parameters:
             dataSource: "#bean:{{dsBean}}"
\ No newline at end of file
diff --git a/connectors/camel-postgresql-source-kafka-connector/pom.xml b/connectors/camel-postgresql-source-kafka-connector/pom.xml
index 8dc35cb80c..9a71b59ada 100644
--- a/connectors/camel-postgresql-source-kafka-connector/pom.xml
+++ b/connectors/camel-postgresql-source-kafka-connector/pom.xml
@@ -45,10 +45,15 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.13.0</version>
+    </dependency>
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.7.4</version>
+      <version>42.7.5</version>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
@@ -62,11 +67,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-yaml-dsl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-dbcp2</artifactId>
-      <version>2.12.0</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
diff --git a/connectors/camel-postgresql-source-kafka-connector/src/main/resources/kamelets/postgresql-source.kamelet.yaml b/connectors/camel-postgresql-source-kafka-connector/src/main/resources/kamelets/postgresql-source.kamelet.yaml
index e45f6ce33d..d100ca096d 100644
--- a/connectors/camel-postgresql-source-kafka-connector/src/main/resources/kamelets/postgresql-source.kamelet.yaml
+++ b/connectors/camel-postgresql-source-kafka-connector/src/main/resources/kamelets/postgresql-source.kamelet.yaml
@@ -89,10 +89,14 @@ spec:
   - "camel:jackson"
   - "camel:kamelet"
   - "camel:sql"
-  - "mvn:org.postgresql:postgresql:42.7.4"
-  - "mvn:org.apache.commons:commons-dbcp2:2.12.0"
+  - "mvn:org.postgresql:postgresql:42.7.5"
+  - "mvn:org.apache.commons:commons-dbcp2:2.13.0"
   template:
     beans:
+      - name: local-sql-postgres-source
+        type: "#class:org.apache.camel.component.sql.SqlComponent"
+        properties:
+          autowiredEnabled: "false"
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
         properties:
@@ -101,7 +105,7 @@ spec:
           url: 'jdbc:postgresql://{{serverName}}:{{serverPort}}/{{databaseName}}'
           driverClassName: 'org.postgresql.Driver'
     from:
-      uri: "sql:{{query}}"
+      uri: "{{local-sql-postgres-source}}:{{query}}"
       parameters:
         dataSource: "#bean:{{dsBean}}"
         onConsume: "{{?consumedQuery}}"
diff --git a/connectors/camel-snowflake-sink-kafka-connector/pom.xml b/connectors/camel-snowflake-sink-kafka-connector/pom.xml
index aac5910957..61802ac818 100644
--- a/connectors/camel-snowflake-sink-kafka-connector/pom.xml
+++ b/connectors/camel-snowflake-sink-kafka-connector/pom.xml
@@ -45,6 +45,11 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.13.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
@@ -62,11 +67,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-yaml-dsl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-dbcp2</artifactId>
-      <version>2.12.0</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
diff --git a/connectors/camel-snowflake-sink-kafka-connector/src/main/resources/kamelets/snowflake-sink.kamelet.yaml b/connectors/camel-snowflake-sink-kafka-connector/src/main/resources/kamelets/snowflake-sink.kamelet.yaml
index acfb774123..0c799affc7 100644
--- a/connectors/camel-snowflake-sink-kafka-connector/src/main/resources/kamelets/snowflake-sink.kamelet.yaml
+++ b/connectors/camel-snowflake-sink-kafka-connector/src/main/resources/kamelets/snowflake-sink.kamelet.yaml
@@ -82,9 +82,13 @@ spec:
   - "camel:kamelet"
   - "camel:sql"
   - "mvn:net.snowflake:snowflake-jdbc:3.19.0"
-  - "mvn:org.apache.commons:commons-dbcp2:2.12.0"
+  - "mvn:org.apache.commons:commons-dbcp2:2.13.0"
   template:
     beans:
+      - name: local-sql-snowflake-sink
+        type: "#class:org.apache.camel.component.sql.SqlComponent"
+        properties:
+          autowiredEnabled: "false"
       - name: dsBean
         type: "#class:net.snowflake.client.jdbc.SnowflakeBasicDataSource"
         properties:
@@ -99,6 +103,6 @@ spec:
           json: 
             library: Jackson
       - to: 
-          uri: "sql:{{query}}"
+          uri: "{{local-sql-snowflake-sink}}:{{query}}"
           parameters:
             dataSource: "#bean:{{dsBean}}"
\ No newline at end of file
diff --git a/connectors/camel-snowflake-source-kafka-connector/pom.xml b/connectors/camel-snowflake-source-kafka-connector/pom.xml
index 4a3cbdd493..00811499f0 100644
--- a/connectors/camel-snowflake-source-kafka-connector/pom.xml
+++ b/connectors/camel-snowflake-source-kafka-connector/pom.xml
@@ -45,6 +45,11 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.13.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
@@ -62,11 +67,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-yaml-dsl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-dbcp2</artifactId>
-      <version>2.12.0</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
diff --git a/connectors/camel-snowflake-source-kafka-connector/src/main/resources/kamelets/snowflake-source.kamelet.yaml b/connectors/camel-snowflake-source-kafka-connector/src/main/resources/kamelets/snowflake-source.kamelet.yaml
index 3be6bac89d..936f95f6f4 100644
--- a/connectors/camel-snowflake-source-kafka-connector/src/main/resources/kamelets/snowflake-source.kamelet.yaml
+++ b/connectors/camel-snowflake-source-kafka-connector/src/main/resources/kamelets/snowflake-source.kamelet.yaml
@@ -84,9 +84,13 @@ spec:
   - "camel:kamelet"
   - "camel:sql"
   - "mvn:net.snowflake:snowflake-jdbc:3.19.0"
-  - "mvn:org.apache.commons:commons-dbcp2:2.12.0"
+  - "mvn:org.apache.commons:commons-dbcp2:2.13.0"
   template:
     beans:
+      - name: local-sql-snowflake-source
+        type: "#class:org.apache.camel.component.sql.SqlComponent"
+        properties:
+          autowiredEnabled: "false"
       - name: dsBean
         type: "#class:net.snowflake.client.jdbc.SnowflakeBasicDataSource"
         properties:
@@ -95,7 +99,7 @@ spec:
           url: 'jdbc:snowflake://{{instanceUrl}}'
           databaseName: '{{?databaseName}}'
     from:
-      uri: "sql:{{query}}"
+      uri: "{{local-sql-snowflake-source}}:{{query}}"
       parameters:
         dataSource: "#bean:{{dsBean}}"
         onConsume: "{{?consumedQuery}}"
diff --git a/connectors/camel-splunk-hec-sink-kafka-connector/src/main/resources/kamelets/splunk-hec-sink.kamelet.yaml b/connectors/camel-splunk-hec-sink-kafka-connector/src/main/resources/kamelets/splunk-hec-sink.kamelet.yaml
index 040b6df3cf..56aff4b165 100644
--- a/connectors/camel-splunk-hec-sink-kafka-connector/src/main/resources/kamelets/splunk-hec-sink.kamelet.yaml
+++ b/connectors/camel-splunk-hec-sink-kafka-connector/src/main/resources/kamelets/splunk-hec-sink.kamelet.yaml
@@ -102,9 +102,10 @@ spec:
       uri: "kamelet:source"
       steps:
       - to:
-          uri: "splunk-hec:{{splunkUrl}}/{{token}}"
+          uri: "splunk-hec:{{splunkUrl}}"
           parameters:
             host: "{{?hostPayload}}"
+            token: "{{token}}"
             bodyOnly: "{{?bodyOnly}}"
             headersOnly: "{{?headersOnly}}"
             index: "{{?index}}"
diff --git a/connectors/camel-sqlserver-sink-kafka-connector/pom.xml b/connectors/camel-sqlserver-sink-kafka-connector/pom.xml
index cf3f1dfdf4..f88455d576 100644
--- a/connectors/camel-sqlserver-sink-kafka-connector/pom.xml
+++ b/connectors/camel-sqlserver-sink-kafka-connector/pom.xml
@@ -45,6 +45,11 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.13.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
@@ -57,11 +62,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-yaml-dsl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-dbcp2</artifactId>
-      <version>2.12.0</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
diff --git a/connectors/camel-sqlserver-sink-kafka-connector/src/main/resources/kamelets/sqlserver-sink.kamelet.yaml b/connectors/camel-sqlserver-sink-kafka-connector/src/main/resources/kamelets/sqlserver-sink.kamelet.yaml
index 9a2c665354..954cce2290 100644
--- a/connectors/camel-sqlserver-sink-kafka-connector/src/main/resources/kamelets/sqlserver-sink.kamelet.yaml
+++ b/connectors/camel-sqlserver-sink-kafka-connector/src/main/resources/kamelets/sqlserver-sink.kamelet.yaml
@@ -101,9 +101,13 @@ spec:
   - "camel:jackson"
   - "camel:kamelet"
   - "camel:sql"
-  - "mvn:org.apache.commons:commons-dbcp2:2.12.0"
+  - "mvn:org.apache.commons:commons-dbcp2:2.13.0"
   template:
     beans:
+      - name: local-sqlserver-sink
+        type: "#class:org.apache.camel.component.sql.SqlComponent"
+        properties:
+          autowiredEnabled: "false"
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
         properties:
@@ -118,6 +122,6 @@ spec:
           json:
             library: Jackson
       - to:
-          uri: "sql:{{query}}"
+          uri: "{{local-sqlserver-sink}}:{{query}}"
           parameters:
             dataSource: "#bean:{{dsBean}}"
\ No newline at end of file
diff --git a/connectors/camel-sqlserver-source-kafka-connector/pom.xml b/connectors/camel-sqlserver-source-kafka-connector/pom.xml
index 1768dc4001..fc792ed3fa 100644
--- a/connectors/camel-sqlserver-source-kafka-connector/pom.xml
+++ b/connectors/camel-sqlserver-source-kafka-connector/pom.xml
@@ -45,6 +45,11 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.13.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
@@ -57,11 +62,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-yaml-dsl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-dbcp2</artifactId>
-      <version>2.12.0</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
diff --git a/connectors/camel-sqlserver-source-kafka-connector/src/main/resources/kamelets/sqlserver-source.kamelet.yaml b/connectors/camel-sqlserver-source-kafka-connector/src/main/resources/kamelets/sqlserver-source.kamelet.yaml
index dcdae55054..5620f51f92 100644
--- a/connectors/camel-sqlserver-source-kafka-connector/src/main/resources/kamelets/sqlserver-source.kamelet.yaml
+++ b/connectors/camel-sqlserver-source-kafka-connector/src/main/resources/kamelets/sqlserver-source.kamelet.yaml
@@ -103,9 +103,13 @@ spec:
   - "camel:jackson"
   - "camel:kamelet"
   - "camel:sql"
-  - "mvn:org.apache.commons:commons-dbcp2:2.12.0"
+  - "mvn:org.apache.commons:commons-dbcp2:2.13.0"
   template:
     beans:
+      - name: local-sqlserver-source
+        type: "#class:org.apache.camel.component.sql.SqlComponent"
+        properties:
+          autowiredEnabled: "false"
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
         properties:
@@ -114,7 +118,7 @@ spec:
           url: 'jdbc:sqlserver://{{serverName}}:{{serverPort}};databaseName={{databaseName}};encrypt={{encrypt}};trustServerCertificate={{trustServerCertificate}};'
           driverClassName: 'com.microsoft.sqlserver.jdbc.SQLServerDriver'
     from:
-      uri: "sql:{{query}}"
+      uri: "{{local-sqlserver-source}}:{{query}}"
       parameters:
         dataSource: "#bean:{{dsBean}}"
         onConsume: "{{?consumedQuery}}"
diff --git a/tests/itests-aws-v2/pom.xml b/tests/itests-aws-v2/pom.xml
index 3173c50b99..5222afb808 100644
--- a/tests/itests-aws-v2/pom.xml
+++ b/tests/itests-aws-v2/pom.xml
@@ -104,9 +104,8 @@
         </dependency>
 
         <dependency>
-            <groupId> org.apache.camel.kamelets</groupId>
-            <artifactId>camel-kamelets-utils</artifactId>
-            <version>${camel.kamelet.catalog.version}</version>
+            <groupId> org.apache.camel</groupId>
+            <artifactId>camel-kamelet</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSCloudWatchLocalContainerServiceWithTimeout.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSCloudWatchLocalContainerServiceWithTimeout.java
index 6ef9c1a8e5..74ba8538cb 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSCloudWatchLocalContainerServiceWithTimeout.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSCloudWatchLocalContainerServiceWithTimeout.java
@@ -16,7 +16,9 @@
  */
 package org.apache.camel.test.infra.aws2.services;
 
-public class AWSCloudWatchLocalContainerServiceWithTimeout extends AWSLocalContainerService {
+import org.apache.camel.test.infra.aws.common.services.AWSService;
+
+public class AWSCloudWatchLocalContainerServiceWithTimeout extends AWSLocalContainerInfraService implements AWSService {
     public AWSCloudWatchLocalContainerServiceWithTimeout() {
         super(new AWSContainerWithTimeout(System.getProperty("aws.container", "localstack/localstack:3.0.2"), new Service[]{Service.CLOUD_WATCH}));
     }
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSDynamodbLocalContainerServiceWithTimeout.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSDynamodbLocalContainerServiceWithTimeout.java
index f04091dc90..6be1873555 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSDynamodbLocalContainerServiceWithTimeout.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSDynamodbLocalContainerServiceWithTimeout.java
@@ -16,7 +16,9 @@
  */
 package org.apache.camel.test.infra.aws2.services;
 
-public class AWSDynamodbLocalContainerServiceWithTimeout extends AWSLocalContainerService {
+import org.apache.camel.test.infra.aws.common.services.AWSService;
+
+public class AWSDynamodbLocalContainerServiceWithTimeout extends AWSLocalContainerInfraService implements AWSService {
     public AWSDynamodbLocalContainerServiceWithTimeout() {
         super(new AWSContainerWithTimeout(System.getProperty("aws.container", "localstack/localstack:3.0.2"), new Service[]{Service.DYNAMODB}));
     }
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSEC2LocalContainerServiceWithTimeout.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSEC2LocalContainerServiceWithTimeout.java
index 653eb49dd2..6ae10560c2 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSEC2LocalContainerServiceWithTimeout.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSEC2LocalContainerServiceWithTimeout.java
@@ -16,7 +16,9 @@
  */
 package org.apache.camel.test.infra.aws2.services;
 
-public class AWSEC2LocalContainerServiceWithTimeout extends AWSLocalContainerService {
+import org.apache.camel.test.infra.aws.common.services.AWSService;
+
+public class AWSEC2LocalContainerServiceWithTimeout extends AWSLocalContainerInfraService implements AWSService {
     public AWSEC2LocalContainerServiceWithTimeout() {
         super(new AWSContainerWithTimeout(System.getProperty("aws.container", "localstack/localstack:3.0.2"), new Service[]{Service.EC2}));
     }
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSEventBridgeLocalContainerServiceWithTimeout.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSEventBridgeLocalContainerServiceWithTimeout.java
index 69b26b2b43..3e7302187b 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSEventBridgeLocalContainerServiceWithTimeout.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSEventBridgeLocalContainerServiceWithTimeout.java
@@ -16,7 +16,9 @@
  */
 package org.apache.camel.test.infra.aws2.services;
 
-public class AWSEventBridgeLocalContainerServiceWithTimeout extends AWSLocalContainerService {
+import org.apache.camel.test.infra.aws.common.services.AWSService;
+
+public class AWSEventBridgeLocalContainerServiceWithTimeout extends AWSLocalContainerInfraService implements AWSService {
     public AWSEventBridgeLocalContainerServiceWithTimeout() {
         super(new AWSContainerWithTimeout(System.getProperty("aws.container", "localstack/localstack:3.0.2"), new Service[]{Service.EVENT_BRIDGE}));
     }
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSIAMLocalContainerServiceWithTimeout.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSIAMLocalContainerServiceWithTimeout.java
index ab221064fd..b9784187d1 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSIAMLocalContainerServiceWithTimeout.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSIAMLocalContainerServiceWithTimeout.java
@@ -16,7 +16,9 @@
  */
 package org.apache.camel.test.infra.aws2.services;
 
-public class AWSIAMLocalContainerServiceWithTimeout extends AWSLocalContainerService {
+import org.apache.camel.test.infra.aws.common.services.AWSService;
+
+public class AWSIAMLocalContainerServiceWithTimeout extends AWSLocalContainerInfraService implements AWSService {
     public AWSIAMLocalContainerServiceWithTimeout() {
         super(new AWSContainerWithTimeout(System.getProperty("aws.container", "localstack/localstack:3.0.2"), new Service[]{Service.IAM}));
     }
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSKMSLocalContainerServiceWithTimeout.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSKMSLocalContainerServiceWithTimeout.java
index cf12767c26..de8185ed43 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSKMSLocalContainerServiceWithTimeout.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSKMSLocalContainerServiceWithTimeout.java
@@ -16,7 +16,9 @@
  */
 package org.apache.camel.test.infra.aws2.services;
 
-public class AWSKMSLocalContainerServiceWithTimeout extends AWSLocalContainerService {
+import org.apache.camel.test.infra.aws.common.services.AWSService;
+
+public class AWSKMSLocalContainerServiceWithTimeout extends AWSLocalContainerInfraService implements AWSService {
     public AWSKMSLocalContainerServiceWithTimeout() {
         super(new AWSContainerWithTimeout(System.getProperty("aws.container", "localstack/localstack:3.0.2"), new Service[]{Service.KMS}));
     }
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSKinesisLocalContainerServiceWithTimeout.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSKinesisLocalContainerServiceWithTimeout.java
index 994087a9f1..acdd5ca95c 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSKinesisLocalContainerServiceWithTimeout.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSKinesisLocalContainerServiceWithTimeout.java
@@ -16,12 +16,13 @@
  */
 package org.apache.camel.test.infra.aws2.services;
 
+import org.apache.camel.test.infra.aws.common.services.AWSService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.core.SdkSystemSetting;
 
-public class AWSKinesisLocalContainerServiceWithTimeout extends AWSLocalContainerService {
-    private static final Logger LOG = LoggerFactory.getLogger(AWSKinesisLocalContainerService.class);
+public class AWSKinesisLocalContainerServiceWithTimeout extends AWSLocalContainerInfraService implements AWSService {
+    private static final Logger LOG = LoggerFactory.getLogger(AWSKinesisLocalContainerInfraService.class);
 
     public AWSKinesisLocalContainerServiceWithTimeout() {
         super(new AWSContainerWithTimeout(System.getProperty("aws.container", "localstack/localstack:3.0.2"), new Service[]{Service.KINESIS}));
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSLambdaLocalContainerServiceWithTimeout.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSLambdaLocalContainerServiceWithTimeout.java
index a205118842..bfcb1a7765 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSLambdaLocalContainerServiceWithTimeout.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSLambdaLocalContainerServiceWithTimeout.java
@@ -16,7 +16,9 @@
  */
 package org.apache.camel.test.infra.aws2.services;
 
-public class AWSLambdaLocalContainerServiceWithTimeout extends AWSLocalContainerService {
+import org.apache.camel.test.infra.aws.common.services.AWSService;
+
+public class AWSLambdaLocalContainerServiceWithTimeout extends AWSLocalContainerInfraService implements AWSService {
     public AWSLambdaLocalContainerServiceWithTimeout() {
         super(new AWSContainerWithTimeout(System.getProperty("aws.container", "localstack/localstack:1.4.0"), new Service[]{Service.LAMBDA}));
     }
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSS3LocalContainerServiceWithTimeout.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSS3LocalContainerServiceWithTimeout.java
index 6d08784990..fca520fe83 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSS3LocalContainerServiceWithTimeout.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSS3LocalContainerServiceWithTimeout.java
@@ -16,7 +16,9 @@
  */
 package org.apache.camel.test.infra.aws2.services;
 
-public class AWSS3LocalContainerServiceWithTimeout extends AWSLocalContainerService {
+import org.apache.camel.test.infra.aws.common.services.AWSService;
+
+public class AWSS3LocalContainerServiceWithTimeout extends AWSLocalContainerInfraService implements AWSService {
     public AWSS3LocalContainerServiceWithTimeout() {
         super(new AWSContainerWithTimeout(System.getProperty("aws.container", "localstack/localstack:3.0.2"), new Service[]{Service.S3}));
     }
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSNSLocalContainerServiceWithTimeout.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSNSLocalContainerServiceWithTimeout.java
index c46440e80d..d0c423e2ee 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSNSLocalContainerServiceWithTimeout.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSNSLocalContainerServiceWithTimeout.java
@@ -16,7 +16,9 @@
  */
 package org.apache.camel.test.infra.aws2.services;
 
-public class AWSSNSLocalContainerServiceWithTimeout extends AWSLocalContainerService {
+import org.apache.camel.test.infra.aws.common.services.AWSService;
+
+public class AWSSNSLocalContainerServiceWithTimeout extends AWSLocalContainerInfraService implements AWSService {
     public AWSSNSLocalContainerServiceWithTimeout() {
         super(new AWSContainerWithTimeout(System.getProperty("aws.container", "localstack/localstack:3.0.2"), new Service[]{Service.SNS}));
     }
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerServiceWithTimeout.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerServiceWithTimeout.java
index 8f71a75820..0cfe8bf066 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerServiceWithTimeout.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerServiceWithTimeout.java
@@ -16,7 +16,9 @@
  */
 package org.apache.camel.test.infra.aws2.services;
 
-public class AWSSQSLocalContainerServiceWithTimeout extends AWSLocalContainerService {
+import org.apache.camel.test.infra.aws.common.services.AWSService;
+
+public class AWSSQSLocalContainerServiceWithTimeout extends AWSLocalContainerInfraService implements AWSService {
     public AWSSQSLocalContainerServiceWithTimeout() {
         super(new AWSContainerWithTimeout(System.getProperty("aws.container", "localstack/localstack:3.0.2"), new Service[]{Service.SQS}));
     }
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSTSLocalContainerServiceWithTimeout.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSTSLocalContainerServiceWithTimeout.java
index 0d27ce46e8..545d999149 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSTSLocalContainerServiceWithTimeout.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSTSLocalContainerServiceWithTimeout.java
@@ -16,7 +16,9 @@
  */
 package org.apache.camel.test.infra.aws2.services;
 
-public class AWSSTSLocalContainerServiceWithTimeout extends AWSLocalContainerService {
+import org.apache.camel.test.infra.aws.common.services.AWSService;
+
+public class AWSSTSLocalContainerServiceWithTimeout extends AWSLocalContainerInfraService implements AWSService {
     public AWSSTSLocalContainerServiceWithTimeout() {
         super(new AWSContainerWithTimeout(System.getProperty("aws.container", "localstack/localstack:3.0.2"), new Service[]{Service.STS}));
     }
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactoryWithTimeout.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactoryWithTimeout.java
index fcd4e378bf..9cbd1d46d8 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactoryWithTimeout.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactoryWithTimeout.java
@@ -18,6 +18,7 @@ package org.apache.camel.test.infra.aws2.services;
 
 import java.util.function.Supplier;
 
+import org.apache.camel.test.infra.aws.common.services.AWSInfraService;
 import org.apache.camel.test.infra.aws.common.services.AWSService;
 import org.apache.camel.test.infra.common.services.SimpleTestServiceBuilder;
 
@@ -26,16 +27,16 @@ public final class AWSServiceFactoryWithTimeout {
     private AWSServiceFactoryWithTimeout() {
     }
 
-    public static <T extends AWSService> SimpleTestServiceBuilder<T> builder() {
+    public static <T extends AWSInfraService> SimpleTestServiceBuilder<T> builder() {
         return new SimpleTestServiceBuilder("aws");
     }
 
-    private static AWSService createService(Supplier<AWSService> supplier) {
-        return (AWSService)builder().addRemoteMapping(AWSRemoteService::new).addLocalMapping(supplier).withPropertyNameFormat("%s-service.instance.type").build();
+    private static AWSService createService(Supplier<AWSInfraService> supplier) {
+        return (AWSService)builder().addRemoteMapping(AWSRemoteInfraService::new).addLocalMapping(supplier).withPropertyNameFormat("%s-service.instance.type").build();
     }
 
     public static AWSService createKinesisService() {
-        return (AWSService)builder().addRemoteMapping(AWSRemoteService::new).addLocalMapping(AWSKinesisLocalContainerServiceWithTimeout::new).withPropertyNameFormat("%s-service.kinesis.instance.type").build();
+        return (AWSService)builder().addRemoteMapping(AWSRemoteInfraService::new).addLocalMapping(AWSKinesisLocalContainerServiceWithTimeout::new).withPropertyNameFormat("%s-service.kinesis.instance.type").build();
     }
 
     public static AWSService createSQSService() {
diff --git a/tests/itests-azure-storage-queue/pom.xml b/tests/itests-azure-storage-queue/pom.xml
index 90ce959d27..70ad0dddfd 100644
--- a/tests/itests-azure-storage-queue/pom.xml
+++ b/tests/itests-azure-storage-queue/pom.xml
@@ -61,9 +61,8 @@
         </dependency>
 
         <dependency>
-            <groupId> org.apache.camel.kamelets</groupId>
-            <artifactId>camel-kamelets-utils</artifactId>
-            <version>${camel.kamelet.catalog.version}</version>
+            <groupId> org.apache.camel</groupId>
+            <artifactId>camel-kamelet</artifactId>
         </dependency>
 
         <!-- test infra -->
diff --git a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/AbstractKafkaTest.java b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/AbstractKafkaTest.java
index 8b0b1558fa..b492e88dd3 100644
--- a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/AbstractKafkaTest.java
+++ b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/AbstractKafkaTest.java
@@ -22,11 +22,11 @@ import org.apache.camel.kafkaconnector.common.services.kafkaconnect.KafkaConnect
 import org.apache.camel.kafkaconnector.common.services.kafkaconnect.KafkaConnectService;
 import org.apache.camel.kafkaconnector.common.utils.PropertyUtils;
 import org.apache.camel.test.infra.common.TestUtils;
-import org.apache.camel.test.infra.kafka.services.ContainerLocalKafkaService;
 import org.apache.camel.test.infra.kafka.services.KafkaService;
 import org.apache.camel.test.infra.kafka.services.KafkaServiceFactory;
-import org.apache.camel.test.infra.kafka.services.RemoteKafkaService;
-import org.apache.camel.test.infra.kafka.services.StrimziService;
+import org.apache.camel.test.infra.kafka.services.KafkaServiceFactory.ContainerLocalKafkaService;
+import org.apache.camel.test.infra.kafka.services.KafkaServiceFactory.RemoteKafkaService;
+import org.apache.camel.test.infra.kafka.services.KafkaServiceFactory.StrimziService;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 public abstract class AbstractKafkaTest {
@@ -49,7 +49,7 @@ public abstract class AbstractKafkaTest {
                 .addRemoteMapping(RemoteKafkaService::new)
                 .addMapping("embedded", EmbeddedKafkaService::new)
                 .addMapping("local-strimzi-container", StrimziService::new)
-                .addMapping("local-cp-kafka-container", ContainerLocalKafkaService::new)
+                .addMapping("local-cp-kafka-container", ContainerLocalKafkaService::kafka3Container)
                 .build();
 
         kafkaService.initialize();
diff --git a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java
index 7ab09c0cbf..c70d99da6f 100644
--- a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java
+++ b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java
@@ -114,12 +114,12 @@ public class EmbeddedKafkaService implements KafkaService {
     }
 
     @Override
-    public void beforeTestExecution(ExtensionContext extensionContext) {
+    public void beforeAll(ExtensionContext extensionContext) {
         initialize();
     }
 
     @Override
-    public void afterTestExecution(ExtensionContext context) {
+    public void afterAll(ExtensionContext context) {
         shutdown();
     }
 
diff --git a/tests/itests-cxf/pom.xml b/tests/itests-cxf/pom.xml
index eea9656217..416e01d2f0 100644
--- a/tests/itests-cxf/pom.xml
+++ b/tests/itests-cxf/pom.xml
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <version>5.0.0</version>
+            <version>6.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
diff --git a/tests/itests-cxf/src/test/java/org/apache/camel/kafkaconnector/cxf/source/CamelSourceCXFBasicITCase.java b/tests/itests-cxf/src/test/java/org/apache/camel/kafkaconnector/cxf/source/CamelSourceCXFBasicITCase.java
new file mode 100644
index 0000000000..ff31bfd649
--- /dev/null
+++ b/tests/itests-cxf/src/test/java/org/apache/camel/kafkaconnector/cxf/source/CamelSourceCXFBasicITCase.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.kafkaconnector.cxf.source;
+
+import java.util.concurrent.ExecutionException;
+
+import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+/**
+ * A simple test case that checks whether the CXF Consumer Endpoint produces the expected number of messages
+ */
+public class CamelSourceCXFBasicITCase extends CamelSourceCXFITCase {
+    @Test
+    @Timeout(30)
+    public void testBasicSendReceive() throws ExecutionException, InterruptedException {
+        String topicName = getTopicForTest(this);
+
+        ConnectorPropertyFactory connectorPropertyFactory = CamelSourceCXFPropertyFactory
+                .basic()
+                .withKafkaTopic(topicName)
+                .withAddress(SIMPLE_ENDPOINT_ADDRESS)
+                .withServiceClass("org.apache.camel.kafkaconnector.cxf.common.HelloService");
+
+        runTestBlocking(connectorPropertyFactory, topicName, expect);
+    }
+
+}
diff --git a/tests/itests-cxf/src/test/java/org/apache/camel/kafkaconnector/cxf/source/CamelSourceCXFDataFormatTCase.java b/tests/itests-cxf/src/test/java/org/apache/camel/kafkaconnector/cxf/source/CamelSourceCXFDataFormatTCase.java
new file mode 100644
index 0000000000..1f6f98185a
--- /dev/null
+++ b/tests/itests-cxf/src/test/java/org/apache/camel/kafkaconnector/cxf/source/CamelSourceCXFDataFormatTCase.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.kafkaconnector.cxf.source;
+
+import java.util.concurrent.ExecutionException;
+
+import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+/**
+ * A simple test case that checks whether the CXF Consumer Endpoint produces the expected number of messages
+ */
+public class CamelSourceCXFDataFormatTCase extends CamelSourceCXFITCase {
+    @Test
+    @Timeout(30)
+    public void testSendReceiveUsingDataFormat() throws ExecutionException, InterruptedException {
+        String topicName = getTopicForTest(this);
+
+        ConnectorPropertyFactory connectorPropertyFactory = CamelSourceCXFPropertyFactory
+                .basic()
+                .withKafkaTopic(topicName)
+                .withAddress(SIMPLE_ENDPOINT_ADDRESS)
+                .withServiceClass("org.apache.camel.kafkaconnector.cxf.common.HelloService")
+                .withDataFormat("POJO");
+
+        runTestBlocking(connectorPropertyFactory, topicName, expect);
+    }
+
+}
diff --git a/tests/itests-cxf/src/test/java/org/apache/camel/kafkaconnector/cxf/source/CamelSourceCXFITCase.java b/tests/itests-cxf/src/test/java/org/apache/camel/kafkaconnector/cxf/source/CamelSourceCXFITCase.java
index d9dfb6f49d..b8ee82ad63 100644
--- a/tests/itests-cxf/src/test/java/org/apache/camel/kafkaconnector/cxf/source/CamelSourceCXFITCase.java
+++ b/tests/itests-cxf/src/test/java/org/apache/camel/kafkaconnector/cxf/source/CamelSourceCXFITCase.java
@@ -17,9 +17,6 @@
 
 package org.apache.camel.kafkaconnector.cxf.source;
 
-import java.util.concurrent.ExecutionException;
-
-import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
 import org.apache.camel.kafkaconnector.common.test.CamelSourceTestSupport;
 import org.apache.camel.kafkaconnector.common.test.TestMessageConsumer;
 import org.apache.camel.kafkaconnector.common.utils.NetworkUtils;
@@ -27,18 +24,14 @@ import org.apache.camel.kafkaconnector.cxf.client.CXFServiceUtil;
 import org.apache.camel.kafkaconnector.cxf.common.HelloService;
 import org.apache.camel.test.infra.common.TestUtils;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-/**
- * A simple test case that checks whether the CXF Consumer Endpoint produces the expected number of messages
- */
-public class CamelSourceCXFITCase extends CamelSourceTestSupport {
+
+public abstract class CamelSourceCXFITCase extends CamelSourceTestSupport {
 
     protected static final int PORT = NetworkUtils.getFreePort("localhost");
     protected static final String SIMPLE_ENDPOINT_ADDRESS = "http://localhost:" + PORT + "/CxfConsumerTest/test";
@@ -46,9 +39,9 @@ public class CamelSourceCXFITCase extends CamelSourceTestSupport {
             + "?serviceClass=org.apache.camel.kafkaconnector.cxf.common.HelloService"
             + "&publishedEndpointUrl=http://www.simple.com/services/test";
 
-    private static final Logger LOG = LoggerFactory.getLogger(CamelSourceCXFITCase.class);
+    protected static final Logger LOG = LoggerFactory.getLogger(CamelSourceCXFITCase.class);
 
-    private final int expect = 10;
+    protected final int expect = 10;
 
     @Override
     protected String[] getConnectorsInTest() {
@@ -89,48 +82,4 @@ public class CamelSourceCXFITCase extends CamelSourceTestSupport {
         }
     }
 
-
-    @Test
-    @Timeout(30)
-    public void testBasicSendReceive() throws ExecutionException, InterruptedException {
-        String topicName = getTopicForTest(this);
-
-        ConnectorPropertyFactory connectorPropertyFactory = CamelSourceCXFPropertyFactory
-                .basic()
-                .withKafkaTopic(topicName)
-                .withAddress(SIMPLE_ENDPOINT_ADDRESS)
-                .withServiceClass("org.apache.camel.kafkaconnector.cxf.common.HelloService");
-
-        runTestBlocking(connectorPropertyFactory, topicName, expect);
-    }
-
-    @Test
-    @Timeout(30)
-    public void testBasicSendReceiveUsingUrl() throws ExecutionException, InterruptedException {
-        String topicName = getTopicForTest(this);
-
-        ConnectorPropertyFactory connectorPropertyFactory = CamelSourceCXFPropertyFactory
-                .basic()
-                .withKafkaTopic(topicName)
-                .withUrl(SIMPLE_ENDPOINT_URI)
-                .buildUrl();
-
-        runTestBlocking(connectorPropertyFactory, topicName, expect);
-    }
-
-    @Test
-    @Timeout(30)
-    public void testBasicSendReceiveUsingDataFormat() throws ExecutionException, InterruptedException {
-        String topicName = getTopicForTest(this);
-
-        ConnectorPropertyFactory connectorPropertyFactory = CamelSourceCXFPropertyFactory
-                .basic()
-                .withKafkaTopic(topicName)
-                .withAddress(SIMPLE_ENDPOINT_ADDRESS)
-                .withServiceClass("org.apache.camel.kafkaconnector.cxf.common.HelloService")
-                .withDataFormat("POJO");
-
-        runTestBlocking(connectorPropertyFactory, topicName, expect);
-    }
-
 }
diff --git a/tests/itests-cxf/src/test/java/org/apache/camel/kafkaconnector/cxf/source/CamelSourceCXFUrlTCase.java b/tests/itests-cxf/src/test/java/org/apache/camel/kafkaconnector/cxf/source/CamelSourceCXFUrlTCase.java
new file mode 100644
index 0000000000..a083f98087
--- /dev/null
+++ b/tests/itests-cxf/src/test/java/org/apache/camel/kafkaconnector/cxf/source/CamelSourceCXFUrlTCase.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.kafkaconnector.cxf.source;
+
+import java.util.concurrent.ExecutionException;
+
+import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+/**
+ * A simple test case that checks whether the CXF Consumer Endpoint produces the expected number of messages
+ */
+public class CamelSourceCXFUrlTCase extends CamelSourceCXFITCase {
+    @Test
+    @Timeout(30)
+    public void testSendReceiveUsingUrl() throws ExecutionException, InterruptedException {
+        String topicName = getTopicForTest(this);
+
+        ConnectorPropertyFactory connectorPropertyFactory = CamelSourceCXFPropertyFactory
+                .basic()
+                .withKafkaTopic(topicName)
+                .withUrl(SIMPLE_ENDPOINT_URI)
+                .buildUrl();
+
+        runTestBlocking(connectorPropertyFactory, topicName, expect);
+    }
+
+}
diff --git a/tests/itests-cxfrs/pom.xml b/tests/itests-cxfrs/pom.xml
index fac79c4138..aef41f2886 100644
--- a/tests/itests-cxfrs/pom.xml
+++ b/tests/itests-cxfrs/pom.xml
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <version>5.0.0</version>
+            <version>6.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
diff --git a/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/common/SJMS2Common.java b/tests/itests-elasticsearch/src/test/java/org/apache/camel/kafkaconnector/elasticsearch/common/ElasticSearchLocalContainerTestService.java
similarity index 53%
copy from tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/common/SJMS2Common.java
copy to tests/itests-elasticsearch/src/test/java/org/apache/camel/kafkaconnector/elasticsearch/common/ElasticSearchLocalContainerTestService.java
index d80dccd745..78b7ab7c20 100644
--- a/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/common/SJMS2Common.java
+++ b/tests/itests-elasticsearch/src/test/java/org/apache/camel/kafkaconnector/elasticsearch/common/ElasticSearchLocalContainerTestService.java
@@ -15,23 +15,23 @@
  * limitations under the License.
  */
 
-package org.apache.camel.kafkaconnector.sjms2.common;
+package org.apache.camel.kafkaconnector.elasticsearch.common;
 
-import org.apache.camel.test.infra.messaging.services.MessagingLocalContainerService;
-
-public final class SJMS2Common {
-    /**
-     * The default JMS queue name used during the tests
-     */
-    public static final String DEFAULT_JMS_QUEUE = "ckc.queue";
-
-    private SJMS2Common() {
+import org.apache.camel.test.infra.elasticsearch.services.ElasticSearchLocalContainerInfraService;
+import org.apache.camel.test.infra.elasticsearch.services.ElasticSearchService;
+import org.testcontainers.elasticsearch.ElasticsearchContainer;
 
+public class ElasticSearchLocalContainerTestService extends ElasticSearchLocalContainerInfraService implements ElasticSearchService {
+    public ElasticSearchLocalContainerTestService() {
+        super();
     }
 
-    public static MessagingLocalContainerService<FixedDispatchRouterContainer> createLocalService() {
-        FixedDispatchRouterContainer container = new FixedDispatchRouterContainer();
+    public ElasticSearchLocalContainerTestService(String imageName) {
+        super(imageName);
+    }
 
-        return new MessagingLocalContainerService<>(container, c -> container.defaultEndpoint());
+    public ElasticSearchLocalContainerTestService(ElasticsearchContainer container) {
+        super(container);
     }
+
 }
diff --git a/tests/itests-elasticsearch/src/test/java/org/apache/camel/kafkaconnector/elasticsearch/sink/CamelSinkElasticSearchITCase.java b/tests/itests-elasticsearch/src/test/java/org/apache/camel/kafkaconnector/elasticsearch/sink/CamelSinkElasticSearchITCase.java
index 891dc59a70..d858c73cb3 100644
--- a/tests/itests-elasticsearch/src/test/java/org/apache/camel/kafkaconnector/elasticsearch/sink/CamelSinkElasticSearchITCase.java
+++ b/tests/itests-elasticsearch/src/test/java/org/apache/camel/kafkaconnector/elasticsearch/sink/CamelSinkElasticSearchITCase.java
@@ -29,9 +29,9 @@ import org.apache.camel.kafkaconnector.common.test.CamelSinkTestSupport;
 import org.apache.camel.kafkaconnector.elasticsearch.clients.ElasticSearchClient;
 import org.apache.camel.kafkaconnector.elasticsearch.common.ElasticSearchCommon;
 import org.apache.camel.kafkaconnector.elasticsearch.common.ElasticSearchIndexMessageProducer;
-import org.apache.camel.test.infra.elasticsearch.services.ElasticSearchLocalContainerService;
+import org.apache.camel.kafkaconnector.elasticsearch.common.ElasticSearchLocalContainerTestService;
 import org.apache.camel.test.infra.elasticsearch.services.ElasticSearchService;
-import org.apache.camel.test.infra.elasticsearch.services.RemoteElasticSearchService;
+import org.apache.camel.test.infra.elasticsearch.services.ElasticSearchServiceFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
@@ -56,10 +56,10 @@ public class CamelSinkElasticSearchITCase extends CamelSinkTestSupport {
                         ElasticsearchContainer container =
                                 new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:8.5.2");
                         container.addEnv("xpack.security.enabled", "true");
-                        return new ElasticSearchLocalContainerService(container);
+                        return new ElasticSearchLocalContainerTestService(container);
                     }
                 }
-            ).addRemoteMapping(RemoteElasticSearchService::new).build();
+            ).addRemoteMapping(ElasticSearchServiceFactory.RemoteElasticSearchTestService::new).build();
 
     private static final Logger LOG = LoggerFactory.getLogger(CamelElasticSearchPropertyFactory.class);
 
diff --git a/tests/itests-mongodb/pom.xml b/tests/itests-mongodb/pom.xml
index 78d3627ffe..3df808cc16 100644
--- a/tests/itests-mongodb/pom.xml
+++ b/tests/itests-mongodb/pom.xml
@@ -60,9 +60,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.camel.kamelets</groupId>
-            <artifactId>camel-kamelets-utils</artifactId>
-            <version>${camel.kamelet.catalog.version}</version>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-kamelet</artifactId>
         </dependency>
 
         <dependency>
diff --git a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/common/MongoDBEnvVarServiceFactory.java b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/common/MongoDBEnvVarServiceFactory.java
index 137eba1e1c..3d386086f2 100644
--- a/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/common/MongoDBEnvVarServiceFactory.java
+++ b/tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/common/MongoDBEnvVarServiceFactory.java
@@ -19,8 +19,8 @@ package org.apache.camel.kafkaconnector.mongodb.common;
 import java.util.function.Supplier;
 
 import org.apache.camel.test.infra.common.services.SimpleTestServiceBuilder;
-import org.apache.camel.test.infra.mongodb.services.MongoDBRemoteService;
 import org.apache.camel.test.infra.mongodb.services.MongoDBService;
+import org.apache.camel.test.infra.mongodb.services.MongoDBServiceFactory;
 
 public final class MongoDBEnvVarServiceFactory {
     private MongoDBEnvVarServiceFactory() {
@@ -35,7 +35,7 @@ public final class MongoDBEnvVarServiceFactory {
     }
 
     public static MongoDBService createService(Supplier<MongoDBService> localMapping) {
-        return builder().addLocalMapping(localMapping).addRemoteMapping(MongoDBRemoteService::new).build();
+        return builder().addLocalMapping(localMapping).addRemoteMapping(MongoDBServiceFactory.MongoDBRemoteService::new).build();
     }
 
     public static MongoDBService createService(String username, String password) {
diff --git a/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/common/FixedDispatchRouterContainer.java b/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/common/FixedDispatchRouterContainer.java
deleted file mode 100644
index a84f35fd07..0000000000
--- a/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/common/FixedDispatchRouterContainer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.sjms2.common;
-
-import org.apache.camel.test.infra.messaging.services.MessagingContainer;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.Wait;
-
-//TODO: remove after https://issues.apache.org/jira/browse/CAMEL-21297 is fixed and released
-public class FixedDispatchRouterContainer extends GenericContainer<FixedDispatchRouterContainer> implements MessagingContainer {
-    private static final int DEFAULT_AMQP_PORT = 5672;
-    private static final String IMAGE_NAME = "quay.io/interconnectedcloud/qdrouterd:latest";
-
-    public FixedDispatchRouterContainer() {
-        super(IMAGE_NAME);
-        (this.withExposedPorts(new Integer[]{DEFAULT_AMQP_PORT})).waitingFor(Wait.forListeningPort());
-    }
-
-    public int getAMQPPort() {
-        return this.getMappedPort(DEFAULT_AMQP_PORT);
-    }
-
-    public String getAMQPEndpoint() {
-        return String.format("amqp://%s:%d", this.getHost(), this.getAMQPPort());
-    }
-
-    public String defaultEndpoint() {
-        return this.getAMQPEndpoint();
-    }
-}
\ No newline at end of file
diff --git a/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/common/SJMS2Common.java b/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/common/SJMS2Common.java
index d80dccd745..81a527f98d 100644
--- a/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/common/SJMS2Common.java
+++ b/tests/itests-sjms2/src/test/java/org/apache/camel/kafkaconnector/sjms2/common/SJMS2Common.java
@@ -17,7 +17,8 @@
 
 package org.apache.camel.kafkaconnector.sjms2.common;
 
-import org.apache.camel.test.infra.messaging.services.MessagingLocalContainerService;
+import org.apache.camel.test.infra.dispatch.router.services.DispatchRouterContainer;
+import org.apache.camel.test.infra.messaging.services.MessagingServiceFactory;
 
 public final class SJMS2Common {
     /**
@@ -29,9 +30,9 @@ public final class SJMS2Common {
 
     }
 
-    public static MessagingLocalContainerService<FixedDispatchRouterContainer> createLocalService() {
-        FixedDispatchRouterContainer container = new FixedDispatchRouterContainer();
+    public static MessagingServiceFactory.MessagingLocalContainerService<DispatchRouterContainer> createLocalService() {
+        DispatchRouterContainer container = new DispatchRouterContainer();
 
-        return new MessagingLocalContainerService<>(container, c -> container.defaultEndpoint());
+        return new MessagingServiceFactory.MessagingLocalContainerService<>(container, c -> container.defaultEndpoint());
     }
 }