You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2020/11/27 01:36:24 UTC

[camel-kafka-connector] 03/21: [create-pull-request] automated change

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

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

commit bde443f6fecef60b21d2eff2236bbb6a788974b8
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Sun Nov 8 03:30:51 2020 +0000

    [create-pull-request] automated change
---
 .../resources/connectors/camel-aws2-sqs-sink.json  |  14 ++
 .../connectors/camel-aws2-sqs-source.json          |  14 ++
 .../connectors/camel-azure-storage-blob-sink.json  |  12 ++
 .../camel-azure-storage-blob-source.json           |  12 ++
 .../resources/connectors/camel-couchbase-sink.json |   4 +-
 .../connectors/camel-couchbase-source.json         |   4 +-
 .../resources/connectors/camel-git-sink.json       |  40 ++--
 .../resources/connectors/camel-git-source.json     |  30 ---
 .../resources/connectors/camel-grpc-sink.json      |   7 +
 .../resources/connectors/camel-grpc-source.json    |  14 ++
 .../resources/connectors/camel-kafka-sink.json     |  24 +--
 .../resources/connectors/camel-kafka-source.json   |  24 +--
 .../camel-kubernetes-deployments-source.json       |  30 +++
 .../connectors/camel-kubernetes-hpa-source.json    |  30 +++
 .../connectors/camel-kubernetes-job-source.json    |  30 +++
 .../camel-kubernetes-namespaces-source.json        |  30 +++
 .../connectors/camel-kubernetes-nodes-source.json  |  30 +++
 .../connectors/camel-kubernetes-pods-source.json   |  30 +++
 ...-kubernetes-replication-controllers-source.json |  30 +++
 .../camel-kubernetes-services-source.json          |  30 +++
 .../resources/connectors/camel-pulsar-source.json  |  14 ++
 .../connectors/camel-vertx-websocket-sink.json     |   6 +
 .../resources/descriptors/connectors.properties    |   3 +
 connectors/camel-atlasmap-kafka-connector/pom.xml  | 135 ++++++++++++++
 .../descriptors/connector-sink.properties          |   1 +
 .../generated/resources/camel-atlasmap-sink.json   |  99 ++++++++++
 .../src/main/assembly/package.xml                  |  57 ++++++
 .../docs/camel-atlasmap-kafka-sink-connector.adoc  |  66 +++++++
 .../CamelAtlasmapSinkConnector.properties}         |  10 +-
 .../atlasmap/CamelAtlasmapSinkConnector.java       |  35 ++++
 .../atlasmap/CamelAtlasmapSinkConnectorConfig.java |  96 ++++++++++
 .../atlasmap/CamelAtlasmapSinkTask.java            |  39 ++++
 .../src/main/resources/META-INF/LICENSE.txt        | 203 +++++++++++++++++++++
 .../src/main/resources/META-INF/NOTICE.txt         |  11 ++
 .../generated/resources/camel-aws2-sqs-sink.json   |  14 ++
 .../generated/resources/camel-aws2-sqs-source.json |  14 ++
 .../docs/camel-aws2-sqs-kafka-sink-connector.adoc  |   4 +-
 .../camel-aws2-sqs-kafka-source-connector.adoc     |   4 +-
 .../aws2sqs/CamelAws2sqsSinkConnectorConfig.java   |   8 +
 .../aws2sqs/CamelAws2sqsSourceConnectorConfig.java |   8 +
 .../resources/camel-azure-storage-blob-sink.json   |  12 ++
 .../resources/camel-azure-storage-blob-source.json |  12 ++
 ...el-azure-storage-blob-kafka-sink-connector.adoc |   4 +-
 ...-azure-storage-blob-kafka-source-connector.adoc |   4 +-
 .../CamelAzurestorageblobSinkConnectorConfig.java  |   8 +
 ...CamelAzurestorageblobSourceConnectorConfig.java |   8 +
 .../generated/resources/camel-couchbase-sink.json  |   4 +-
 .../resources/camel-couchbase-source.json          |   4 +-
 .../docs/camel-couchbase-kafka-sink-connector.adoc |   2 +-
 .../camel-couchbase-kafka-source-connector.adoc    |   2 +-
 .../CamelCouchbaseSinkConnector.properties         |   2 +
 .../CamelCouchbaseSourceConnector.properties       |   2 +
 .../CamelCouchbaseSinkConnectorConfig.java         |   2 +-
 .../CamelCouchbaseSourceConnectorConfig.java       |   2 +-
 .../src/generated/resources/camel-git-sink.json    |  40 ++--
 .../src/generated/resources/camel-git-source.json  |  30 ---
 .../main/docs/camel-git-kafka-sink-connector.adoc  |   6 +-
 .../docs/camel-git-kafka-source-connector.adoc     |   7 +-
 .../git/CamelGitSinkConnectorConfig.java           |  24 +--
 .../git/CamelGitSourceConnectorConfig.java         |  20 --
 .../src/generated/resources/camel-grpc-sink.json   |   7 +
 .../src/generated/resources/camel-grpc-source.json |  14 ++
 .../main/docs/camel-grpc-kafka-sink-connector.adoc |   3 +-
 .../docs/camel-grpc-kafka-source-connector.adoc    |   4 +-
 .../grpc/CamelGrpcSinkConnectorConfig.java         |   4 +
 .../grpc/CamelGrpcSourceConnectorConfig.java       |   8 +
 .../src/generated/resources/camel-kafka-sink.json  |  24 +--
 .../generated/resources/camel-kafka-source.json    |  24 +--
 .../docs/camel-kafka-kafka-sink-connector.adoc     |  12 +-
 .../docs/camel-kafka-kafka-source-connector.adoc   |   4 +-
 .../kafka/CamelKafkaSinkConnectorConfig.java       |  48 ++---
 .../kafka/CamelKafkaSourceConnectorConfig.java     |  16 +-
 .../pom.xml                                        | 135 ++++++++++++++
 .../descriptors/connector-sink.properties          |   1 +
 .../descriptors/connector-source.properties        |   1 +
 .../camel-kubernetes-custom-resources-sink.json    | 163 +++++++++--------
 .../camel-kubernetes-custom-resources-source.json  |  48 ++++-
 .../src/main/assembly/package.xml                  |  57 ++++++
 ...etes-custom-resources-kafka-sink-connector.adoc |  78 ++++++++
 ...s-custom-resources-kafka-source-connector.adoc} |  31 ++--
 ...ernetescustomresourcesSinkConnector.properties} |  10 +-
 ...netescustomresourcesSourceConnector.properties} |  10 +-
 ...amelKubernetescustomresourcesSinkConnector.java |  37 ++++
 ...bernetescustomresourcesSinkConnectorConfig.java | 145 +++++++++++++++
 .../CamelKubernetescustomresourcesSinkTask.java    |  39 ++++
 ...elKubernetescustomresourcesSourceConnector.java |  37 ++++
 ...rnetescustomresourcesSourceConnectorConfig.java | 189 +++++++++++++++++++
 .../CamelKubernetescustomresourcesSourceTask.java  |  39 ++++
 .../src/main/resources/META-INF/LICENSE.txt        | 203 +++++++++++++++++++++
 .../src/main/resources/META-INF/NOTICE.txt         |  11 ++
 .../camel-kubernetes-deployments-source.json       |  30 +++
 ...ernetes-deployments-kafka-source-connector.adoc |   7 +-
 ...KubernetesdeploymentsSourceConnectorConfig.java |  20 ++
 .../resources/camel-kubernetes-hpa-source.json     |  30 +++
 ...amel-kubernetes-hpa-kafka-source-connector.adoc |   7 +-
 .../CamelKuberneteshpaSourceConnectorConfig.java   |  20 ++
 .../resources/camel-kubernetes-job-source.json     |  30 +++
 ...amel-kubernetes-job-kafka-source-connector.adoc |   7 +-
 .../CamelKubernetesjobSourceConnectorConfig.java   |  20 ++
 .../camel-kubernetes-namespaces-source.json        |  30 +++
 ...bernetes-namespaces-kafka-source-connector.adoc |   7 +-
 ...lKubernetesnamespacesSourceConnectorConfig.java |  20 ++
 .../resources/camel-kubernetes-nodes-source.json   |  30 +++
 ...el-kubernetes-nodes-kafka-source-connector.adoc |   7 +-
 .../CamelKubernetesnodesSourceConnectorConfig.java |  20 ++
 .../resources/camel-kubernetes-pods-source.json    |  30 +++
 ...mel-kubernetes-pods-kafka-source-connector.adoc |   7 +-
 .../CamelKubernetespodsSourceConnectorConfig.java  |  20 ++
 ...-kubernetes-replication-controllers-source.json |  30 +++
 ...ication-controllers-kafka-source-connector.adoc |   7 +-
 ...eplicationcontrollersSourceConnectorConfig.java |  20 ++
 .../camel-kubernetes-services-source.json          |  30 +++
 ...kubernetes-services-kafka-source-connector.adoc |   7 +-
 ...melKubernetesservicesSourceConnectorConfig.java |  20 ++
 .../generated/resources/camel-pulsar-source.json   |  14 ++
 .../docs/camel-pulsar-kafka-source-connector.adoc  |   4 +-
 .../pulsar/CamelPulsarSourceConnectorConfig.java   |   8 +
 .../resources/camel-vertx-websocket-sink.json      |   6 +
 ...camel-vertx-websocket-kafka-sink-connector.adoc |   3 +-
 .../CamelVertxwebsocketSinkConnectorConfig.java    |   4 +
 connectors/pom.xml                                 |   2 +
 .../camel-atlasmap-kafka-sink-connector.adoc       |  66 +++++++
 .../camel-aws2-sqs-kafka-sink-connector.adoc       |   4 +-
 .../camel-aws2-sqs-kafka-source-connector.adoc     |   4 +-
 ...el-azure-storage-blob-kafka-sink-connector.adoc |   4 +-
 ...-azure-storage-blob-kafka-source-connector.adoc |   4 +-
 .../camel-couchbase-kafka-sink-connector.adoc      |   2 +-
 .../camel-couchbase-kafka-source-connector.adoc    |   2 +-
 .../connectors/camel-git-kafka-sink-connector.adoc |   6 +-
 .../camel-git-kafka-source-connector.adoc          |   7 +-
 .../camel-grpc-kafka-sink-connector.adoc           |   3 +-
 .../camel-grpc-kafka-source-connector.adoc         |   4 +-
 .../camel-kafka-kafka-sink-connector.adoc          |  12 +-
 .../camel-kafka-kafka-source-connector.adoc        |   4 +-
 ...etes-custom-resources-kafka-sink-connector.adoc |  78 ++++++++
 ...es-custom-resources-kafka-source-connector.adoc |  31 ++--
 ...ernetes-deployments-kafka-source-connector.adoc |   7 +-
 ...amel-kubernetes-hpa-kafka-source-connector.adoc |   7 +-
 ...amel-kubernetes-job-kafka-source-connector.adoc |   7 +-
 ...bernetes-namespaces-kafka-source-connector.adoc |   7 +-
 ...el-kubernetes-nodes-kafka-source-connector.adoc |   7 +-
 ...mel-kubernetes-pods-kafka-source-connector.adoc |   7 +-
 ...ication-controllers-kafka-source-connector.adoc |   7 +-
 ...kubernetes-services-kafka-source-connector.adoc |   7 +-
 .../camel-pulsar-kafka-source-connector.adoc       |   4 +-
 ...camel-vertx-websocket-kafka-sink-connector.adoc |   3 +-
 146 files changed, 3234 insertions(+), 420 deletions(-)

diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json
index 964f356..35164dc 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json
@@ -81,6 +81,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.useIAMCredentials": {
+			"name": "camel.sink.endpoint.useIAMCredentials",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.delaySeconds": {
 			"name": "camel.sink.endpoint.delaySeconds",
 			"description": "Delay sending messages for a number of seconds.",
@@ -260,6 +267,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.useIAMCredentials": {
+			"name": "camel.component.aws2-sqs.useIAMCredentials",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.delaySeconds": {
 			"name": "camel.component.aws2-sqs.delaySeconds",
 			"description": "Delay sending messages for a number of seconds.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json
index c819570..7684b15 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json
@@ -81,6 +81,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.useIAMCredentials": {
+			"name": "camel.source.endpoint.useIAMCredentials",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.attributeNames": {
 			"name": "camel.source.endpoint.attributeNames",
 			"description": "A list of attribute names to receive when consuming. Multiple names can be separated by comma.",
@@ -436,6 +443,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.useIAMCredentials": {
+			"name": "camel.component.aws2-sqs.useIAMCredentials",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.attributeNames": {
 			"name": "camel.component.aws2-sqs.attributeNames",
 			"description": "A list of attribute names to receive when consuming. Multiple names can be separated by comma.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-sink.json
index fe3b13d..fcf267d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-sink.json
@@ -98,6 +98,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.regex": {
+			"name": "camel.sink.endpoint.regex",
+			"description": "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.serviceClient": {
 			"name": "camel.sink.endpoint.serviceClient",
 			"description": "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations on a blob are availa [...]
@@ -276,6 +282,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.azure-storage-blob.regex": {
+			"name": "camel.component.azure-storage-blob.regex",
+			"description": "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.azure-storage-blob.serviceClient": {
 			"name": "camel.component.azure-storage-blob.serviceClient",
 			"description": "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations on a blob are availa [...]
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-source.json
index 92bdb2f..26374df 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-source.json
@@ -98,6 +98,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.regex": {
+			"name": "camel.source.endpoint.regex",
+			"description": "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.serviceClient": {
 			"name": "camel.source.endpoint.serviceClient",
 			"description": "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations on a blob are availa [...]
@@ -226,6 +232,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.azure-storage-blob.regex": {
+			"name": "camel.component.azure-storage-blob.regex",
+			"description": "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.azure-storage-blob.serviceClient": {
 			"name": "camel.component.azure-storage-blob.serviceClient",
 			"description": "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations on a blob are availa [...]
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json
index 4fe21c2..0d2f926 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json
@@ -31,8 +31,8 @@
 		"camel.sink.endpoint.bucket": {
 			"name": "camel.sink.endpoint.bucket",
 			"description": "The bucket to use",
-			"priority": "MEDIUM",
-			"required": "false"
+			"priority": "HIGH",
+			"required": "true"
 		},
 		"camel.sink.endpoint.collection": {
 			"name": "camel.sink.endpoint.collection",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-source.json
index f592523..59fba50 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-source.json
@@ -31,8 +31,8 @@
 		"camel.source.endpoint.bucket": {
 			"name": "camel.source.endpoint.bucket",
 			"description": "The bucket to use",
-			"priority": "MEDIUM",
-			"required": "false"
+			"priority": "HIGH",
+			"required": "true"
 		},
 		"camel.source.endpoint.collection": {
 			"name": "camel.source.endpoint.collection",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-sink.json
index 6fd403c..bea3a4b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-sink.json
@@ -21,6 +21,26 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.allowEmpty": {
+			"name": "camel.sink.endpoint.allowEmpty",
+			"description": "The flag to manage empty git commits",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.lazyStartProducer": {
+			"name": "camel.sink.endpoint.lazyStartProducer",
+			"description": "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 when the first message is processed then creating and starting the pr [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.operation": {
+			"name": "camel.sink.endpoint.operation",
+			"description": "The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList]",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.password": {
 			"name": "camel.sink.endpoint.password",
 			"description": "Remote repository password",
@@ -51,26 +71,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.allowEmpty": {
-			"name": "camel.sink.endpoint.allowEmpty",
-			"description": "The flag to manage empty git commits",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.lazyStartProducer": {
-			"name": "camel.sink.endpoint.lazyStartProducer",
-			"description": "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 when the first message is processed then creating and starting the pr [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.operation": {
-			"name": "camel.sink.endpoint.operation",
-			"description": "The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList]",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.basicPropertyBinding": {
 			"name": "camel.sink.endpoint.basicPropertyBinding",
 			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-source.json
index 6324c50..a7f7dcd 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-source.json
@@ -21,36 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.password": {
-			"name": "camel.source.endpoint.password",
-			"description": "Remote repository password",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.remoteName": {
-			"name": "camel.source.endpoint.remoteName",
-			"description": "The remote repository name to use in particular operation like pull",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.remotePath": {
-			"name": "camel.source.endpoint.remotePath",
-			"description": "The remote repository path",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.tagName": {
-			"name": "camel.source.endpoint.tagName",
-			"description": "The tag name to work on",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.username": {
-			"name": "camel.source.endpoint.username",
-			"description": "Remote repository username",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bridgeErrorHandler": {
 			"name": "camel.source.endpoint.bridgeErrorHandler",
 			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-sink.json
index 48dea76..fac545a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-sink.json
@@ -27,6 +27,13 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.sink.endpoint.autoDiscoverClientInterceptors": {
+			"name": "camel.sink.endpoint.autoDiscoverClientInterceptors",
+			"description": "Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.flowControlWindow": {
 			"name": "camel.sink.endpoint.flowControlWindow",
 			"description": "The HTTP\/2 flow control window size (MiB)",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-source.json
index cbe6e50..7233809 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-source.json
@@ -27,6 +27,13 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.source.endpoint.autoDiscoverClientInterceptors": {
+			"name": "camel.source.endpoint.autoDiscoverClientInterceptors",
+			"description": "Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.flowControlWindow": {
 			"name": "camel.source.endpoint.flowControlWindow",
 			"description": "The HTTP\/2 flow control window size (MiB)",
@@ -76,6 +83,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.routeControlledStreamObserver": {
+			"name": "camel.source.endpoint.routeControlledStreamObserver",
+			"description": "Lets the route to take control over stream observer. If this value is set to true, then the response observer of gRPC call will be set with the name GrpcConstants.GRPC_RESPONSE_OBSERVER in the Exchange object. Please note that the stream observer's onNext(), onError(), onCompleted() methods should be called in the route.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.exceptionHandler": {
 			"name": "camel.source.endpoint.exceptionHandler",
 			"description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-sink.json
index e1ab101..d5b3d67 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-sink.json
@@ -81,8 +81,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.kafkaHeaderSerializer": {
-			"name": "camel.sink.endpoint.kafkaHeaderSerializer",
+		"camel.sink.endpoint.headerSerializer": {
+			"name": "camel.sink.endpoint.headerSerializer",
 			"description": "To use a custom KafkaHeaderSerializer to serialize kafka headers values",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -93,8 +93,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.keySerializerClass": {
-			"name": "camel.sink.endpoint.keySerializerClass",
+		"camel.sink.endpoint.keySerializer": {
+			"name": "camel.sink.endpoint.keySerializer",
 			"description": "The serializer class for keys (defaults to the same as for messages if nothing is given).",
 			"defaultValue": "\"org.apache.kafka.common.serialization.StringSerializer\"",
 			"priority": "MEDIUM",
@@ -245,8 +245,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.serializerClass": {
-			"name": "camel.sink.endpoint.serializerClass",
+		"camel.sink.endpoint.valueSerializer": {
+			"name": "camel.sink.endpoint.valueSerializer",
 			"description": "The serializer class for messages.",
 			"defaultValue": "\"org.apache.kafka.common.serialization.StringSerializer\"",
 			"priority": "MEDIUM",
@@ -526,8 +526,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.kafkaHeaderSerializer": {
-			"name": "camel.component.kafka.kafkaHeaderSerializer",
+		"camel.component.kafka.headerSerializer": {
+			"name": "camel.component.kafka.headerSerializer",
 			"description": "To use a custom KafkaHeaderSerializer to serialize kafka headers values",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -538,8 +538,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.keySerializerClass": {
-			"name": "camel.component.kafka.keySerializerClass",
+		"camel.component.kafka.keySerializer": {
+			"name": "camel.component.kafka.keySerializer",
 			"description": "The serializer class for keys (defaults to the same as for messages if nothing is given).",
 			"defaultValue": "\"org.apache.kafka.common.serialization.StringSerializer\"",
 			"priority": "MEDIUM",
@@ -690,8 +690,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.serializerClass": {
-			"name": "camel.component.kafka.serializerClass",
+		"camel.component.kafka.valueSerializer": {
+			"name": "camel.component.kafka.valueSerializer",
 			"description": "The serializer class for messages.",
 			"defaultValue": "\"org.apache.kafka.common.serialization.StringSerializer\"",
 			"priority": "MEDIUM",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json
index bdf0daa..d2d7b87 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json
@@ -157,6 +157,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.headerDeserializer": {
+			"name": "camel.source.endpoint.headerDeserializer",
+			"description": "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.heartbeatIntervalMs": {
 			"name": "camel.source.endpoint.heartbeatIntervalMs",
 			"description": "The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1\/3 of that value. It can be adjusted even lower to control the expected time for normal rebalances.",
@@ -164,12 +170,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.kafkaHeaderDeserializer": {
-			"name": "camel.source.endpoint.kafkaHeaderDeserializer",
-			"description": "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.keyDeserializer": {
 			"name": "camel.source.endpoint.keyDeserializer",
 			"description": "Deserializer class for key that implements the Deserializer interface.",
@@ -563,6 +563,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.kafka.headerDeserializer": {
+			"name": "camel.component.kafka.headerDeserializer",
+			"description": "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.kafka.heartbeatIntervalMs": {
 			"name": "camel.component.kafka.heartbeatIntervalMs",
 			"description": "The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1\/3 of that value. It can be adjusted even lower to control the expected time for normal rebalances.",
@@ -570,12 +576,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.kafkaHeaderDeserializer": {
-			"name": "camel.component.kafka.kafkaHeaderDeserializer",
-			"description": "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.kafka.keyDeserializer": {
 			"name": "camel.component.kafka.keyDeserializer",
 			"description": "Deserializer class for key that implements the Deserializer interface.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-source.json
index 2d6443f..bfb7af9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json
index 0088ab1..d88584c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-source.json
index 0de6735..dcea34d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-source.json
index 80f11cd..a38bb65 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-source.json
index 6cafbfe..320bb79 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-source.json
index 983d302..1679e6e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-source.json
index 878a9ca..693f9c0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-source.json
index c889b93..0151fa7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-source.json
index e6e4bbc..36414b3 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-source.json
@@ -108,6 +108,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.readCompacted": {
+			"name": "camel.source.endpoint.readCompacted",
+			"description": "Enable compacted topic reading.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.subscriptionInitialPosition": {
 			"name": "camel.source.endpoint.subscriptionInitialPosition",
 			"description": "Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST]",
@@ -250,6 +257,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.pulsar.readCompacted": {
+			"name": "camel.component.pulsar.readCompacted",
+			"description": "Enable compacted topic reading.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.pulsar.subscriptionInitialPosition": {
 			"name": "camel.component.pulsar.subscriptionInitialPosition",
 			"description": "Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST]",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json
index 4653fa2..e1bc267 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json
@@ -36,6 +36,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.clientSubProtocols": {
+			"name": "camel.sink.endpoint.clientSubProtocols",
+			"description": "Comma separated list of WebSocket subprotocols that the client should use for the Sec-WebSocket-Protocol header",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"description": "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 when the first message is processed then creating and starting the pr [...]
diff --git a/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties b/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties
index 6df3a8c..e95881f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties
+++ b/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties
@@ -14,6 +14,7 @@ camel-as2-source
 camel-as2-sink
 camel-asterisk-source
 camel-asterisk-sink
+camel-atlasmap-sink
 camel-atmos-source
 camel-atmos-sink
 camel-atmosphere-websocket-source
@@ -290,6 +291,8 @@ camel-jt400-sink
 camel-kafka-source
 camel-kafka-sink
 camel-kubernetes-config-maps-sink
+camel-kubernetes-custom-resources-source
+camel-kubernetes-custom-resources-sink
 camel-kubernetes-deployments-source
 camel-kubernetes-deployments-sink
 camel-kubernetes-hpa-source
diff --git a/connectors/camel-atlasmap-kafka-connector/pom.xml b/connectors/camel-atlasmap-kafka-connector/pom.xml
new file mode 100644
index 0000000..e9d76b9
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/pom.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.camel.kafkaconnector</groupId>
+    <artifactId>connectors</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>camel-atlasmap-kafka-connector</artifactId>
+  <name>Camel-Kafka-Connector :: atlasmap</name>
+  <description>Camel Kafka Connector for atlasmap</description>
+  <dependencies>
+    <!-- Kafka -->
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>connect-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>connect-transforms</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <!-- Camel -->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-atlasmap</artifactId>
+    </dependency>
+    <!--START OF GENERATED CODE-->
+    <dependency>
+      <groupId>org.apache.camel.kafkaconnector</groupId>
+      <artifactId>camel-kafka-connector</artifactId>
+    </dependency>
+    <!--END OF GENERATED CODE-->
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${version.maven.surefire.plugin}</version>
+        <configuration>
+          <failIfNoTests>false</failIfNoTests>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${version.maven.jar}</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.5.1</version>
+        <inherited>true</inherited>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.5.3</version>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/package.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <!--START OF GENERATED CODE-->
+  <repositories>
+    <!-- camel-jira -->
+    <repository>
+      <id>atlassian-public</id>
+      <url>https://packages.atlassian.com/maven-external</url>
+      <name>Atlassian Public Repo</name>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+    <!-- camel-ipfs and camel-weka -->
+    <repository>
+      <id>jboss.thirdparty</id>
+      <name>JBoss Thirdparty Repository</name>
+      <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+  </repositories>
+  <!--END OF GENERATED CODE-->
+</project>
diff --git a/connectors/camel-atlasmap-kafka-connector/src/generated/descriptors/connector-sink.properties b/connectors/camel-atlasmap-kafka-connector/src/generated/descriptors/connector-sink.properties
new file mode 100644
index 0000000..43d1b55
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/src/generated/descriptors/connector-sink.properties
@@ -0,0 +1 @@
+camel-atlasmap-sink
\ No newline at end of file
diff --git a/connectors/camel-atlasmap-kafka-connector/src/generated/resources/camel-atlasmap-sink.json b/connectors/camel-atlasmap-kafka-connector/src/generated/resources/camel-atlasmap-sink.json
new file mode 100644
index 0000000..5bf8f40
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/src/generated/resources/camel-atlasmap-sink.json
@@ -0,0 +1,99 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.atlasmap.CamelAtlasmapSinkConnector",
+		"artifactId": "camel-atlasmap-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-atlasmap-sink",
+		"type": "sink",
+		"version": "0.7.0-SNAPSHOT",
+		"description": "Transforms the message using an AtlasMap transformation."
+	},
+	"properties": {
+		"camel.sink.path.resourceUri": {
+			"name": "camel.sink.path.resourceUri",
+			"description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For bean you can specify the method name after dot, eg bean:myBean.myMethod.",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.sink.endpoint.allowContextMapAll": {
+			"name": "camel.sink.endpoint.allowContextMapAll",
+			"description": "Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.contentCache": {
+			"name": "camel.sink.endpoint.contentCache",
+			"description": "Sets whether to use resource content cache or not",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.lazyStartProducer": {
+			"name": "camel.sink.endpoint.lazyStartProducer",
+			"description": "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 when the first message is processed then creating and starting the pr [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.sourceMapName": {
+			"name": "camel.sink.endpoint.sourceMapName",
+			"description": "The Exchange property name for a source message map which hold java.util.Map&lt;String, Message&gt; where the key is AtlasMap Document ID. AtlasMap consumes Message bodies as source documents, as well as message headers as source properties where the scope equals to Document ID.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.targetMapMode": {
+			"name": "camel.sink.endpoint.targetMapMode",
+			"description": "TargetMapMode enum value to specify how multiple target documents are delivered if exist. 'MAP': Stores them into a java.util.Map, and the java.util.Map is set to an exchange property if 'targetMapName' is specified, otherwise message body. 'MESSAGE_HEADER': Stores them into message headers. 'EXCHANGE_PROPERTY': Stores them into exchange properties. ) One of: [MAP] [MESSAGE_HEADER] [EXCHANGE_PROPERTY]",
+			"defaultValue": "\"MAP\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.targetMapName": {
+			"name": "camel.sink.endpoint.targetMapName",
+			"description": "The Exchange property name for a target document map which hold java.util.Map&lt;String, Object&gt; where the key is AtlasMap Document ID. AtlasMap populates multiple target documents into this map.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.basicPropertyBinding": {
+			"name": "camel.sink.endpoint.basicPropertyBinding",
+			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.propertiesFile": {
+			"name": "camel.sink.endpoint.propertiesFile",
+			"description": "The URI of the properties file which is used for AtlasContextFactory initialization.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.synchronous": {
+			"name": "camel.sink.endpoint.synchronous",
+			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.atlasmap.lazyStartProducer": {
+			"name": "camel.component.atlasmap.lazyStartProducer",
+			"description": "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 when the first message is processed then creating and starting the pr [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.atlasmap.atlasContextFactory": {
+			"name": "camel.component.atlasmap.atlasContextFactory",
+			"description": "To use the AtlasContextFactory otherwise a new engine is created.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.atlasmap.basicPropertyBinding": {
+			"name": "camel.component.atlasmap.basicPropertyBinding",
+			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+			"defaultValue": "false",
+			"priority": "LOW",
+			"required": "false"
+		}
+	}
+}
diff --git a/connectors/camel-atlasmap-kafka-connector/src/main/assembly/package.xml b/connectors/camel-atlasmap-kafka-connector/src/main/assembly/package.xml
new file mode 100644
index 0000000..4fd2529
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/assembly/package.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<assembly>
+  <!-- Assembles a packaged version targeting OS installation. -->
+  <id>package</id>
+  <formats>
+    <format>zip</format>
+    <format>tar.gz</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}/../..</directory>
+      <outputDirectory>${project.artifactId}/</outputDirectory>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>licenses/</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/src/main/docs</directory>
+      <outputDirectory>docs/</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>${project.artifactId}/</outputDirectory>
+      <useProjectArtifact>true</useProjectArtifact>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+      <excludes>
+        <exclude>org.apache.kafka:connect-api</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
diff --git a/connectors/camel-atlasmap-kafka-connector/src/main/docs/camel-atlasmap-kafka-sink-connector.adoc b/connectors/camel-atlasmap-kafka-connector/src/main/docs/camel-atlasmap-kafka-sink-connector.adoc
new file mode 100644
index 0000000..72187e3
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/docs/camel-atlasmap-kafka-sink-connector.adoc
@@ -0,0 +1,66 @@
+// kafka-connector options: START
+[[camel-atlasmap-kafka-connector-sink]]
+= camel-atlasmap-kafka-connector sink configuration
+
+When using camel-atlasmap-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.apache.camel.kafkaconnector</groupId>
+  <artifactId>camel-atlasmap-kafka-connector</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel Kafka connector version -->
+</dependency>
+----
+
+To use this Sink connector in Kafka connect you'll need to set the following connector.class
+
+[source,java]
+----
+connector.class=org.apache.camel.kafkaconnector.atlasmap.CamelAtlasmapSinkConnector
+----
+
+
+The camel-atlasmap sink connector supports 13 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,1,1",options="header"]
+|===
+| Name | Description | Default | Required | Priority
+| *camel.sink.path.resourceUri* | Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For bean you can specify the method name after dot, eg bean:myBean.myMethod. | null | true | HIGH
+| *camel.sink.endpoint.allowContextMapAll* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | false | MEDIUM
+| *camel.sink.endpoint.contentCache* | Sets whether to use resource content cache or not | false | false | MEDIUM
+| *camel.sink.endpoint.lazyStartProducer* | 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 when the first message is processed then cre [...]
+| *camel.sink.endpoint.sourceMapName* | The Exchange property name for a source message map which hold java.util.Map&lt;String, Message&gt; where the key is AtlasMap Document ID. AtlasMap consumes Message bodies as source documents, as well as message headers as source properties where the scope equals to Document ID. | null | false | MEDIUM
+| *camel.sink.endpoint.targetMapMode* | TargetMapMode enum value to specify how multiple target documents are delivered if exist. 'MAP': Stores them into a java.util.Map, and the java.util.Map is set to an exchange property if 'targetMapName' is specified, otherwise message body. 'MESSAGE_HEADER': Stores them into message headers. 'EXCHANGE_PROPERTY': Stores them into exchange properties. ) One of: [MAP] [MESSAGE_HEADER] [EXCHANGE_PROPERTY] | "MAP" | false | MEDIUM
+| *camel.sink.endpoint.targetMapName* | The Exchange property name for a target document map which hold java.util.Map&lt;String, Object&gt; where the key is AtlasMap Document ID. AtlasMap populates multiple target documents into this map. | null | false | MEDIUM
+| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
+| *camel.sink.endpoint.propertiesFile* | The URI of the properties file which is used for AtlasContextFactory initialization. | null | false | MEDIUM
+| *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
+| *camel.component.atlasmap.lazyStartProducer* | 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 when the first message is processed the [...]
+| *camel.component.atlasmap.atlasContextFactory* | To use the AtlasContextFactory otherwise a new engine is created. | null | false | MEDIUM
+| *camel.component.atlasmap.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+|===
+
+
+
+The camel-atlasmap sink connector has no converters out of the box.
+
+
+
+
+
+The camel-atlasmap sink connector has no transforms out of the box.
+
+
+
+
+
+The camel-atlasmap sink connector has no aggregation strategies out of the box.
+
+
+
+
+// kafka-connector options: END
diff --git a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties b/connectors/camel-atlasmap-kafka-connector/src/main/docs/examples/CamelAtlasmapSinkConnector.properties
similarity index 72%
copy from connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties
copy to connectors/camel-atlasmap-kafka-connector/src/main/docs/examples/CamelAtlasmapSinkConnector.properties
index fdebdc2..7edb47ce 100644
--- a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/docs/examples/CamelAtlasmapSinkConnector.properties
@@ -15,8 +15,8 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-name=CamelCouchbaseSinkConnector
-connector.class=org.apache.camel.kafkaconnector.couchbase.CamelCouchbaseSinkConnector
+name=CamelAtlasmapSinkConnector
+connector.class=org.apache.camel.kafkaconnector.atlasmap.CamelAtlasmapSinkConnector
 tasks.max=1
 
 # use the kafka converters that better suit your needs, these are just defaults:
@@ -28,8 +28,6 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The hostname to use
-camel.sink.path.hostname=
-# The protocol to use
-camel.sink.path.protocol=
+# Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For bean you can specify the method name after dot, eg bean:myBean.myMethod.
+camel.sink.path.resourceUri=
 
diff --git a/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnector.java b/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnector.java
new file mode 100644
index 0000000..68ba548
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnector.java
@@ -0,0 +1,35 @@
+/*
+ * 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.atlasmap;
+
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.kafka.common.config.ConfigDef;
+import org.apache.kafka.connect.connector.Task;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelAtlasmapSinkConnector extends CamelSinkConnector {
+
+    @Override
+    public ConfigDef config() {
+        return CamelAtlasmapSinkConnectorConfig.conf();
+    }
+    @Override
+    public Class<? extends Task> taskClass() {
+        return CamelAtlasmapSinkTask.class;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnectorConfig.java b/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnectorConfig.java
new file mode 100644
index 0000000..1e0a715
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnectorConfig.java
@@ -0,0 +1,96 @@
+/*
+ * 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.atlasmap;
+
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.kafka.common.config.ConfigDef;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelAtlasmapSinkConnectorConfig
+        extends
+            CamelSinkConnectorConfig {
+
+    public static final String CAMEL_SINK_ATLASMAP_PATH_RESOURCE_URI_CONF = "camel.sink.path.resourceUri";
+    public static final String CAMEL_SINK_ATLASMAP_PATH_RESOURCE_URI_DOC = "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For bean you can specify the method name after dot, eg bean:myBean.myMethod.";
+    public static final String CAMEL_SINK_ATLASMAP_PATH_RESOURCE_URI_DEFAULT = null;
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_ALLOW_CONTEXT_MAP_ALL_CONF = "camel.sink.endpoint.allowContextMapAll";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_ALLOW_CONTEXT_MAP_ALL_DOC = "Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API.";
+    public static final Boolean CAMEL_SINK_ATLASMAP_ENDPOINT_ALLOW_CONTEXT_MAP_ALL_DEFAULT = false;
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_CONTENT_CACHE_CONF = "camel.sink.endpoint.contentCache";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_CONTENT_CACHE_DOC = "Sets whether to use resource content cache or not";
+    public static final Boolean CAMEL_SINK_ATLASMAP_ENDPOINT_CONTENT_CACHE_DEFAULT = false;
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_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 w [...]
+    public static final Boolean CAMEL_SINK_ATLASMAP_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_SOURCE_MAP_NAME_CONF = "camel.sink.endpoint.sourceMapName";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_SOURCE_MAP_NAME_DOC = "The Exchange property name for a source message map which hold java.util.Map&lt;String, Message&gt; where the key is AtlasMap Document ID. AtlasMap consumes Message bodies as source documents, as well as message headers as source properties where the scope equals to Document ID.";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_SOURCE_MAP_NAME_DEFAULT = null;
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_MODE_CONF = "camel.sink.endpoint.targetMapMode";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_MODE_DOC = "TargetMapMode enum value to specify how multiple target documents are delivered if exist. 'MAP': Stores them into a java.util.Map, and the java.util.Map is set to an exchange property if 'targetMapName' is specified, otherwise message body. 'MESSAGE_HEADER': Stores them into message headers. 'EXCHANGE_PROPERTY': Stores them into exchange properties. ) One of: [MAP] [MESSAGE_HEADER] [EXCHANGE_PROPERTY]";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_MODE_DEFAULT = "MAP";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_CONF = "camel.sink.endpoint.targetMapName";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_DOC = "The Exchange property name for a target document map which hold java.util.Map&lt;String, Object&gt; where the key is AtlasMap Document ID. AtlasMap populates multiple target documents into this map.";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_DEFAULT = null;
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
+    public static final Boolean CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_CONF = "camel.sink.endpoint.propertiesFile";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_DOC = "The URI of the properties file which is used for AtlasContextFactory initialization.";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_DEFAULT = null;
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
+    public static final Boolean CAMEL_SINK_ATLASMAP_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
+    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.atlasmap.lazyStartProducer";
+    public static final String CAMEL_SINK_ATLASMAP_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  [...]
+    public static final Boolean CAMEL_SINK_ATLASMAP_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_CONF = "camel.component.atlasmap.atlasContextFactory";
+    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_DOC = "To use the AtlasContextFactory otherwise a new engine is created.";
+    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_DEFAULT = null;
+    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atlasmap.basicPropertyBinding";
+    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
+    public static final Boolean CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+
+    public CamelAtlasmapSinkConnectorConfig(
+            ConfigDef config,
+            Map<String, String> parsedConfig) {
+        super(config, parsedConfig);
+    }
+
+    public CamelAtlasmapSinkConnectorConfig(Map<String, String> parsedConfig) {
+        this(conf(), parsedConfig);
+    }
+
+    public static ConfigDef conf() {
+        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
+        conf.define(CAMEL_SINK_ATLASMAP_PATH_RESOURCE_URI_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_PATH_RESOURCE_URI_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_ATLASMAP_PATH_RESOURCE_URI_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_ALLOW_CONTEXT_MAP_ALL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_ENDPOINT_ALLOW_CONTEXT_MAP_ALL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_ALLOW_CONTEXT_MAP_ALL_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_CONTENT_CACHE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_ENDPOINT_CONTENT_CACHE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_CONTENT_CACHE_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_SOURCE_MAP_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_ENDPOINT_SOURCE_MAP_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_SOURCE_MAP_NAME_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_MODE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_MODE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_MODE_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_SYNCHRONOUS_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_COMPONENT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        return conf;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkTask.java b/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkTask.java
new file mode 100644
index 0000000..a729f9d
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkTask.java
@@ -0,0 +1,39 @@
+/*
+ * 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.atlasmap;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.camel.kafkaconnector.CamelSinkTask;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelAtlasmapSinkTask extends CamelSinkTask {
+
+    @Override
+    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
+            Map<String, String> props) {
+        return new CamelAtlasmapSinkConnectorConfig(props);
+    }
+    @Override
+    protected Map<String, String> getDefaultConfig() {
+        return new HashMap<String, String>() {{
+            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "atlasmap");
+        }};
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-atlasmap-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-atlasmap-kafka-connector/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
diff --git a/connectors/camel-atlasmap-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-atlasmap-kafka-connector/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json
index 964f356..35164dc 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json
@@ -81,6 +81,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.useIAMCredentials": {
+			"name": "camel.sink.endpoint.useIAMCredentials",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.delaySeconds": {
 			"name": "camel.sink.endpoint.delaySeconds",
 			"description": "Delay sending messages for a number of seconds.",
@@ -260,6 +267,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.useIAMCredentials": {
+			"name": "camel.component.aws2-sqs.useIAMCredentials",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.delaySeconds": {
 			"name": "camel.component.aws2-sqs.delaySeconds",
 			"description": "Delay sending messages for a number of seconds.",
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json
index c819570..7684b15 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json
@@ -81,6 +81,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.useIAMCredentials": {
+			"name": "camel.source.endpoint.useIAMCredentials",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.attributeNames": {
 			"name": "camel.source.endpoint.attributeNames",
 			"description": "A list of attribute names to receive when consuming. Multiple names can be separated by comma.",
@@ -436,6 +443,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.useIAMCredentials": {
+			"name": "camel.component.aws2-sqs.useIAMCredentials",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.attributeNames": {
 			"name": "camel.component.aws2-sqs.attributeNames",
 			"description": "A list of attribute names to receive when consuming. Multiple names can be separated by comma.",
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc
index c440385..6ef24fb 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sqs.CamelAws2sqsSinkConnecto
 ----
 
 
-The camel-aws2-sqs sink connector supports 56 options, which are listed below.
+The camel-aws2-sqs sink connector supports 58 options, which are listed below.
 
 
 
@@ -40,6 +40,7 @@ The camel-aws2-sqs sink connector supports 56 options, which are listed below.
 | *camel.sink.endpoint.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.sink.endpoint.delaySeconds* | Delay sending messages for a number of seconds. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 when the first message is processed then cre [...]
 | *camel.sink.endpoint.messageDeduplicationIdStrategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
@@ -68,6 +69,7 @@ The camel-aws2-sqs sink connector supports 56 options, which are listed below.
 | *camel.component.aws2-sqs.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.component.aws2-sqs.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-sqs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-sqs.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-sqs.delaySeconds* | Delay sending messages for a number of seconds. | null | false | MEDIUM
 | *camel.component.aws2-sqs.lazyStartProducer* | 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 when the first message is processed the [...]
 | *camel.component.aws2-sqs.messageDeduplicationId Strategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc
index 88d9b18..8556305 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sqs.CamelAws2sqsSourceConnec
 ----
 
 
-The camel-aws2-sqs source connector supports 91 options, which are listed below.
+The camel-aws2-sqs source connector supports 93 options, which are listed below.
 
 
 
@@ -40,6 +40,7 @@ The camel-aws2-sqs source connector supports 91 options, which are listed below.
 | *camel.source.endpoint.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.source.endpoint.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.source.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.source.endpoint.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.source.endpoint.attributeNames* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | null | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM
@@ -95,6 +96,7 @@ The camel-aws2-sqs source connector supports 91 options, which are listed below.
 | *camel.component.aws2-sqs.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.component.aws2-sqs.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-sqs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-sqs.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-sqs.attributeNames* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | null | false | MEDIUM
 | *camel.component.aws2-sqs.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.component.aws2-sqs.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSinkConnectorConfig.java b/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSinkConnectorConfig.java
index d8b55a5..360c59d 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSinkConnectorConfig.java
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSinkConnectorConfig.java
@@ -57,6 +57,9 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_CONF = "camel.sink.endpoint.useIAMCredentials";
+    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_CONF = "camel.sink.endpoint.delaySeconds";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_DOC = "Delay sending messages for a number of seconds.";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_DEFAULT = null;
@@ -141,6 +144,9 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-sqs.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_CONF = "camel.component.aws2-sqs.useIAMCredentials";
+    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_CONF = "camel.component.aws2-sqs.delaySeconds";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_DOC = "Delay sending messages for a number of seconds.";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_DEFAULT = null;
@@ -216,6 +222,7 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DOC);
@@ -244,6 +251,7 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DOC);
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java b/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java
index 2bee40e..44e5044 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java
@@ -59,6 +59,9 @@ public class CamelAws2sqsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.source.endpoint.trustAllCertificates";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_CONF = "camel.source.endpoint.useIAMCredentials";
+    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_CONF = "camel.source.endpoint.attributeNames";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_DOC = "A list of attribute names to receive when consuming. Multiple names can be separated by comma.";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_DEFAULT = null;
@@ -224,6 +227,9 @@ public class CamelAws2sqsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-sqs.trustAllCertificates";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_CONF = "camel.component.aws2-sqs.useIAMCredentials";
+    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_CONF = "camel.component.aws2-sqs.attributeNames";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_DOC = "A list of attribute names to receive when consuming. Multiple names can be separated by comma.";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_DEFAULT = null;
@@ -323,6 +329,7 @@ public class CamelAws2sqsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWS2SQS_ENDPOINT_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_CONCURRENT_CONSUMERS_DOC);
@@ -378,6 +385,7 @@ public class CamelAws2sqsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWS2SQS_COMPONENT_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_CONCURRENT_CONSUMERS_DOC);
diff --git a/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-sink.json b/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-sink.json
index fe3b13d..fcf267d 100644
--- a/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-sink.json
+++ b/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-sink.json
@@ -98,6 +98,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.regex": {
+			"name": "camel.sink.endpoint.regex",
+			"description": "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.serviceClient": {
 			"name": "camel.sink.endpoint.serviceClient",
 			"description": "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations on a blob are availa [...]
@@ -276,6 +282,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.azure-storage-blob.regex": {
+			"name": "camel.component.azure-storage-blob.regex",
+			"description": "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.azure-storage-blob.serviceClient": {
 			"name": "camel.component.azure-storage-blob.serviceClient",
 			"description": "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations on a blob are availa [...]
diff --git a/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-source.json b/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-source.json
index 92bdb2f..26374df 100644
--- a/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-source.json
+++ b/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-source.json
@@ -98,6 +98,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.regex": {
+			"name": "camel.source.endpoint.regex",
+			"description": "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.serviceClient": {
 			"name": "camel.source.endpoint.serviceClient",
 			"description": "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations on a blob are availa [...]
@@ -226,6 +232,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.azure-storage-blob.regex": {
+			"name": "camel.component.azure-storage-blob.regex",
+			"description": "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.azure-storage-blob.serviceClient": {
 			"name": "camel.component.azure-storage-blob.serviceClient",
 			"description": "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations on a blob are availa [...]
diff --git a/connectors/camel-azure-storage-blob-kafka-connector/src/main/docs/camel-azure-storage-blob-kafka-sink-connector.adoc b/connectors/camel-azure-storage-blob-kafka-connector/src/main/docs/camel-azure-storage-blob-kafka-sink-connector.adoc
index eb964c1..7ccac04 100644
--- a/connectors/camel-azure-storage-blob-kafka-connector/src/main/docs/camel-azure-storage-blob-kafka-sink-connector.adoc
+++ b/connectors/camel-azure-storage-blob-kafka-connector/src/main/docs/camel-azure-storage-blob-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.azurestorageblob.CamelAzurestora
 ----
 
 
-The camel-azure-storage-blob sink connector supports 55 options, which are listed below.
+The camel-azure-storage-blob sink connector supports 57 options, which are listed below.
 
 
 
@@ -43,6 +43,7 @@ The camel-azure-storage-blob sink connector supports 55 options, which are liste
 | *camel.sink.endpoint.maxResultsPerPage* | Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxResultsPerPage or specifies a value greater than 5,000, the server will return up to 5,000 items. | null | false | MEDIUM
 | *camel.sink.endpoint.maxRetryRequests* | Specifies the maximum number of additional HTTP Get requests that will be made while reading the data from a response body. | 0 | false | MEDIUM
 | *camel.sink.endpoint.prefix* | Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs. | null | false | MEDIUM
+| *camel.sink.endpoint.regex* | Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored. | null | false | MEDIUM
 | *camel.sink.endpoint.serviceClient* | Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations [...]
 | *camel.sink.endpoint.timeout* | An optional timeout value beyond which a RuntimeException will be raised. | null | false | MEDIUM
 | *camel.sink.endpoint.blobSequenceNumber* | A user-controlled value that you can use to track requests. The value of the sequence number must be between 0 and 263 - 1.The default value is 0. | "0" | false | MEDIUM
@@ -70,6 +71,7 @@ The camel-azure-storage-blob sink connector supports 55 options, which are liste
 | *camel.component.azure-storage-blob.maxResultsPer Page* | Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxResultsPerPage or specifies a value greater than 5,000, the server will return up to 5,000 items. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.maxRetry Requests* | Specifies the maximum number of additional HTTP Get requests that will be made while reading the data from a response body. | 0 | false | MEDIUM
 | *camel.component.azure-storage-blob.prefix* | Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs. | null | false | MEDIUM
+| *camel.component.azure-storage-blob.regex* | Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.serviceClient* | Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), [...]
 | *camel.component.azure-storage-blob.timeout* | An optional timeout value beyond which a RuntimeException will be raised. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.blobSequence Number* | A user-controlled value that you can use to track requests. The value of the sequence number must be between 0 and 263 - 1.The default value is 0. | "0" | false | MEDIUM
diff --git a/connectors/camel-azure-storage-blob-kafka-connector/src/main/docs/camel-azure-storage-blob-kafka-source-connector.adoc b/connectors/camel-azure-storage-blob-kafka-connector/src/main/docs/camel-azure-storage-blob-kafka-source-connector.adoc
index 1d42bda..aa2e872 100644
--- a/connectors/camel-azure-storage-blob-kafka-connector/src/main/docs/camel-azure-storage-blob-kafka-source-connector.adoc
+++ b/connectors/camel-azure-storage-blob-kafka-connector/src/main/docs/camel-azure-storage-blob-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.azurestorageblob.CamelAzurestora
 ----
 
 
-The camel-azure-storage-blob source connector supports 39 options, which are listed below.
+The camel-azure-storage-blob source connector supports 41 options, which are listed below.
 
 
 
@@ -43,6 +43,7 @@ The camel-azure-storage-blob source connector supports 39 options, which are lis
 | *camel.source.endpoint.maxResultsPerPage* | Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxResultsPerPage or specifies a value greater than 5,000, the server will return up to 5,000 items. | null | false | MEDIUM
 | *camel.source.endpoint.maxRetryRequests* | Specifies the maximum number of additional HTTP Get requests that will be made while reading the data from a response body. | 0 | false | MEDIUM
 | *camel.source.endpoint.prefix* | Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs. | null | false | MEDIUM
+| *camel.source.endpoint.regex* | Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored. | null | false | MEDIUM
 | *camel.source.endpoint.serviceClient* | Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operatio [...]
 | *camel.source.endpoint.timeout* | An optional timeout value beyond which a RuntimeException will be raised. | null | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
@@ -63,6 +64,7 @@ The camel-azure-storage-blob source connector supports 39 options, which are lis
 | *camel.component.azure-storage-blob.maxResultsPer Page* | Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxResultsPerPage or specifies a value greater than 5,000, the server will return up to 5,000 items. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.maxRetry Requests* | Specifies the maximum number of additional HTTP Get requests that will be made while reading the data from a response body. | 0 | false | MEDIUM
 | *camel.component.azure-storage-blob.prefix* | Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs. | null | false | MEDIUM
+| *camel.component.azure-storage-blob.regex* | Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.serviceClient* | Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), [...]
 | *camel.component.azure-storage-blob.timeout* | An optional timeout value beyond which a RuntimeException will be raised. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.bridgeError Handler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
diff --git a/connectors/camel-azure-storage-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblob/CamelAzurestorageblobSinkConnectorConfig.java b/connectors/camel-azure-storage-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblob/CamelAzurestorageblobSinkConnectorConfig.java
index 2c16eba..96d5949 100644
--- a/connectors/camel-azure-storage-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblob/CamelAzurestorageblobSinkConnectorConfig.java
+++ b/connectors/camel-azure-storage-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblob/CamelAzurestorageblobSinkConnectorConfig.java
@@ -68,6 +68,9 @@ public class CamelAzurestorageblobSinkConnectorConfig
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_PREFIX_CONF = "camel.sink.endpoint.prefix";
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_PREFIX_DOC = "Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs.";
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_PREFIX_DEFAULT = null;
+    public static final String CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_REGEX_CONF = "camel.sink.endpoint.regex";
+    public static final String CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_REGEX_DOC = "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.";
+    public static final String CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_REGEX_DEFAULT = null;
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_CONF = "camel.sink.endpoint.serviceClient";
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_DOC = "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceCli [...]
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_DEFAULT = null;
@@ -149,6 +152,9 @@ public class CamelAzurestorageblobSinkConnectorConfig
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_PREFIX_CONF = "camel.component.azure-storage-blob.prefix";
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_PREFIX_DOC = "Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs.";
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_PREFIX_DEFAULT = null;
+    public static final String CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_REGEX_CONF = "camel.component.azure-storage-blob.regex";
+    public static final String CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_REGEX_DOC = "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.";
+    public static final String CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_REGEX_DEFAULT = null;
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_CONF = "camel.component.azure-storage-blob.serviceClient";
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_DOC = "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceCl [...]
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_DEFAULT = null;
@@ -219,6 +225,7 @@ public class CamelAzurestorageblobSinkConnectorConfig
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_MAX_RESULTS_PER_PAGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_MAX_RESULTS_PER_PAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_MAX_RESULTS_PER_PAGE_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_MAX_RETRY_REQUESTS_CONF, ConfigDef.Type.INT, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_MAX_RETRY_REQUESTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_MAX_RETRY_REQUESTS_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_PREFIX_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_PREFIX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_PREFIX_DOC);
+        conf.define(CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_REGEX_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_REGEX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_REGEX_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_TIMEOUT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_TIMEOUT_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_BLOB_SEQUENCE_NUMBER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_BLOB_SEQUENCE_NUMBER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_BLOB_SEQUENCE_NUMBER_DOC);
@@ -246,6 +253,7 @@ public class CamelAzurestorageblobSinkConnectorConfig
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_MAX_RESULTS_PER_PAGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_MAX_RESULTS_PER_PAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_MAX_RESULTS_PER_PAGE_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_MAX_RETRY_REQUESTS_CONF, ConfigDef.Type.INT, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_MAX_RETRY_REQUESTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_MAX_RETRY_REQUESTS_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_PREFIX_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_PREFIX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_PREFIX_DOC);
+        conf.define(CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_REGEX_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_REGEX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_REGEX_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_TIMEOUT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_TIMEOUT_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_BLOB_SEQUENCE_NUMBER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_BLOB_SEQUENCE_NUMBER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_BLOB_SEQUENCE_NUMBER_DOC);
diff --git a/connectors/camel-azure-storage-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblob/CamelAzurestorageblobSourceConnectorConfig.java b/connectors/camel-azure-storage-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblob/CamelAzurestorageblobSourceConnectorConfig.java
index dcf272e..d2125f2 100644
--- a/connectors/camel-azure-storage-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblob/CamelAzurestorageblobSourceConnectorConfig.java
+++ b/connectors/camel-azure-storage-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblob/CamelAzurestorageblobSourceConnectorConfig.java
@@ -68,6 +68,9 @@ public class CamelAzurestorageblobSourceConnectorConfig
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_PREFIX_CONF = "camel.source.endpoint.prefix";
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_PREFIX_DOC = "Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs.";
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_PREFIX_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_REGEX_CONF = "camel.source.endpoint.regex";
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_REGEX_DOC = "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.";
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_REGEX_DEFAULT = null;
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_CONF = "camel.source.endpoint.serviceClient";
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_DOC = "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceC [...]
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_DEFAULT = null;
@@ -128,6 +131,9 @@ public class CamelAzurestorageblobSourceConnectorConfig
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_PREFIX_CONF = "camel.component.azure-storage-blob.prefix";
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_PREFIX_DOC = "Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs.";
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_PREFIX_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_REGEX_CONF = "camel.component.azure-storage-blob.regex";
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_REGEX_DOC = "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.";
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_REGEX_DEFAULT = null;
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_CONF = "camel.component.azure-storage-blob.serviceClient";
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_DOC = "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobService [...]
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_DEFAULT = null;
@@ -171,6 +177,7 @@ public class CamelAzurestorageblobSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_MAX_RESULTS_PER_PAGE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_MAX_RESULTS_PER_PAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_MAX_RESULTS_PER_PAGE_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_MAX_RETRY_REQUESTS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_MAX_RETRY_REQUESTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_MAX_RETRY_REQUESTS_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_PREFIX_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_PREFIX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_PREFIX_DOC);
+        conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_REGEX_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_REGEX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_REGEX_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_TIMEOUT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_TIMEOUT_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
@@ -191,6 +198,7 @@ public class CamelAzurestorageblobSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_MAX_RESULTS_PER_PAGE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_MAX_RESULTS_PER_PAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_MAX_RESULTS_PER_PAGE_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_MAX_RETRY_REQUESTS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_MAX_RETRY_REQUESTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_MAX_RETRY_REQUESTS_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_PREFIX_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_PREFIX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_PREFIX_DOC);
+        conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_REGEX_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_REGEX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_REGEX_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_TIMEOUT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_TIMEOUT_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
diff --git a/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-sink.json b/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-sink.json
index 4fe21c2..0d2f926 100644
--- a/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-sink.json
+++ b/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-sink.json
@@ -31,8 +31,8 @@
 		"camel.sink.endpoint.bucket": {
 			"name": "camel.sink.endpoint.bucket",
 			"description": "The bucket to use",
-			"priority": "MEDIUM",
-			"required": "false"
+			"priority": "HIGH",
+			"required": "true"
 		},
 		"camel.sink.endpoint.collection": {
 			"name": "camel.sink.endpoint.collection",
diff --git a/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-source.json b/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-source.json
index f592523..59fba50 100644
--- a/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-source.json
+++ b/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-source.json
@@ -31,8 +31,8 @@
 		"camel.source.endpoint.bucket": {
 			"name": "camel.source.endpoint.bucket",
 			"description": "The bucket to use",
-			"priority": "MEDIUM",
-			"required": "false"
+			"priority": "HIGH",
+			"required": "true"
 		},
 		"camel.source.endpoint.collection": {
 			"name": "camel.source.endpoint.collection",
diff --git a/connectors/camel-couchbase-kafka-connector/src/main/docs/camel-couchbase-kafka-sink-connector.adoc b/connectors/camel-couchbase-kafka-connector/src/main/docs/camel-couchbase-kafka-sink-connector.adoc
index ae2f60d..25299ae 100644
--- a/connectors/camel-couchbase-kafka-connector/src/main/docs/camel-couchbase-kafka-sink-connector.adoc
+++ b/connectors/camel-couchbase-kafka-connector/src/main/docs/camel-couchbase-kafka-sink-connector.adoc
@@ -32,7 +32,7 @@ The camel-couchbase sink connector supports 23 options, which are listed below.
 | *camel.sink.path.protocol* | The protocol to use | null | true | HIGH
 | *camel.sink.path.hostname* | The hostname to use | null | true | HIGH
 | *camel.sink.path.port* | The port number to use | 8091 | false | MEDIUM
-| *camel.sink.endpoint.bucket* | The bucket to use | null | false | MEDIUM
+| *camel.sink.endpoint.bucket* | The bucket to use | null | true | HIGH
 | *camel.sink.endpoint.collection* | The collection to use | null | false | MEDIUM
 | *camel.sink.endpoint.key* | The key to use | null | false | MEDIUM
 | *camel.sink.endpoint.scope* | The scope to use | null | false | MEDIUM
diff --git a/connectors/camel-couchbase-kafka-connector/src/main/docs/camel-couchbase-kafka-source-connector.adoc b/connectors/camel-couchbase-kafka-connector/src/main/docs/camel-couchbase-kafka-source-connector.adoc
index 474abfc..3d6f169 100644
--- a/connectors/camel-couchbase-kafka-connector/src/main/docs/camel-couchbase-kafka-source-connector.adoc
+++ b/connectors/camel-couchbase-kafka-connector/src/main/docs/camel-couchbase-kafka-source-connector.adoc
@@ -32,7 +32,7 @@ The camel-couchbase source connector supports 42 options, which are listed below
 | *camel.source.path.protocol* | The protocol to use | null | true | HIGH
 | *camel.source.path.hostname* | The hostname to use | null | true | HIGH
 | *camel.source.path.port* | The port number to use | 8091 | false | MEDIUM
-| *camel.source.endpoint.bucket* | The bucket to use | null | false | MEDIUM
+| *camel.source.endpoint.bucket* | The bucket to use | null | true | HIGH
 | *camel.source.endpoint.collection* | The collection to use | null | false | MEDIUM
 | *camel.source.endpoint.key* | The key to use | null | false | MEDIUM
 | *camel.source.endpoint.scope* | The scope to use | null | false | MEDIUM
diff --git a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties b/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties
index fdebdc2..3bd291f 100644
--- a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties
+++ b/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties
@@ -28,6 +28,8 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
+# The bucket to use
+camel.sink.endpoint.bucket=
 # The hostname to use
 camel.sink.path.hostname=
 # The protocol to use
diff --git a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSourceConnector.properties b/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSourceConnector.properties
index 142739b..3b55af7 100644
--- a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSourceConnector.properties
+++ b/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSourceConnector.properties
@@ -28,6 +28,8 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
+# The bucket to use
+camel.source.endpoint.bucket=
 # The hostname to use
 camel.source.path.hostname=
 # The protocol to use
diff --git a/connectors/camel-couchbase-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbase/CamelCouchbaseSinkConnectorConfig.java b/connectors/camel-couchbase-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbase/CamelCouchbaseSinkConnectorConfig.java
index 3e62553..b3e77c2 100644
--- a/connectors/camel-couchbase-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbase/CamelCouchbaseSinkConnectorConfig.java
+++ b/connectors/camel-couchbase-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbase/CamelCouchbaseSinkConnectorConfig.java
@@ -111,7 +111,7 @@ public class CamelCouchbaseSinkConnectorConfig
         conf.define(CAMEL_SINK_COUCHBASE_PATH_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_COUCHBASE_PATH_PROTOCOL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_COUCHBASE_PATH_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_COUCHBASE_PATH_HOSTNAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_COUCHBASE_PATH_HOSTNAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_COUCHBASE_PATH_HOSTNAME_DOC);
         conf.define(CAMEL_SINK_COUCHBASE_PATH_PORT_CONF, ConfigDef.Type.INT, CAMEL_SINK_COUCHBASE_PATH_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_COUCHBASE_PATH_PORT_DOC);
-        conf.define(CAMEL_SINK_COUCHBASE_ENDPOINT_BUCKET_CONF, ConfigDef.Type.STRING, CAMEL_SINK_COUCHBASE_ENDPOINT_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_COUCHBASE_ENDPOINT_BUCKET_DOC);
+        conf.define(CAMEL_SINK_COUCHBASE_ENDPOINT_BUCKET_CONF, ConfigDef.Type.STRING, CAMEL_SINK_COUCHBASE_ENDPOINT_BUCKET_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_COUCHBASE_ENDPOINT_BUCKET_DOC);
         conf.define(CAMEL_SINK_COUCHBASE_ENDPOINT_COLLECTION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_COUCHBASE_ENDPOINT_COLLECTION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_COUCHBASE_ENDPOINT_COLLECTION_DOC);
         conf.define(CAMEL_SINK_COUCHBASE_ENDPOINT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_COUCHBASE_ENDPOINT_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_COUCHBASE_ENDPOINT_KEY_DOC);
         conf.define(CAMEL_SINK_COUCHBASE_ENDPOINT_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_COUCHBASE_ENDPOINT_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_COUCHBASE_ENDPOINT_SCOPE_DOC);
diff --git a/connectors/camel-couchbase-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbase/CamelCouchbaseSourceConnectorConfig.java b/connectors/camel-couchbase-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbase/CamelCouchbaseSourceConnectorConfig.java
index 140003e..6ea88ab 100644
--- a/connectors/camel-couchbase-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbase/CamelCouchbaseSourceConnectorConfig.java
+++ b/connectors/camel-couchbase-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbase/CamelCouchbaseSourceConnectorConfig.java
@@ -168,7 +168,7 @@ public class CamelCouchbaseSourceConnectorConfig
         conf.define(CAMEL_SOURCE_COUCHBASE_PATH_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_COUCHBASE_PATH_PROTOCOL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_COUCHBASE_PATH_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_COUCHBASE_PATH_HOSTNAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_COUCHBASE_PATH_HOSTNAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_COUCHBASE_PATH_HOSTNAME_DOC);
         conf.define(CAMEL_SOURCE_COUCHBASE_PATH_PORT_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_COUCHBASE_PATH_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_COUCHBASE_PATH_PORT_DOC);
-        conf.define(CAMEL_SOURCE_COUCHBASE_ENDPOINT_BUCKET_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_COUCHBASE_ENDPOINT_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_COUCHBASE_ENDPOINT_BUCKET_DOC);
+        conf.define(CAMEL_SOURCE_COUCHBASE_ENDPOINT_BUCKET_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_COUCHBASE_ENDPOINT_BUCKET_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_COUCHBASE_ENDPOINT_BUCKET_DOC);
         conf.define(CAMEL_SOURCE_COUCHBASE_ENDPOINT_COLLECTION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_COUCHBASE_ENDPOINT_COLLECTION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_COUCHBASE_ENDPOINT_COLLECTION_DOC);
         conf.define(CAMEL_SOURCE_COUCHBASE_ENDPOINT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_COUCHBASE_ENDPOINT_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_COUCHBASE_ENDPOINT_KEY_DOC);
         conf.define(CAMEL_SOURCE_COUCHBASE_ENDPOINT_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_COUCHBASE_ENDPOINT_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_COUCHBASE_ENDPOINT_SCOPE_DOC);
diff --git a/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-sink.json b/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-sink.json
index 6fd403c..bea3a4b 100644
--- a/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-sink.json
+++ b/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-sink.json
@@ -21,6 +21,26 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.allowEmpty": {
+			"name": "camel.sink.endpoint.allowEmpty",
+			"description": "The flag to manage empty git commits",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.lazyStartProducer": {
+			"name": "camel.sink.endpoint.lazyStartProducer",
+			"description": "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 when the first message is processed then creating and starting the pr [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.operation": {
+			"name": "camel.sink.endpoint.operation",
+			"description": "The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList]",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.password": {
 			"name": "camel.sink.endpoint.password",
 			"description": "Remote repository password",
@@ -51,26 +71,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.allowEmpty": {
-			"name": "camel.sink.endpoint.allowEmpty",
-			"description": "The flag to manage empty git commits",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.lazyStartProducer": {
-			"name": "camel.sink.endpoint.lazyStartProducer",
-			"description": "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 when the first message is processed then creating and starting the pr [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.operation": {
-			"name": "camel.sink.endpoint.operation",
-			"description": "The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList]",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.basicPropertyBinding": {
 			"name": "camel.sink.endpoint.basicPropertyBinding",
 			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
diff --git a/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-source.json b/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-source.json
index 6324c50..a7f7dcd 100644
--- a/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-source.json
+++ b/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-source.json
@@ -21,36 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.password": {
-			"name": "camel.source.endpoint.password",
-			"description": "Remote repository password",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.remoteName": {
-			"name": "camel.source.endpoint.remoteName",
-			"description": "The remote repository name to use in particular operation like pull",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.remotePath": {
-			"name": "camel.source.endpoint.remotePath",
-			"description": "The remote repository path",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.tagName": {
-			"name": "camel.source.endpoint.tagName",
-			"description": "The tag name to work on",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.username": {
-			"name": "camel.source.endpoint.username",
-			"description": "Remote repository username",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bridgeErrorHandler": {
 			"name": "camel.source.endpoint.bridgeErrorHandler",
 			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
diff --git a/connectors/camel-git-kafka-connector/src/main/docs/camel-git-kafka-sink-connector.adoc b/connectors/camel-git-kafka-connector/src/main/docs/camel-git-kafka-sink-connector.adoc
index 11b02be..ba7d35c 100644
--- a/connectors/camel-git-kafka-connector/src/main/docs/camel-git-kafka-sink-connector.adoc
+++ b/connectors/camel-git-kafka-connector/src/main/docs/camel-git-kafka-sink-connector.adoc
@@ -31,14 +31,14 @@ The camel-git sink connector supports 14 options, which are listed below.
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.localPath* | Local repository path | null | true | HIGH
 | *camel.sink.endpoint.branchName* | The branch name to work on | null | false | MEDIUM
+| *camel.sink.endpoint.allowEmpty* | The flag to manage empty git commits | true | false | MEDIUM
+| *camel.sink.endpoint.lazyStartProducer* | 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 when the first message is processed then cre [...]
+| *camel.sink.endpoint.operation* | The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList] | null | false | MEDIUM
 | *camel.sink.endpoint.password* | Remote repository password | null | false | MEDIUM
 | *camel.sink.endpoint.remoteName* | The remote repository name to use in particular operation like pull | null | false | MEDIUM
 | *camel.sink.endpoint.remotePath* | The remote repository path | null | false | MEDIUM
 | *camel.sink.endpoint.tagName* | The tag name to work on | null | false | MEDIUM
 | *camel.sink.endpoint.username* | Remote repository username | null | false | MEDIUM
-| *camel.sink.endpoint.allowEmpty* | The flag to manage empty git commits | true | false | MEDIUM
-| *camel.sink.endpoint.lazyStartProducer* | 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 when the first message is processed then cre [...]
-| *camel.sink.endpoint.operation* | The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList] | null | false | MEDIUM
 | *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.git.lazyStartProducer* | 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 when the first message is processed then cre [...]
diff --git a/connectors/camel-git-kafka-connector/src/main/docs/camel-git-kafka-source-connector.adoc b/connectors/camel-git-kafka-connector/src/main/docs/camel-git-kafka-source-connector.adoc
index 8d96def..f3f93a9 100644
--- a/connectors/camel-git-kafka-connector/src/main/docs/camel-git-kafka-source-connector.adoc
+++ b/connectors/camel-git-kafka-connector/src/main/docs/camel-git-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.git.CamelGitSourceConnector
 ----
 
 
-The camel-git source connector supports 15 options, which are listed below.
+The camel-git source connector supports 10 options, which are listed below.
 
 
 
@@ -31,11 +31,6 @@ The camel-git source connector supports 15 options, which are listed below.
 | Name | Description | Default | Required | Priority
 | *camel.source.path.localPath* | Local repository path | null | true | HIGH
 | *camel.source.endpoint.branchName* | The branch name to work on | null | false | MEDIUM
-| *camel.source.endpoint.password* | Remote repository password | null | false | MEDIUM
-| *camel.source.endpoint.remoteName* | The remote repository name to use in particular operation like pull | null | false | MEDIUM
-| *camel.source.endpoint.remotePath* | The remote repository path | null | false | MEDIUM
-| *camel.source.endpoint.tagName* | The tag name to work on | null | false | MEDIUM
-| *camel.source.endpoint.username* | Remote repository username | null | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.type* | The consumer type One of: [commit] [tag] [branch] | null | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
diff --git a/connectors/camel-git-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/git/CamelGitSinkConnectorConfig.java b/connectors/camel-git-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/git/CamelGitSinkConnectorConfig.java
index d9012e4..55b513f 100644
--- a/connectors/camel-git-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/git/CamelGitSinkConnectorConfig.java
+++ b/connectors/camel-git-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/git/CamelGitSinkConnectorConfig.java
@@ -30,6 +30,15 @@ public class CamelGitSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_GIT_ENDPOINT_BRANCH_NAME_CONF = "camel.sink.endpoint.branchName";
     public static final String CAMEL_SINK_GIT_ENDPOINT_BRANCH_NAME_DOC = "The branch name to work on";
     public static final String CAMEL_SINK_GIT_ENDPOINT_BRANCH_NAME_DEFAULT = null;
+    public static final String CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_CONF = "camel.sink.endpoint.allowEmpty";
+    public static final String CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_DOC = "The flag to manage empty git commits";
+    public static final Boolean CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_DEFAULT = true;
+    public static final String CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
+    public static final String CAMEL_SINK_GIT_ENDPOINT_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 when t [...]
+    public static final Boolean CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_GIT_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
+    public static final String CAMEL_SINK_GIT_ENDPOINT_OPERATION_DOC = "The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList]";
+    public static final String CAMEL_SINK_GIT_ENDPOINT_OPERATION_DEFAULT = null;
     public static final String CAMEL_SINK_GIT_ENDPOINT_PASSWORD_CONF = "camel.sink.endpoint.password";
     public static final String CAMEL_SINK_GIT_ENDPOINT_PASSWORD_DOC = "Remote repository password";
     public static final String CAMEL_SINK_GIT_ENDPOINT_PASSWORD_DEFAULT = null;
@@ -45,15 +54,6 @@ public class CamelGitSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_GIT_ENDPOINT_USERNAME_CONF = "camel.sink.endpoint.username";
     public static final String CAMEL_SINK_GIT_ENDPOINT_USERNAME_DOC = "Remote repository username";
     public static final String CAMEL_SINK_GIT_ENDPOINT_USERNAME_DEFAULT = null;
-    public static final String CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_CONF = "camel.sink.endpoint.allowEmpty";
-    public static final String CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_DOC = "The flag to manage empty git commits";
-    public static final Boolean CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_DEFAULT = true;
-    public static final String CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
-    public static final String CAMEL_SINK_GIT_ENDPOINT_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 when t [...]
-    public static final Boolean CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_GIT_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
-    public static final String CAMEL_SINK_GIT_ENDPOINT_OPERATION_DOC = "The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList]";
-    public static final String CAMEL_SINK_GIT_ENDPOINT_OPERATION_DEFAULT = null;
     public static final String CAMEL_SINK_GIT_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
     public static final String CAMEL_SINK_GIT_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
     public static final Boolean CAMEL_SINK_GIT_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
@@ -81,14 +81,14 @@ public class CamelGitSinkConnectorConfig extends CamelSinkConnectorConfig {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_GIT_PATH_LOCAL_PATH_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GIT_PATH_LOCAL_PATH_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_GIT_PATH_LOCAL_PATH_DOC);
         conf.define(CAMEL_SINK_GIT_ENDPOINT_BRANCH_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GIT_ENDPOINT_BRANCH_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_BRANCH_NAME_DOC);
+        conf.define(CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_DOC);
+        conf.define(CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_GIT_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GIT_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_OPERATION_DOC);
         conf.define(CAMEL_SINK_GIT_ENDPOINT_PASSWORD_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GIT_ENDPOINT_PASSWORD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_PASSWORD_DOC);
         conf.define(CAMEL_SINK_GIT_ENDPOINT_REMOTE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GIT_ENDPOINT_REMOTE_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_REMOTE_NAME_DOC);
         conf.define(CAMEL_SINK_GIT_ENDPOINT_REMOTE_PATH_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GIT_ENDPOINT_REMOTE_PATH_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_REMOTE_PATH_DOC);
         conf.define(CAMEL_SINK_GIT_ENDPOINT_TAG_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GIT_ENDPOINT_TAG_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_TAG_NAME_DOC);
         conf.define(CAMEL_SINK_GIT_ENDPOINT_USERNAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GIT_ENDPOINT_USERNAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_USERNAME_DOC);
-        conf.define(CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_DOC);
-        conf.define(CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_GIT_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GIT_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_OPERATION_DOC);
         conf.define(CAMEL_SINK_GIT_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GIT_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_GIT_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GIT_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_GIT_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GIT_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_COMPONENT_LAZY_START_PRODUCER_DOC);
diff --git a/connectors/camel-git-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/git/CamelGitSourceConnectorConfig.java b/connectors/camel-git-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/git/CamelGitSourceConnectorConfig.java
index d9b975d..9bddcef 100644
--- a/connectors/camel-git-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/git/CamelGitSourceConnectorConfig.java
+++ b/connectors/camel-git-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/git/CamelGitSourceConnectorConfig.java
@@ -30,21 +30,6 @@ public class CamelGitSourceConnectorConfig extends CamelSourceConnectorConfig {
     public static final String CAMEL_SOURCE_GIT_ENDPOINT_BRANCH_NAME_CONF = "camel.source.endpoint.branchName";
     public static final String CAMEL_SOURCE_GIT_ENDPOINT_BRANCH_NAME_DOC = "The branch name to work on";
     public static final String CAMEL_SOURCE_GIT_ENDPOINT_BRANCH_NAME_DEFAULT = null;
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_PASSWORD_CONF = "camel.source.endpoint.password";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_PASSWORD_DOC = "Remote repository password";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_PASSWORD_DEFAULT = null;
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_NAME_CONF = "camel.source.endpoint.remoteName";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_NAME_DOC = "The remote repository name to use in particular operation like pull";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_NAME_DEFAULT = null;
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_PATH_CONF = "camel.source.endpoint.remotePath";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_PATH_DOC = "The remote repository path";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_PATH_DEFAULT = null;
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_TAG_NAME_CONF = "camel.source.endpoint.tagName";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_TAG_NAME_DOC = "The tag name to work on";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_TAG_NAME_DEFAULT = null;
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_USERNAME_CONF = "camel.source.endpoint.username";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_USERNAME_DOC = "Remote repository username";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_USERNAME_DEFAULT = null;
     public static final String CAMEL_SOURCE_GIT_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_GIT_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
     public static final Boolean CAMEL_SOURCE_GIT_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
@@ -84,11 +69,6 @@ public class CamelGitSourceConnectorConfig extends CamelSourceConnectorConfig {
         ConfigDef conf = new ConfigDef(CamelSourceConnectorConfig.conf());
         conf.define(CAMEL_SOURCE_GIT_PATH_LOCAL_PATH_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GIT_PATH_LOCAL_PATH_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_GIT_PATH_LOCAL_PATH_DOC);
         conf.define(CAMEL_SOURCE_GIT_ENDPOINT_BRANCH_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GIT_ENDPOINT_BRANCH_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GIT_ENDPOINT_BRANCH_NAME_DOC);
-        conf.define(CAMEL_SOURCE_GIT_ENDPOINT_PASSWORD_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GIT_ENDPOINT_PASSWORD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GIT_ENDPOINT_PASSWORD_DOC);
-        conf.define(CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_NAME_DOC);
-        conf.define(CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_PATH_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_PATH_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_PATH_DOC);
-        conf.define(CAMEL_SOURCE_GIT_ENDPOINT_TAG_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GIT_ENDPOINT_TAG_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GIT_ENDPOINT_TAG_NAME_DOC);
-        conf.define(CAMEL_SOURCE_GIT_ENDPOINT_USERNAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GIT_ENDPOINT_USERNAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GIT_ENDPOINT_USERNAME_DOC);
         conf.define(CAMEL_SOURCE_GIT_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GIT_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GIT_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_GIT_ENDPOINT_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GIT_ENDPOINT_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GIT_ENDPOINT_TYPE_DOC);
         conf.define(CAMEL_SOURCE_GIT_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GIT_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GIT_ENDPOINT_EXCEPTION_HANDLER_DOC);
diff --git a/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-sink.json b/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-sink.json
index 48dea76..fac545a 100644
--- a/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-sink.json
+++ b/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-sink.json
@@ -27,6 +27,13 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.sink.endpoint.autoDiscoverClientInterceptors": {
+			"name": "camel.sink.endpoint.autoDiscoverClientInterceptors",
+			"description": "Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.flowControlWindow": {
 			"name": "camel.sink.endpoint.flowControlWindow",
 			"description": "The HTTP\/2 flow control window size (MiB)",
diff --git a/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-source.json b/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-source.json
index cbe6e50..7233809 100644
--- a/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-source.json
+++ b/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-source.json
@@ -27,6 +27,13 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.source.endpoint.autoDiscoverClientInterceptors": {
+			"name": "camel.source.endpoint.autoDiscoverClientInterceptors",
+			"description": "Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.flowControlWindow": {
 			"name": "camel.source.endpoint.flowControlWindow",
 			"description": "The HTTP\/2 flow control window size (MiB)",
@@ -76,6 +83,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.routeControlledStreamObserver": {
+			"name": "camel.source.endpoint.routeControlledStreamObserver",
+			"description": "Lets the route to take control over stream observer. If this value is set to true, then the response observer of gRPC call will be set with the name GrpcConstants.GRPC_RESPONSE_OBSERVER in the Exchange object. Please note that the stream observer's onNext(), onError(), onCompleted() methods should be called in the route.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.exceptionHandler": {
 			"name": "camel.source.endpoint.exceptionHandler",
 			"description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
diff --git a/connectors/camel-grpc-kafka-connector/src/main/docs/camel-grpc-kafka-sink-connector.adoc b/connectors/camel-grpc-kafka-connector/src/main/docs/camel-grpc-kafka-sink-connector.adoc
index 71c1ddf..60d52b1 100644
--- a/connectors/camel-grpc-kafka-connector/src/main/docs/camel-grpc-kafka-sink-connector.adoc
+++ b/connectors/camel-grpc-kafka-connector/src/main/docs/camel-grpc-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.grpc.CamelGrpcSinkConnector
 ----
 
 
-The camel-grpc sink connector supports 25 options, which are listed below.
+The camel-grpc sink connector supports 26 options, which are listed below.
 
 
 
@@ -32,6 +32,7 @@ The camel-grpc sink connector supports 25 options, which are listed below.
 | *camel.sink.path.host* | The gRPC server host name. This is localhost or 0.0.0.0 when being a consumer or remote server host name when using producer. | null | true | HIGH
 | *camel.sink.path.port* | The gRPC local or remote server port | null | true | HIGH
 | *camel.sink.path.service* | Fully qualified service name from the protocol buffer descriptor file (package dot service definition name) | null | true | HIGH
+| *camel.sink.endpoint.autoDiscoverClientInterceptors* | Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.sink.endpoint.flowControlWindow* | The HTTP/2 flow control window size (MiB) | 1048576 | false | MEDIUM
 | *camel.sink.endpoint.maxMessageSize* | The maximum message size allowed to be received/sent (MiB) | 4194304 | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 when the first message is processed then cre [...]
diff --git a/connectors/camel-grpc-kafka-connector/src/main/docs/camel-grpc-kafka-source-connector.adoc b/connectors/camel-grpc-kafka-connector/src/main/docs/camel-grpc-kafka-source-connector.adoc
index 773f507..2e3b58b 100644
--- a/connectors/camel-grpc-kafka-connector/src/main/docs/camel-grpc-kafka-source-connector.adoc
+++ b/connectors/camel-grpc-kafka-connector/src/main/docs/camel-grpc-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.grpc.CamelGrpcSourceConnector
 ----
 
 
-The camel-grpc source connector supports 27 options, which are listed below.
+The camel-grpc source connector supports 29 options, which are listed below.
 
 
 
@@ -32,6 +32,7 @@ The camel-grpc source connector supports 27 options, which are listed below.
 | *camel.source.path.host* | The gRPC server host name. This is localhost or 0.0.0.0 when being a consumer or remote server host name when using producer. | null | true | HIGH
 | *camel.source.path.port* | The gRPC local or remote server port | null | true | HIGH
 | *camel.source.path.service* | Fully qualified service name from the protocol buffer descriptor file (package dot service definition name) | null | true | HIGH
+| *camel.source.endpoint.autoDiscoverClient Interceptors* | Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.source.endpoint.flowControlWindow* | The HTTP/2 flow control window size (MiB) | 1048576 | false | MEDIUM
 | *camel.source.endpoint.maxMessageSize* | The maximum message size allowed to be received/sent (MiB) | 4194304 | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
@@ -39,6 +40,7 @@ The camel-grpc source connector supports 27 options, which are listed below.
 | *camel.source.endpoint.forwardOnCompleted* | Determines if onCompleted events should be pushed to the Camel route. | false | false | MEDIUM
 | *camel.source.endpoint.forwardOnError* | Determines if onError events should be pushed to the Camel route. Exceptions will be set as message body. | false | false | MEDIUM
 | *camel.source.endpoint.maxConcurrentCallsPer Connection* | The maximum number of concurrent calls permitted for each incoming server connection | 2147483647 | false | MEDIUM
+| *camel.source.endpoint.routeControlledStream Observer* | Lets the route to take control over stream observer. If this value is set to true, then the response observer of gRPC call will be set with the name GrpcConstants.GRPC_RESPONSE_OBSERVER in the Exchange object. Please note that the stream observer's onNext(), onError(), onCompleted() methods should be called in the route. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
 | *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
diff --git a/connectors/camel-grpc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/grpc/CamelGrpcSinkConnectorConfig.java b/connectors/camel-grpc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/grpc/CamelGrpcSinkConnectorConfig.java
index 8ba9f67..c620088 100644
--- a/connectors/camel-grpc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/grpc/CamelGrpcSinkConnectorConfig.java
+++ b/connectors/camel-grpc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/grpc/CamelGrpcSinkConnectorConfig.java
@@ -33,6 +33,9 @@ public class CamelGrpcSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_GRPC_PATH_SERVICE_CONF = "camel.sink.path.service";
     public static final String CAMEL_SINK_GRPC_PATH_SERVICE_DOC = "Fully qualified service name from the protocol buffer descriptor file (package dot service definition name)";
     public static final String CAMEL_SINK_GRPC_PATH_SERVICE_DEFAULT = null;
+    public static final String CAMEL_SINK_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_CONF = "camel.sink.endpoint.autoDiscoverClientInterceptors";
+    public static final String CAMEL_SINK_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_DOC = "Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking.";
+    public static final Boolean CAMEL_SINK_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_DEFAULT = true;
     public static final String CAMEL_SINK_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_CONF = "camel.sink.endpoint.flowControlWindow";
     public static final String CAMEL_SINK_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_DOC = "The HTTP/2 flow control window size (MiB)";
     public static final Integer CAMEL_SINK_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_DEFAULT = 1048576;
@@ -115,6 +118,7 @@ public class CamelGrpcSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_GRPC_PATH_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GRPC_PATH_HOST_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_GRPC_PATH_HOST_DOC);
         conf.define(CAMEL_SINK_GRPC_PATH_PORT_CONF, ConfigDef.Type.INT, CAMEL_SINK_GRPC_PATH_PORT_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_GRPC_PATH_PORT_DOC);
         conf.define(CAMEL_SINK_GRPC_PATH_SERVICE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GRPC_PATH_SERVICE_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_GRPC_PATH_SERVICE_DOC);
+        conf.define(CAMEL_SINK_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_DOC);
         conf.define(CAMEL_SINK_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_CONF, ConfigDef.Type.INT, CAMEL_SINK_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_DOC);
         conf.define(CAMEL_SINK_GRPC_ENDPOINT_MAX_MESSAGE_SIZE_CONF, ConfigDef.Type.INT, CAMEL_SINK_GRPC_ENDPOINT_MAX_MESSAGE_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GRPC_ENDPOINT_MAX_MESSAGE_SIZE_DOC);
         conf.define(CAMEL_SINK_GRPC_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GRPC_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GRPC_ENDPOINT_LAZY_START_PRODUCER_DOC);
diff --git a/connectors/camel-grpc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/grpc/CamelGrpcSourceConnectorConfig.java b/connectors/camel-grpc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/grpc/CamelGrpcSourceConnectorConfig.java
index 70672c0..8e29395 100644
--- a/connectors/camel-grpc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/grpc/CamelGrpcSourceConnectorConfig.java
+++ b/connectors/camel-grpc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/grpc/CamelGrpcSourceConnectorConfig.java
@@ -35,6 +35,9 @@ public class CamelGrpcSourceConnectorConfig
     public static final String CAMEL_SOURCE_GRPC_PATH_SERVICE_CONF = "camel.source.path.service";
     public static final String CAMEL_SOURCE_GRPC_PATH_SERVICE_DOC = "Fully qualified service name from the protocol buffer descriptor file (package dot service definition name)";
     public static final String CAMEL_SOURCE_GRPC_PATH_SERVICE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_CONF = "camel.source.endpoint.autoDiscoverClientInterceptors";
+    public static final String CAMEL_SOURCE_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_DOC = "Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking.";
+    public static final Boolean CAMEL_SOURCE_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_DEFAULT = true;
     public static final String CAMEL_SOURCE_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_CONF = "camel.source.endpoint.flowControlWindow";
     public static final String CAMEL_SOURCE_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_DOC = "The HTTP/2 flow control window size (MiB)";
     public static final Integer CAMEL_SOURCE_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_DEFAULT = 1048576;
@@ -56,6 +59,9 @@ public class CamelGrpcSourceConnectorConfig
     public static final String CAMEL_SOURCE_GRPC_ENDPOINT_MAX_CONCURRENT_CALLS_PER_CONNECTION_CONF = "camel.source.endpoint.maxConcurrentCallsPerConnection";
     public static final String CAMEL_SOURCE_GRPC_ENDPOINT_MAX_CONCURRENT_CALLS_PER_CONNECTION_DOC = "The maximum number of concurrent calls permitted for each incoming server connection";
     public static final Integer CAMEL_SOURCE_GRPC_ENDPOINT_MAX_CONCURRENT_CALLS_PER_CONNECTION_DEFAULT = 2147483647;
+    public static final String CAMEL_SOURCE_GRPC_ENDPOINT_ROUTE_CONTROLLED_STREAM_OBSERVER_CONF = "camel.source.endpoint.routeControlledStreamObserver";
+    public static final String CAMEL_SOURCE_GRPC_ENDPOINT_ROUTE_CONTROLLED_STREAM_OBSERVER_DOC = "Lets the route to take control over stream observer. If this value is set to true, then the response observer of gRPC call will be set with the name GrpcConstants.GRPC_RESPONSE_OBSERVER in the Exchange object. Please note that the stream observer's onNext(), onError(), onCompleted() methods should be called in the route.";
+    public static final Boolean CAMEL_SOURCE_GRPC_ENDPOINT_ROUTE_CONTROLLED_STREAM_OBSERVER_DEFAULT = false;
     public static final String CAMEL_SOURCE_GRPC_ENDPOINT_EXCEPTION_HANDLER_CONF = "camel.source.endpoint.exceptionHandler";
     public static final String CAMEL_SOURCE_GRPC_ENDPOINT_EXCEPTION_HANDLER_DOC = "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
     public static final String CAMEL_SOURCE_GRPC_ENDPOINT_EXCEPTION_HANDLER_DEFAULT = null;
@@ -123,6 +129,7 @@ public class CamelGrpcSourceConnectorConfig
         conf.define(CAMEL_SOURCE_GRPC_PATH_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GRPC_PATH_HOST_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_GRPC_PATH_HOST_DOC);
         conf.define(CAMEL_SOURCE_GRPC_PATH_PORT_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_GRPC_PATH_PORT_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_GRPC_PATH_PORT_DOC);
         conf.define(CAMEL_SOURCE_GRPC_PATH_SERVICE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GRPC_PATH_SERVICE_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_GRPC_PATH_SERVICE_DOC);
+        conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_DOC);
         conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_DOC);
         conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_MAX_MESSAGE_SIZE_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_GRPC_ENDPOINT_MAX_MESSAGE_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_MAX_MESSAGE_SIZE_DOC);
         conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GRPC_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
@@ -130,6 +137,7 @@ public class CamelGrpcSourceConnectorConfig
         conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_FORWARD_ON_COMPLETED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GRPC_ENDPOINT_FORWARD_ON_COMPLETED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_FORWARD_ON_COMPLETED_DOC);
         conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_FORWARD_ON_ERROR_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GRPC_ENDPOINT_FORWARD_ON_ERROR_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_FORWARD_ON_ERROR_DOC);
         conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_MAX_CONCURRENT_CALLS_PER_CONNECTION_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_GRPC_ENDPOINT_MAX_CONCURRENT_CALLS_PER_CONNECTION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_MAX_CONCURRENT_CALLS_PER_CONNECTION_DOC);
+        conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_ROUTE_CONTROLLED_STREAM_OBSERVER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GRPC_ENDPOINT_ROUTE_CONTROLLED_STREAM_OBSERVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_ROUTE_CONTROLLED_STREAM_OBSERVER_DOC);
         conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GRPC_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GRPC_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_EXCHANGE_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GRPC_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
diff --git a/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-sink.json b/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-sink.json
index e1ab101..d5b3d67 100644
--- a/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-sink.json
+++ b/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-sink.json
@@ -81,8 +81,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.kafkaHeaderSerializer": {
-			"name": "camel.sink.endpoint.kafkaHeaderSerializer",
+		"camel.sink.endpoint.headerSerializer": {
+			"name": "camel.sink.endpoint.headerSerializer",
 			"description": "To use a custom KafkaHeaderSerializer to serialize kafka headers values",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -93,8 +93,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.keySerializerClass": {
-			"name": "camel.sink.endpoint.keySerializerClass",
+		"camel.sink.endpoint.keySerializer": {
+			"name": "camel.sink.endpoint.keySerializer",
 			"description": "The serializer class for keys (defaults to the same as for messages if nothing is given).",
 			"defaultValue": "\"org.apache.kafka.common.serialization.StringSerializer\"",
 			"priority": "MEDIUM",
@@ -245,8 +245,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.serializerClass": {
-			"name": "camel.sink.endpoint.serializerClass",
+		"camel.sink.endpoint.valueSerializer": {
+			"name": "camel.sink.endpoint.valueSerializer",
 			"description": "The serializer class for messages.",
 			"defaultValue": "\"org.apache.kafka.common.serialization.StringSerializer\"",
 			"priority": "MEDIUM",
@@ -526,8 +526,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.kafkaHeaderSerializer": {
-			"name": "camel.component.kafka.kafkaHeaderSerializer",
+		"camel.component.kafka.headerSerializer": {
+			"name": "camel.component.kafka.headerSerializer",
 			"description": "To use a custom KafkaHeaderSerializer to serialize kafka headers values",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -538,8 +538,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.keySerializerClass": {
-			"name": "camel.component.kafka.keySerializerClass",
+		"camel.component.kafka.keySerializer": {
+			"name": "camel.component.kafka.keySerializer",
 			"description": "The serializer class for keys (defaults to the same as for messages if nothing is given).",
 			"defaultValue": "\"org.apache.kafka.common.serialization.StringSerializer\"",
 			"priority": "MEDIUM",
@@ -690,8 +690,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.serializerClass": {
-			"name": "camel.component.kafka.serializerClass",
+		"camel.component.kafka.valueSerializer": {
+			"name": "camel.component.kafka.valueSerializer",
 			"description": "The serializer class for messages.",
 			"defaultValue": "\"org.apache.kafka.common.serialization.StringSerializer\"",
 			"priority": "MEDIUM",
diff --git a/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-source.json b/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-source.json
index bdf0daa..d2d7b87 100644
--- a/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-source.json
+++ b/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-source.json
@@ -157,6 +157,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.headerDeserializer": {
+			"name": "camel.source.endpoint.headerDeserializer",
+			"description": "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.heartbeatIntervalMs": {
 			"name": "camel.source.endpoint.heartbeatIntervalMs",
 			"description": "The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1\/3 of that value. It can be adjusted even lower to control the expected time for normal rebalances.",
@@ -164,12 +170,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.kafkaHeaderDeserializer": {
-			"name": "camel.source.endpoint.kafkaHeaderDeserializer",
-			"description": "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.keyDeserializer": {
 			"name": "camel.source.endpoint.keyDeserializer",
 			"description": "Deserializer class for key that implements the Deserializer interface.",
@@ -563,6 +563,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.kafka.headerDeserializer": {
+			"name": "camel.component.kafka.headerDeserializer",
+			"description": "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.kafka.heartbeatIntervalMs": {
 			"name": "camel.component.kafka.heartbeatIntervalMs",
 			"description": "The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1\/3 of that value. It can be adjusted even lower to control the expected time for normal rebalances.",
@@ -570,12 +576,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.kafkaHeaderDeserializer": {
-			"name": "camel.component.kafka.kafkaHeaderDeserializer",
-			"description": "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.kafka.keyDeserializer": {
 			"name": "camel.component.kafka.keyDeserializer",
 			"description": "Deserializer class for key that implements the Deserializer interface.",
diff --git a/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-sink-connector.adoc b/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-sink-connector.adoc
index b82f46e..375d202 100644
--- a/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-sink-connector.adoc
+++ b/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-sink-connector.adoc
@@ -40,9 +40,9 @@ The camel-kafka sink connector supports 134 options, which are listed below.
 | *camel.sink.endpoint.compressionCodec* | This parameter allows you to specify the compression codec for all data generated by this producer. Valid values are none, gzip and snappy. One of: [none] [gzip] [snappy] [lz4] | "none" | false | MEDIUM
 | *camel.sink.endpoint.connectionMaxIdleMs* | Close idle connections after the number of milliseconds specified by this config. | "540000" | false | MEDIUM
 | *camel.sink.endpoint.enableIdempotence* | If set to 'true' the producer will ensure that exactly one copy of each message is written in the stream. If 'false', producer retries may write duplicates of the retried message in the stream. If set to true this option will require max.in.flight.requests.per.connection to be set to 1 and retries cannot be zero and additionally acks must be set to 'all'. | false | false | MEDIUM
-| *camel.sink.endpoint.kafkaHeaderSerializer* | To use a custom KafkaHeaderSerializer to serialize kafka headers values | null | false | MEDIUM
+| *camel.sink.endpoint.headerSerializer* | To use a custom KafkaHeaderSerializer to serialize kafka headers values | null | false | MEDIUM
 | *camel.sink.endpoint.key* | The record key (or null if no key is specified). If this option has been configured then it take precedence over header KafkaConstants#KEY | null | false | MEDIUM
-| *camel.sink.endpoint.keySerializerClass* | The serializer class for keys (defaults to the same as for messages if nothing is given). | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
+| *camel.sink.endpoint.keySerializer* | The serializer class for keys (defaults to the same as for messages if nothing is given). | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 when the first message is processed then cre [...]
 | *camel.sink.endpoint.lingerMs* | The producer groups together any records that arrive in between request transmissions into a single batched request. Normally this occurs only under load when records arrive faster than they can be sent out. However in some circumstances the client may want to reduce the number of requests even under moderate load. This setting accomplishes this by adding a small amount of artificial delay that is, rather than immediately sending out a record the produc [...]
 | *camel.sink.endpoint.maxBlockMs* | The configuration controls how long sending to kafka will block. These methods can be blocked for multiple reasons. For e.g: buffer full, metadata unavailable.This configuration imposes maximum limit on the total time spent in fetching metadata, serialization of key and value, partitioning and allocation of buffer memory when doing a send(). In case of partitionsFor(), this configuration imposes a maximum time threshold on waiting for metadata | "6000 [...]
@@ -64,7 +64,7 @@ The camel-kafka sink connector supports 134 options, which are listed below.
 | *camel.sink.endpoint.retries* | Setting a value greater than zero will cause the client to resend any record whose send fails with a potentially transient error. Note that this retry is no different than if the client resent the record upon receiving the error. Allowing retries will potentially change the ordering of records because if two records are sent to a single partition, and the first fails and is retried but the second succeeds, then the second record may appear first. | "0" | [...]
 | *camel.sink.endpoint.retryBackoffMs* | Before each retry, the producer refreshes the metadata of relevant topics to see if a new leader has been elected. Since leader election takes a bit of time, this property specifies the amount of time that the producer waits before refreshing the metadata. | "100" | false | MEDIUM
 | *camel.sink.endpoint.sendBufferBytes* | Socket write buffer size | "131072" | false | MEDIUM
-| *camel.sink.endpoint.serializerClass* | The serializer class for messages. | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
+| *camel.sink.endpoint.valueSerializer* | The serializer class for messages. | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
 | *camel.sink.endpoint.workerPool* | To use a custom worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. If using this option then you must handle the lifecycle of the thread pool to shut the pool down when no longer needed. | null | false | MEDIUM
 | *camel.sink.endpoint.workerPoolCoreSize* | Number of core threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | "10" | false | MEDIUM
 | *camel.sink.endpoint.workerPoolMaxSize* | Maximum number of threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | "20" | false | MEDIUM
@@ -107,9 +107,9 @@ The camel-kafka sink connector supports 134 options, which are listed below.
 | *camel.component.kafka.compressionCodec* | This parameter allows you to specify the compression codec for all data generated by this producer. Valid values are none, gzip and snappy. One of: [none] [gzip] [snappy] [lz4] | "none" | false | MEDIUM
 | *camel.component.kafka.connectionMaxIdleMs* | Close idle connections after the number of milliseconds specified by this config. | "540000" | false | MEDIUM
 | *camel.component.kafka.enableIdempotence* | If set to 'true' the producer will ensure that exactly one copy of each message is written in the stream. If 'false', producer retries may write duplicates of the retried message in the stream. If set to true this option will require max.in.flight.requests.per.connection to be set to 1 and retries cannot be zero and additionally acks must be set to 'all'. | false | false | MEDIUM
-| *camel.component.kafka.kafkaHeaderSerializer* | To use a custom KafkaHeaderSerializer to serialize kafka headers values | null | false | MEDIUM
+| *camel.component.kafka.headerSerializer* | To use a custom KafkaHeaderSerializer to serialize kafka headers values | null | false | MEDIUM
 | *camel.component.kafka.key* | The record key (or null if no key is specified). If this option has been configured then it take precedence over header KafkaConstants#KEY | null | false | MEDIUM
-| *camel.component.kafka.keySerializerClass* | The serializer class for keys (defaults to the same as for messages if nothing is given). | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
+| *camel.component.kafka.keySerializer* | The serializer class for keys (defaults to the same as for messages if nothing is given). | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
 | *camel.component.kafka.lazyStartProducer* | 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 when the first message is processed then c [...]
 | *camel.component.kafka.lingerMs* | The producer groups together any records that arrive in between request transmissions into a single batched request. Normally this occurs only under load when records arrive faster than they can be sent out. However in some circumstances the client may want to reduce the number of requests even under moderate load. This setting accomplishes this by adding a small amount of artificial delay that is, rather than immediately sending out a record the prod [...]
 | *camel.component.kafka.maxBlockMs* | The configuration controls how long sending to kafka will block. These methods can be blocked for multiple reasons. For e.g: buffer full, metadata unavailable.This configuration imposes maximum limit on the total time spent in fetching metadata, serialization of key and value, partitioning and allocation of buffer memory when doing a send(). In case of partitionsFor(), this configuration imposes a maximum time threshold on waiting for metadata | "60 [...]
@@ -131,7 +131,7 @@ The camel-kafka sink connector supports 134 options, which are listed below.
 | *camel.component.kafka.retries* | Setting a value greater than zero will cause the client to resend any record whose send fails with a potentially transient error. Note that this retry is no different than if the client resent the record upon receiving the error. Allowing retries will potentially change the ordering of records because if two records are sent to a single partition, and the first fails and is retried but the second succeeds, then the second record may appear first. | "0" [...]
 | *camel.component.kafka.retryBackoffMs* | Before each retry, the producer refreshes the metadata of relevant topics to see if a new leader has been elected. Since leader election takes a bit of time, this property specifies the amount of time that the producer waits before refreshing the metadata. | "100" | false | MEDIUM
 | *camel.component.kafka.sendBufferBytes* | Socket write buffer size | "131072" | false | MEDIUM
-| *camel.component.kafka.serializerClass* | The serializer class for messages. | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
+| *camel.component.kafka.valueSerializer* | The serializer class for messages. | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
 | *camel.component.kafka.workerPool* | To use a custom worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. If using this option then you must handle the lifecycle of the thread pool to shut the pool down when no longer needed. | null | false | MEDIUM
 | *camel.component.kafka.workerPoolCoreSize* | Number of core threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | "10" | false | MEDIUM
 | *camel.component.kafka.workerPoolMaxSize* | Maximum number of threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | "20" | false | MEDIUM
diff --git a/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-source-connector.adoc b/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-source-connector.adoc
index 41f8248..d0d3a71 100644
--- a/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-source-connector.adoc
+++ b/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-source-connector.adoc
@@ -51,8 +51,8 @@ The camel-kafka source connector supports 121 options, which are listed below.
 | *camel.source.endpoint.fetchMinBytes* | The minimum amount of data the server should return for a fetch request. If insufficient data is available the request will wait for that much data to accumulate before answering the request. | "1" | false | MEDIUM
 | *camel.source.endpoint.fetchWaitMaxMs* | The maximum amount of time the server will block before answering the fetch request if there isn't sufficient data to immediately satisfy fetch.min.bytes | "500" | false | MEDIUM
 | *camel.source.endpoint.groupId* | A string that uniquely identifies the group of consumer processes to which this consumer belongs. By setting the same group id multiple processes indicate that they are all part of the same consumer group. This option is required for consumers. | null | false | MEDIUM
+| *camel.source.endpoint.headerDeserializer* | To use a custom KafkaHeaderDeserializer to deserialize kafka headers values | null | false | MEDIUM
 | *camel.source.endpoint.heartbeatIntervalMs* | The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1/3 of that value. It can be adjusted even lower to control the expected time for normal r [...]
-| *camel.source.endpoint.kafkaHeaderDeserializer* | To use a custom KafkaHeaderDeserializer to deserialize kafka headers values | null | false | MEDIUM
 | *camel.source.endpoint.keyDeserializer* | Deserializer class for key that implements the Deserializer interface. | "org.apache.kafka.common.serialization.StringDeserializer" | false | MEDIUM
 | *camel.source.endpoint.maxPartitionFetchBytes* | The maximum amount of data per-partition the server will return. The maximum total memory used for a request will be #partitions max.partition.fetch.bytes. This size must be at least as large as the maximum message size the server allows or else it is possible for the producer to send messages larger than the consumer can fetch. If that happens, the consumer can get stuck trying to fetch a large message on a certain partition. | "1048576 [...]
 | *camel.source.endpoint.maxPollIntervalMs* | The maximum delay between invocations of poll() when using consumer group management. This places an upper bound on the amount of time that the consumer can be idle before fetching more records. If poll() is not called before expiration of this timeout, then the consumer is considered failed and the group will rebalance in order to reassign the partitions to another member. | null | false | MEDIUM
@@ -112,8 +112,8 @@ The camel-kafka source connector supports 121 options, which are listed below.
 | *camel.component.kafka.fetchMinBytes* | The minimum amount of data the server should return for a fetch request. If insufficient data is available the request will wait for that much data to accumulate before answering the request. | "1" | false | MEDIUM
 | *camel.component.kafka.fetchWaitMaxMs* | The maximum amount of time the server will block before answering the fetch request if there isn't sufficient data to immediately satisfy fetch.min.bytes | "500" | false | MEDIUM
 | *camel.component.kafka.groupId* | A string that uniquely identifies the group of consumer processes to which this consumer belongs. By setting the same group id multiple processes indicate that they are all part of the same consumer group. This option is required for consumers. | null | false | MEDIUM
+| *camel.component.kafka.headerDeserializer* | To use a custom KafkaHeaderDeserializer to deserialize kafka headers values | null | false | MEDIUM
 | *camel.component.kafka.heartbeatIntervalMs* | The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1/3 of that value. It can be adjusted even lower to control the expected time for normal r [...]
-| *camel.component.kafka.kafkaHeaderDeserializer* | To use a custom KafkaHeaderDeserializer to deserialize kafka headers values | null | false | MEDIUM
 | *camel.component.kafka.keyDeserializer* | Deserializer class for key that implements the Deserializer interface. | "org.apache.kafka.common.serialization.StringDeserializer" | false | MEDIUM
 | *camel.component.kafka.maxPartitionFetchBytes* | The maximum amount of data per-partition the server will return. The maximum total memory used for a request will be #partitions max.partition.fetch.bytes. This size must be at least as large as the maximum message size the server allows or else it is possible for the producer to send messages larger than the consumer can fetch. If that happens, the consumer can get stuck trying to fetch a large message on a certain partition. | "1048576 [...]
 | *camel.component.kafka.maxPollIntervalMs* | The maximum delay between invocations of poll() when using consumer group management. This places an upper bound on the amount of time that the consumer can be idle before fetching more records. If poll() is not called before expiration of this timeout, then the consumer is considered failed and the group will rebalance in order to reassign the partitions to another member. | null | false | MEDIUM
diff --git a/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSinkConnectorConfig.java b/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSinkConnectorConfig.java
index 9fa2602..307a6b4 100644
--- a/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSinkConnectorConfig.java
+++ b/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSinkConnectorConfig.java
@@ -57,15 +57,15 @@ public class CamelKafkaSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_ENABLE_IDEMPOTENCE_CONF = "camel.sink.endpoint.enableIdempotence";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_ENABLE_IDEMPOTENCE_DOC = "If set to 'true' the producer will ensure that exactly one copy of each message is written in the stream. If 'false', producer retries may write duplicates of the retried message in the stream. If set to true this option will require max.in.flight.requests.per.connection to be set to 1 and retries cannot be zero and additionally acks must be set to 'all'.";
     public static final Boolean CAMEL_SINK_KAFKA_ENDPOINT_ENABLE_IDEMPOTENCE_DEFAULT = false;
-    public static final String CAMEL_SINK_KAFKA_ENDPOINT_KAFKA_HEADER_SERIALIZER_CONF = "camel.sink.endpoint.kafkaHeaderSerializer";
-    public static final String CAMEL_SINK_KAFKA_ENDPOINT_KAFKA_HEADER_SERIALIZER_DOC = "To use a custom KafkaHeaderSerializer to serialize kafka headers values";
-    public static final String CAMEL_SINK_KAFKA_ENDPOINT_KAFKA_HEADER_SERIALIZER_DEFAULT = null;
+    public static final String CAMEL_SINK_KAFKA_ENDPOINT_HEADER_SERIALIZER_CONF = "camel.sink.endpoint.headerSerializer";
+    public static final String CAMEL_SINK_KAFKA_ENDPOINT_HEADER_SERIALIZER_DOC = "To use a custom KafkaHeaderSerializer to serialize kafka headers values";
+    public static final String CAMEL_SINK_KAFKA_ENDPOINT_HEADER_SERIALIZER_DEFAULT = null;
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_KEY_CONF = "camel.sink.endpoint.key";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_KEY_DOC = "The record key (or null if no key is specified). If this option has been configured then it take precedence over header KafkaConstants#KEY";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_CLASS_CONF = "camel.sink.endpoint.keySerializerClass";
-    public static final String CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_CLASS_DOC = "The serializer class for keys (defaults to the same as for messages if nothing is given).";
-    public static final String CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_CLASS_DEFAULT = "org.apache.kafka.common.serialization.StringSerializer";
+    public static final String CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_CONF = "camel.sink.endpoint.keySerializer";
+    public static final String CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_DOC = "The serializer class for keys (defaults to the same as for messages if nothing is given).";
+    public static final String CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_DEFAULT = "org.apache.kafka.common.serialization.StringSerializer";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_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 when [...]
     public static final Boolean CAMEL_SINK_KAFKA_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
@@ -129,9 +129,9 @@ public class CamelKafkaSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_SEND_BUFFER_BYTES_CONF = "camel.sink.endpoint.sendBufferBytes";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_SEND_BUFFER_BYTES_DOC = "Socket write buffer size";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_SEND_BUFFER_BYTES_DEFAULT = "131072";
-    public static final String CAMEL_SINK_KAFKA_ENDPOINT_SERIALIZER_CLASS_CONF = "camel.sink.endpoint.serializerClass";
-    public static final String CAMEL_SINK_KAFKA_ENDPOINT_SERIALIZER_CLASS_DOC = "The serializer class for messages.";
-    public static final String CAMEL_SINK_KAFKA_ENDPOINT_SERIALIZER_CLASS_DEFAULT = "org.apache.kafka.common.serialization.StringSerializer";
+    public static final String CAMEL_SINK_KAFKA_ENDPOINT_VALUE_SERIALIZER_CONF = "camel.sink.endpoint.valueSerializer";
+    public static final String CAMEL_SINK_KAFKA_ENDPOINT_VALUE_SERIALIZER_DOC = "The serializer class for messages.";
+    public static final String CAMEL_SINK_KAFKA_ENDPOINT_VALUE_SERIALIZER_DEFAULT = "org.apache.kafka.common.serialization.StringSerializer";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_CONF = "camel.sink.endpoint.workerPool";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_DOC = "To use a custom worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. If using this option then you must handle the lifecycle of the thread pool to shut the pool down when no longer needed.";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_DEFAULT = null;
@@ -258,15 +258,15 @@ public class CamelKafkaSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_KAFKA_COMPONENT_ENABLE_IDEMPOTENCE_CONF = "camel.component.kafka.enableIdempotence";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_ENABLE_IDEMPOTENCE_DOC = "If set to 'true' the producer will ensure that exactly one copy of each message is written in the stream. If 'false', producer retries may write duplicates of the retried message in the stream. If set to true this option will require max.in.flight.requests.per.connection to be set to 1 and retries cannot be zero and additionally acks must be set to 'all'.";
     public static final Boolean CAMEL_SINK_KAFKA_COMPONENT_ENABLE_IDEMPOTENCE_DEFAULT = false;
-    public static final String CAMEL_SINK_KAFKA_COMPONENT_KAFKA_HEADER_SERIALIZER_CONF = "camel.component.kafka.kafkaHeaderSerializer";
-    public static final String CAMEL_SINK_KAFKA_COMPONENT_KAFKA_HEADER_SERIALIZER_DOC = "To use a custom KafkaHeaderSerializer to serialize kafka headers values";
-    public static final String CAMEL_SINK_KAFKA_COMPONENT_KAFKA_HEADER_SERIALIZER_DEFAULT = null;
+    public static final String CAMEL_SINK_KAFKA_COMPONENT_HEADER_SERIALIZER_CONF = "camel.component.kafka.headerSerializer";
+    public static final String CAMEL_SINK_KAFKA_COMPONENT_HEADER_SERIALIZER_DOC = "To use a custom KafkaHeaderSerializer to serialize kafka headers values";
+    public static final String CAMEL_SINK_KAFKA_COMPONENT_HEADER_SERIALIZER_DEFAULT = null;
     public static final String CAMEL_SINK_KAFKA_COMPONENT_KEY_CONF = "camel.component.kafka.key";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_KEY_DOC = "The record key (or null if no key is specified). If this option has been configured then it take precedence over header KafkaConstants#KEY";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_CLASS_CONF = "camel.component.kafka.keySerializerClass";
-    public static final String CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_CLASS_DOC = "The serializer class for keys (defaults to the same as for messages if nothing is given).";
-    public static final String CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_CLASS_DEFAULT = "org.apache.kafka.common.serialization.StringSerializer";
+    public static final String CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_CONF = "camel.component.kafka.keySerializer";
+    public static final String CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_DOC = "The serializer class for keys (defaults to the same as for messages if nothing is given).";
+    public static final String CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_DEFAULT = "org.apache.kafka.common.serialization.StringSerializer";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.kafka.lazyStartProducer";
     public static final String CAMEL_SINK_KAFKA_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_KAFKA_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
@@ -330,9 +330,9 @@ public class CamelKafkaSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_KAFKA_COMPONENT_SEND_BUFFER_BYTES_CONF = "camel.component.kafka.sendBufferBytes";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_SEND_BUFFER_BYTES_DOC = "Socket write buffer size";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_SEND_BUFFER_BYTES_DEFAULT = "131072";
-    public static final String CAMEL_SINK_KAFKA_COMPONENT_SERIALIZER_CLASS_CONF = "camel.component.kafka.serializerClass";
-    public static final String CAMEL_SINK_KAFKA_COMPONENT_SERIALIZER_CLASS_DOC = "The serializer class for messages.";
-    public static final String CAMEL_SINK_KAFKA_COMPONENT_SERIALIZER_CLASS_DEFAULT = "org.apache.kafka.common.serialization.StringSerializer";
+    public static final String CAMEL_SINK_KAFKA_COMPONENT_VALUE_SERIALIZER_CONF = "camel.component.kafka.valueSerializer";
+    public static final String CAMEL_SINK_KAFKA_COMPONENT_VALUE_SERIALIZER_DOC = "The serializer class for messages.";
+    public static final String CAMEL_SINK_KAFKA_COMPONENT_VALUE_SERIALIZER_DEFAULT = "org.apache.kafka.common.serialization.StringSerializer";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_CONF = "camel.component.kafka.workerPool";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_DOC = "To use a custom worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. If using this option then you must handle the lifecycle of the thread pool to shut the pool down when no longer needed.";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_DEFAULT = null;
@@ -450,9 +450,9 @@ public class CamelKafkaSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_COMPRESSION_CODEC_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_COMPRESSION_CODEC_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_COMPRESSION_CODEC_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_CONNECTION_MAX_IDLE_MS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_CONNECTION_MAX_IDLE_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_CONNECTION_MAX_IDLE_MS_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_ENABLE_IDEMPOTENCE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_KAFKA_ENDPOINT_ENABLE_IDEMPOTENCE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_ENABLE_IDEMPOTENCE_DOC);
-        conf.define(CAMEL_SINK_KAFKA_ENDPOINT_KAFKA_HEADER_SERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_KAFKA_HEADER_SERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_KAFKA_HEADER_SERIALIZER_DOC);
+        conf.define(CAMEL_SINK_KAFKA_ENDPOINT_HEADER_SERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_HEADER_SERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_HEADER_SERIALIZER_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_KEY_DOC);
-        conf.define(CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_CLASS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_CLASS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_CLASS_DOC);
+        conf.define(CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_KAFKA_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_LINGER_MS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_LINGER_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_LINGER_MS_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_MAX_BLOCK_MS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_MAX_BLOCK_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_MAX_BLOCK_MS_DOC);
@@ -474,7 +474,7 @@ public class CamelKafkaSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_RETRIES_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_RETRIES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_RETRIES_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_RETRY_BACKOFF_MS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_RETRY_BACKOFF_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_RETRY_BACKOFF_MS_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_SEND_BUFFER_BYTES_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_SEND_BUFFER_BYTES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_SEND_BUFFER_BYTES_DOC);
-        conf.define(CAMEL_SINK_KAFKA_ENDPOINT_SERIALIZER_CLASS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_SERIALIZER_CLASS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_SERIALIZER_CLASS_DOC);
+        conf.define(CAMEL_SINK_KAFKA_ENDPOINT_VALUE_SERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_VALUE_SERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_VALUE_SERIALIZER_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_CORE_SIZE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_CORE_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_CORE_SIZE_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_MAX_SIZE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_MAX_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_MAX_SIZE_DOC);
@@ -517,9 +517,9 @@ public class CamelKafkaSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_COMPRESSION_CODEC_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_COMPRESSION_CODEC_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_COMPRESSION_CODEC_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_CONNECTION_MAX_IDLE_MS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_CONNECTION_MAX_IDLE_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_CONNECTION_MAX_IDLE_MS_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_ENABLE_IDEMPOTENCE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_KAFKA_COMPONENT_ENABLE_IDEMPOTENCE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_ENABLE_IDEMPOTENCE_DOC);
-        conf.define(CAMEL_SINK_KAFKA_COMPONENT_KAFKA_HEADER_SERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_KAFKA_HEADER_SERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_KAFKA_HEADER_SERIALIZER_DOC);
+        conf.define(CAMEL_SINK_KAFKA_COMPONENT_HEADER_SERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_HEADER_SERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_HEADER_SERIALIZER_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_KEY_DOC);
-        conf.define(CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_CLASS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_CLASS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_CLASS_DOC);
+        conf.define(CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_KAFKA_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_LINGER_MS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_LINGER_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_LINGER_MS_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_MAX_BLOCK_MS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_MAX_BLOCK_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_MAX_BLOCK_MS_DOC);
@@ -541,7 +541,7 @@ public class CamelKafkaSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_RETRIES_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_RETRIES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_RETRIES_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_RETRY_BACKOFF_MS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_RETRY_BACKOFF_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_RETRY_BACKOFF_MS_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_SEND_BUFFER_BYTES_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_SEND_BUFFER_BYTES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_SEND_BUFFER_BYTES_DOC);
-        conf.define(CAMEL_SINK_KAFKA_COMPONENT_SERIALIZER_CLASS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_SERIALIZER_CLASS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_SERIALIZER_CLASS_DOC);
+        conf.define(CAMEL_SINK_KAFKA_COMPONENT_VALUE_SERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_VALUE_SERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_VALUE_SERIALIZER_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_CORE_SIZE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_CORE_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_CORE_SIZE_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_MAX_SIZE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_MAX_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_MAX_SIZE_DOC);
diff --git a/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSourceConnectorConfig.java b/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSourceConnectorConfig.java
index 9c7d084..255baa8 100644
--- a/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSourceConnectorConfig.java
+++ b/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSourceConnectorConfig.java
@@ -92,12 +92,12 @@ public class CamelKafkaSourceConnectorConfig
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_GROUP_ID_CONF = "camel.source.endpoint.groupId";
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_GROUP_ID_DOC = "A string that uniquely identifies the group of consumer processes to which this consumer belongs. By setting the same group id multiple processes indicate that they are all part of the same consumer group. This option is required for consumers.";
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_GROUP_ID_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_HEADER_DESERIALIZER_CONF = "camel.source.endpoint.headerDeserializer";
+    public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_HEADER_DESERIALIZER_DOC = "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values";
+    public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_HEADER_DESERIALIZER_DEFAULT = null;
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_HEARTBEAT_INTERVAL_MS_CONF = "camel.source.endpoint.heartbeatIntervalMs";
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_HEARTBEAT_INTERVAL_MS_DOC = "The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1/3 of that value. It can be adjusted even lower t [...]
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_HEARTBEAT_INTERVAL_MS_DEFAULT = "3000";
-    public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_KAFKA_HEADER_DESERIALIZER_CONF = "camel.source.endpoint.kafkaHeaderDeserializer";
-    public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_KAFKA_HEADER_DESERIALIZER_DOC = "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values";
-    public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_KAFKA_HEADER_DESERIALIZER_DEFAULT = null;
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_KEY_DESERIALIZER_CONF = "camel.source.endpoint.keyDeserializer";
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_KEY_DESERIALIZER_DOC = "Deserializer class for key that implements the Deserializer interface.";
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_KEY_DESERIALIZER_DEFAULT = "org.apache.kafka.common.serialization.StringDeserializer";
@@ -275,12 +275,12 @@ public class CamelKafkaSourceConnectorConfig
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_GROUP_ID_CONF = "camel.component.kafka.groupId";
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_GROUP_ID_DOC = "A string that uniquely identifies the group of consumer processes to which this consumer belongs. By setting the same group id multiple processes indicate that they are all part of the same consumer group. This option is required for consumers.";
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_GROUP_ID_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KAFKA_COMPONENT_HEADER_DESERIALIZER_CONF = "camel.component.kafka.headerDeserializer";
+    public static final String CAMEL_SOURCE_KAFKA_COMPONENT_HEADER_DESERIALIZER_DOC = "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values";
+    public static final String CAMEL_SOURCE_KAFKA_COMPONENT_HEADER_DESERIALIZER_DEFAULT = null;
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_HEARTBEAT_INTERVAL_MS_CONF = "camel.component.kafka.heartbeatIntervalMs";
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_HEARTBEAT_INTERVAL_MS_DOC = "The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1/3 of that value. It can be adjusted even lower  [...]
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_HEARTBEAT_INTERVAL_MS_DEFAULT = "3000";
-    public static final String CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_HEADER_DESERIALIZER_CONF = "camel.component.kafka.kafkaHeaderDeserializer";
-    public static final String CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_HEADER_DESERIALIZER_DOC = "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values";
-    public static final String CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_HEADER_DESERIALIZER_DEFAULT = null;
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_KEY_DESERIALIZER_CONF = "camel.component.kafka.keyDeserializer";
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_KEY_DESERIALIZER_DOC = "Deserializer class for key that implements the Deserializer interface.";
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_KEY_DESERIALIZER_DEFAULT = "org.apache.kafka.common.serialization.StringDeserializer";
@@ -424,8 +424,8 @@ public class CamelKafkaSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_FETCH_MIN_BYTES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_FETCH_MIN_BYTES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_FETCH_MIN_BYTES_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_FETCH_WAIT_MAX_MS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_FETCH_WAIT_MAX_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_FETCH_WAIT_MAX_MS_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_GROUP_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_GROUP_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_GROUP_ID_DOC);
+        conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_HEADER_DESERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_HEADER_DESERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_HEADER_DESERIALIZER_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_HEARTBEAT_INTERVAL_MS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_HEARTBEAT_INTERVAL_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_HEARTBEAT_INTERVAL_MS_DOC);
-        conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_KAFKA_HEADER_DESERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_KAFKA_HEADER_DESERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_KAFKA_HEADER_DESERIALIZER_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_KEY_DESERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_KEY_DESERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_KEY_DESERIALIZER_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_MAX_PARTITION_FETCH_BYTES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_MAX_PARTITION_FETCH_BYTES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_MAX_PARTITION_FETCH_BYTES_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_MAX_POLL_INTERVAL_MS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_MAX_POLL_INTERVAL_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_MAX_POLL_INTERVAL_MS_DOC);
@@ -485,8 +485,8 @@ public class CamelKafkaSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_FETCH_MIN_BYTES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_FETCH_MIN_BYTES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_FETCH_MIN_BYTES_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_FETCH_WAIT_MAX_MS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_FETCH_WAIT_MAX_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_FETCH_WAIT_MAX_MS_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_GROUP_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_GROUP_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_GROUP_ID_DOC);
+        conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_HEADER_DESERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_HEADER_DESERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_HEADER_DESERIALIZER_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_HEARTBEAT_INTERVAL_MS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_HEARTBEAT_INTERVAL_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_HEARTBEAT_INTERVAL_MS_DOC);
-        conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_HEADER_DESERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_HEADER_DESERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_HEADER_DESERIALIZER_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_KEY_DESERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_KEY_DESERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_KEY_DESERIALIZER_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_MAX_PARTITION_FETCH_BYTES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_MAX_PARTITION_FETCH_BYTES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_MAX_PARTITION_FETCH_BYTES_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_MAX_POLL_INTERVAL_MS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_MAX_POLL_INTERVAL_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_MAX_POLL_INTERVAL_MS_DOC);
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/pom.xml b/connectors/camel-kubernetes-custom-resources-kafka-connector/pom.xml
new file mode 100644
index 0000000..fab4a01
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/pom.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.camel.kafkaconnector</groupId>
+    <artifactId>connectors</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>camel-kubernetes-custom-resources-kafka-connector</artifactId>
+  <name>Camel-Kafka-Connector :: kubernetes-custom-resources</name>
+  <description>Camel Kafka Connector for kubernetes-custom-resources</description>
+  <dependencies>
+    <!-- Kafka -->
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>connect-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>connect-transforms</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <!-- Camel -->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-kubernetes</artifactId>
+    </dependency>
+    <!--START OF GENERATED CODE-->
+    <dependency>
+      <groupId>org.apache.camel.kafkaconnector</groupId>
+      <artifactId>camel-kafka-connector</artifactId>
+    </dependency>
+    <!--END OF GENERATED CODE-->
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${version.maven.surefire.plugin}</version>
+        <configuration>
+          <failIfNoTests>false</failIfNoTests>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${version.maven.jar}</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.5.1</version>
+        <inherited>true</inherited>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.5.3</version>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/package.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <!--START OF GENERATED CODE-->
+  <repositories>
+    <!-- camel-jira -->
+    <repository>
+      <id>atlassian-public</id>
+      <url>https://packages.atlassian.com/maven-external</url>
+      <name>Atlassian Public Repo</name>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+    <!-- camel-ipfs and camel-weka -->
+    <repository>
+      <id>jboss.thirdparty</id>
+      <name>JBoss Thirdparty Repository</name>
+      <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+  </repositories>
+  <!--END OF GENERATED CODE-->
+</project>
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/descriptors/connector-sink.properties b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/descriptors/connector-sink.properties
new file mode 100644
index 0000000..b0d326b
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/descriptors/connector-sink.properties
@@ -0,0 +1 @@
+camel-kubernetes-custom-resources-sink
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/descriptors/connector-source.properties b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/descriptors/connector-source.properties
new file mode 100644
index 0000000..eacedbd
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/descriptors/connector-source.properties
@@ -0,0 +1 @@
+camel-kubernetes-custom-resources-source
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/resources/camel-kubernetes-custom-resources-sink.json
similarity index 51%
copy from camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json
copy to connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/resources/camel-kubernetes-custom-resources-sink.json
index 4fe21c2..bff86b3 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/resources/camel-kubernetes-custom-resources-sink.json
@@ -1,61 +1,48 @@
 {
 	"connector": {
-		"class": "org.apache.camel.kafkaconnector.couchbase.CamelCouchbaseSinkConnector",
-		"artifactId": "camel-couchbase-kafka-connector",
+		"class": "org.apache.camel.kafkaconnector.kubernetescustomresources.CamelKubernetescustomresourcesSinkConnector",
+		"artifactId": "camel-kubernetes-custom-resources-kafka-connector",
 		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-couchbase-sink",
+		"id": "camel-kubernetes-custom-resources-sink",
 		"type": "sink",
 		"version": "0.7.0-SNAPSHOT",
-		"description": "Query Couchbase Views with a poll strategy and\/or perform various operations against Couchbase databases."
+		"description": "Perform operations on Kubernetes Custom Resources and get notified on Deployment changes."
 	},
 	"properties": {
-		"camel.sink.path.protocol": {
-			"name": "camel.sink.path.protocol",
-			"description": "The protocol to use",
+		"camel.sink.path.masterUrl": {
+			"name": "camel.sink.path.masterUrl",
+			"description": "Kubernetes Master url",
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.path.hostname": {
-			"name": "camel.sink.path.hostname",
-			"description": "The hostname to use",
-			"priority": "HIGH",
-			"required": "true"
-		},
-		"camel.sink.path.port": {
-			"name": "camel.sink.path.port",
-			"description": "The port number to use",
-			"defaultValue": "8091",
+		"camel.sink.endpoint.apiVersion": {
+			"name": "camel.sink.endpoint.apiVersion",
+			"description": "The Kubernetes API Version to use",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.bucket": {
-			"name": "camel.sink.endpoint.bucket",
-			"description": "The bucket to use",
+		"camel.sink.endpoint.dnsDomain": {
+			"name": "camel.sink.endpoint.dnsDomain",
+			"description": "The dns domain, used for ServiceCall EIP",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.collection": {
-			"name": "camel.sink.endpoint.collection",
-			"description": "The collection to use",
+		"camel.sink.endpoint.kubernetesClient": {
+			"name": "camel.sink.endpoint.kubernetesClient",
+			"description": "Default KubernetesClient to use if provided",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.key": {
-			"name": "camel.sink.endpoint.key",
-			"description": "The key to use",
+		"camel.sink.endpoint.portName": {
+			"name": "camel.sink.endpoint.portName",
+			"description": "The port name, used for ServiceCall EIP",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.scope": {
-			"name": "camel.sink.endpoint.scope",
-			"description": "The scope to use",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.autoStartIdForInserts": {
-			"name": "camel.sink.endpoint.autoStartIdForInserts",
-			"description": "Define if we want an autostart Id when we are doing an insert operation",
-			"defaultValue": "false",
+		"camel.sink.endpoint.portProtocol": {
+			"name": "camel.sink.endpoint.portProtocol",
+			"description": "The port protocol, used for ServiceCall EIP",
+			"defaultValue": "\"tcp\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -68,97 +55,115 @@
 		},
 		"camel.sink.endpoint.operation": {
 			"name": "camel.sink.endpoint.operation",
-			"description": "The operation to do",
-			"defaultValue": "\"CCB_PUT\"",
+			"description": "Producer operation to do on Kubernetes",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.persistTo": {
-			"name": "camel.sink.endpoint.persistTo",
-			"description": "Where to persist the data",
-			"defaultValue": "0",
+		"camel.sink.endpoint.basicPropertyBinding": {
+			"name": "camel.sink.endpoint.basicPropertyBinding",
+			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.producerRetryAttempts": {
-			"name": "camel.sink.endpoint.producerRetryAttempts",
-			"description": "Define the number of retry attempts",
-			"defaultValue": "2",
+		"camel.sink.endpoint.connectionTimeout": {
+			"name": "camel.sink.endpoint.connectionTimeout",
+			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.producerRetryPause": {
-			"name": "camel.sink.endpoint.producerRetryPause",
-			"description": "Define the retry pause between different attempts",
-			"defaultValue": "5000",
+		"camel.sink.endpoint.synchronous": {
+			"name": "camel.sink.endpoint.synchronous",
+			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.replicateTo": {
-			"name": "camel.sink.endpoint.replicateTo",
-			"description": "Where to replicate the data",
-			"defaultValue": "0",
+		"camel.sink.endpoint.caCertData": {
+			"name": "camel.sink.endpoint.caCertData",
+			"description": "The CA Cert Data",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.startingIdForInsertsFrom": {
-			"name": "camel.sink.endpoint.startingIdForInsertsFrom",
-			"description": "Define the starting Id where we are doing an insert operation",
+		"camel.sink.endpoint.caCertFile": {
+			"name": "camel.sink.endpoint.caCertFile",
+			"description": "The CA Cert File",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.additionalHosts": {
-			"name": "camel.sink.endpoint.additionalHosts",
-			"description": "The additional hosts",
+		"camel.sink.endpoint.clientCertData": {
+			"name": "camel.sink.endpoint.clientCertData",
+			"description": "The Client Cert Data",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
+		"camel.sink.endpoint.clientCertFile": {
+			"name": "camel.sink.endpoint.clientCertFile",
+			"description": "The Client Cert File",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.queryTimeout": {
-			"name": "camel.sink.endpoint.queryTimeout",
-			"description": "Define the operation timeout in milliseconds",
-			"defaultValue": "2500L",
+		"camel.sink.endpoint.clientKeyAlgo": {
+			"name": "camel.sink.endpoint.clientKeyAlgo",
+			"description": "The Key Algorithm used by the client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.synchronous": {
-			"name": "camel.sink.endpoint.synchronous",
-			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
-			"defaultValue": "false",
+		"camel.sink.endpoint.clientKeyData": {
+			"name": "camel.sink.endpoint.clientKeyData",
+			"description": "The Client Key data",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.clientKeyFile": {
+			"name": "camel.sink.endpoint.clientKeyFile",
+			"description": "The Client Key file",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.clientKeyPassphrase": {
+			"name": "camel.sink.endpoint.clientKeyPassphrase",
+			"description": "The Client Key Passphrase",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.oauthToken": {
+			"name": "camel.sink.endpoint.oauthToken",
+			"description": "The Auth Token",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.sink.endpoint.password": {
 			"name": "camel.sink.endpoint.password",
-			"description": "The password to use",
+			"description": "Password to connect to Kubernetes",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.trustCerts": {
+			"name": "camel.sink.endpoint.trustCerts",
+			"description": "Define if the certs we used are trusted anyway or not",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.sink.endpoint.username": {
 			"name": "camel.sink.endpoint.username",
-			"description": "The username to use",
+			"description": "Username to connect to Kubernetes",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.couchbase.lazyStartProducer": {
-			"name": "camel.component.couchbase.lazyStartProducer",
+		"camel.component.kubernetes-custom-resources.lazyStartProducer": {
+			"name": "camel.component.kubernetes-custom-resources.lazyStartProducer",
 			"description": "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 when the first message is processed then creating and starting the pr [...]
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.couchbase.basicPropertyBinding": {
-			"name": "camel.component.couchbase.basicPropertyBinding",
+		"camel.component.kubernetes-custom-resources.basicPropertyBinding": {
+			"name": "camel.component.kubernetes-custom-resources.basicPropertyBinding",
 			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
 			"defaultValue": "false",
 			"priority": "LOW",
 			"required": "false"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/resources/camel-kubernetes-custom-resources-source.json
similarity index 81%
copy from camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json
copy to connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/resources/camel-kubernetes-custom-resources-source.json
index 0088ab1..740c5a2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/resources/camel-kubernetes-custom-resources-source.json
@@ -1,12 +1,12 @@
 {
 	"connector": {
-		"class": "org.apache.camel.kafkaconnector.kuberneteshpa.CamelKuberneteshpaSourceConnector",
-		"artifactId": "camel-kubernetes-hpa-kafka-connector",
+		"class": "org.apache.camel.kafkaconnector.kubernetescustomresources.CamelKubernetescustomresourcesSourceConnector",
+		"artifactId": "camel-kubernetes-custom-resources-kafka-connector",
 		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-kubernetes-hpa-source",
+		"id": "camel-kubernetes-custom-resources-source",
 		"type": "source",
 		"version": "0.7.0-SNAPSHOT",
-		"description": "Perform operations on Kubernetes Horizontal Pod Autoscalers (HPA) and get notified on HPA changes."
+		"description": "Perform operations on Kubernetes Custom Resources and get notified on Deployment changes."
 	},
 	"properties": {
 		"camel.source.path.masterUrl": {
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
@@ -188,19 +218,19 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-hpa.bridgeErrorHandler": {
-			"name": "camel.component.kubernetes-hpa.bridgeErrorHandler",
+		"camel.component.kubernetes-custom-resources.bridgeErrorHandler": {
+			"name": "camel.component.kubernetes-custom-resources.bridgeErrorHandler",
 			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-hpa.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-hpa.basicPropertyBinding",
+		"camel.component.kubernetes-custom-resources.basicPropertyBinding": {
+			"name": "camel.component.kubernetes-custom-resources.basicPropertyBinding",
 			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
 			"defaultValue": "false",
 			"priority": "LOW",
 			"required": "false"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/assembly/package.xml b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/assembly/package.xml
new file mode 100644
index 0000000..4fd2529
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/assembly/package.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<assembly>
+  <!-- Assembles a packaged version targeting OS installation. -->
+  <id>package</id>
+  <formats>
+    <format>zip</format>
+    <format>tar.gz</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}/../..</directory>
+      <outputDirectory>${project.artifactId}/</outputDirectory>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>licenses/</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/src/main/docs</directory>
+      <outputDirectory>docs/</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>${project.artifactId}/</outputDirectory>
+      <useProjectArtifact>true</useProjectArtifact>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+      <excludes>
+        <exclude>org.apache.kafka:connect-api</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/camel-kubernetes-custom-resources-kafka-sink-connector.adoc b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/camel-kubernetes-custom-resources-kafka-sink-connector.adoc
new file mode 100644
index 0000000..7eef4e7
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/camel-kubernetes-custom-resources-kafka-sink-connector.adoc
@@ -0,0 +1,78 @@
+// kafka-connector options: START
+[[camel-kubernetes-custom-resources-kafka-connector-sink]]
+= camel-kubernetes-custom-resources-kafka-connector sink configuration
+
+When using camel-kubernetes-custom-resources-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.apache.camel.kafkaconnector</groupId>
+  <artifactId>camel-kubernetes-custom-resources-kafka-connector</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel Kafka connector version -->
+</dependency>
+----
+
+To use this Sink connector in Kafka connect you'll need to set the following connector.class
+
+[source,java]
+----
+connector.class=org.apache.camel.kafkaconnector.kubernetescustomresources.CamelKubernetescustomresourcesSinkConnector
+----
+
+
+The camel-kubernetes-custom-resources sink connector supports 25 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,1,1",options="header"]
+|===
+| Name | Description | Default | Required | Priority
+| *camel.sink.path.masterUrl* | Kubernetes Master url | null | true | HIGH
+| *camel.sink.endpoint.apiVersion* | The Kubernetes API Version to use | null | false | MEDIUM
+| *camel.sink.endpoint.dnsDomain* | The dns domain, used for ServiceCall EIP | null | false | MEDIUM
+| *camel.sink.endpoint.kubernetesClient* | Default KubernetesClient to use if provided | null | false | MEDIUM
+| *camel.sink.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
+| *camel.sink.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
+| *camel.sink.endpoint.lazyStartProducer* | 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 when the first message is processed then cre [...]
+| *camel.sink.endpoint.operation* | Producer operation to do on Kubernetes | null | false | MEDIUM
+| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
+| *camel.sink.endpoint.connectionTimeout* | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. | null | false | MEDIUM
+| *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
+| *camel.sink.endpoint.caCertData* | The CA Cert Data | null | false | MEDIUM
+| *camel.sink.endpoint.caCertFile* | The CA Cert File | null | false | MEDIUM
+| *camel.sink.endpoint.clientCertData* | The Client Cert Data | null | false | MEDIUM
+| *camel.sink.endpoint.clientCertFile* | The Client Cert File | null | false | MEDIUM
+| *camel.sink.endpoint.clientKeyAlgo* | The Key Algorithm used by the client | null | false | MEDIUM
+| *camel.sink.endpoint.clientKeyData* | The Client Key data | null | false | MEDIUM
+| *camel.sink.endpoint.clientKeyFile* | The Client Key file | null | false | MEDIUM
+| *camel.sink.endpoint.clientKeyPassphrase* | The Client Key Passphrase | null | false | MEDIUM
+| *camel.sink.endpoint.oauthToken* | The Auth Token | null | false | MEDIUM
+| *camel.sink.endpoint.password* | Password to connect to Kubernetes | null | false | MEDIUM
+| *camel.sink.endpoint.trustCerts* | Define if the certs we used are trusted anyway or not | null | false | MEDIUM
+| *camel.sink.endpoint.username* | Username to connect to Kubernetes | null | false | MEDIUM
+| *camel.component.kubernetes-custom-resources.lazy StartProducer* | 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 when the first mess [...]
+| *camel.component.kubernetes-custom-resources.basic PropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+|===
+
+
+
+The camel-kubernetes-custom-resources sink connector has no converters out of the box.
+
+
+
+
+
+The camel-kubernetes-custom-resources sink connector has no transforms out of the box.
+
+
+
+
+
+The camel-kubernetes-custom-resources sink connector has no aggregation strategies out of the box.
+
+
+
+
+// kafka-connector options: END
diff --git a/connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/camel-kubernetes-custom-resources-kafka-source-connector.adoc
similarity index 66%
copy from connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc
copy to connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/camel-kubernetes-custom-resources-kafka-source-connector.adoc
index 8268d5a..392112e 100644
--- a/connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/camel-kubernetes-custom-resources-kafka-source-connector.adoc
@@ -1,14 +1,14 @@
 // kafka-connector options: START
-[[camel-kubernetes-pods-kafka-connector-source]]
-= camel-kubernetes-pods-kafka-connector source configuration
+[[camel-kubernetes-custom-resources-kafka-connector-source]]
+= camel-kubernetes-custom-resources-kafka-connector source configuration
 
-When using camel-kubernetes-pods-kafka-connector as source make sure to use the following Maven dependency to have support for the connector:
+When using camel-kubernetes-custom-resources-kafka-connector as source make sure to use the following Maven dependency to have support for the connector:
 
 [source,xml]
 ----
 <dependency>
   <groupId>org.apache.camel.kafkaconnector</groupId>
-  <artifactId>camel-kubernetes-pods-kafka-connector</artifactId>
+  <artifactId>camel-kubernetes-custom-resources-kafka-connector</artifactId>
   <version>x.x.x</version>
   <!-- use the same version as your Camel Kafka connector version -->
 </dependency>
@@ -18,11 +18,11 @@ To use this Source connector in Kafka connect you'll need to set the following c
 
 [source,java]
 ----
-connector.class=org.apache.camel.kafkaconnector.kubernetespods.CamelKubernetespodsSourceConnector
+connector.class=org.apache.camel.kafkaconnector.kubernetescustomresources.CamelKubernetescustomresourcesSourceConnector
 ----
 
 
-The camel-kubernetes-pods source connector supports 31 options, which are listed below.
+The camel-kubernetes-custom-resources source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-pods source connector supports 31 options, which are listed
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
@@ -58,23 +63,27 @@ The camel-kubernetes-pods source connector supports 31 options, which are listed
 | *camel.source.endpoint.password* | Password to connect to Kubernetes | null | false | MEDIUM
 | *camel.source.endpoint.trustCerts* | Define if the certs we used are trusted anyway or not | null | false | MEDIUM
 | *camel.source.endpoint.username* | Username to connect to Kubernetes | null | false | MEDIUM
-| *camel.component.kubernetes-pods.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.kubernetes-pods.basicProperty Binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.kubernetes-custom-resources.bridge ErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | fal [...]
+| *camel.component.kubernetes-custom-resources.basic PropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
 |===
 
 
 
-The camel-kubernetes-pods sink connector has no converters out of the box.
+The camel-kubernetes-custom-resources sink connector has no converters out of the box.
 
 
 
 
 
-The camel-kubernetes-pods sink connector has no transforms out of the box.
+The camel-kubernetes-custom-resources sink connector has no transforms out of the box.
 
 
 
 
 
-The camel-kubernetes-pods sink connector has no aggregation strategies out of the box.
+The camel-kubernetes-custom-resources sink connector has no aggregation strategies out of the box.
+
+
+
+
 // kafka-connector options: END
diff --git a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/examples/CamelKubernetescustomresourcesSinkConnector.properties
similarity index 85%
copy from connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties
copy to connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/examples/CamelKubernetescustomresourcesSinkConnector.properties
index fdebdc2..f39c901 100644
--- a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/examples/CamelKubernetescustomresourcesSinkConnector.properties
@@ -15,8 +15,8 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-name=CamelCouchbaseSinkConnector
-connector.class=org.apache.camel.kafkaconnector.couchbase.CamelCouchbaseSinkConnector
+name=CamelKubernetes-custom-resourcesSinkConnector
+connector.class=org.apache.camel.kafkaconnector.kubernetescustomresources.CamelKubernetescustomresourcesSinkConnector
 tasks.max=1
 
 # use the kafka converters that better suit your needs, these are just defaults:
@@ -28,8 +28,6 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The hostname to use
-camel.sink.path.hostname=
-# The protocol to use
-camel.sink.path.protocol=
+# Kubernetes Master url
+camel.sink.path.masterUrl=
 
diff --git a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSourceConnector.properties b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/examples/CamelKubernetescustomresourcesSourceConnector.properties
similarity index 85%
copy from connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSourceConnector.properties
copy to connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/examples/CamelKubernetescustomresourcesSourceConnector.properties
index 142739b..5763aac 100644
--- a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSourceConnector.properties
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/examples/CamelKubernetescustomresourcesSourceConnector.properties
@@ -15,8 +15,8 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-name=CamelCouchbaseSourceConnector
-connector.class=org.apache.camel.kafkaconnector.couchbase.CamelCouchbaseSourceConnector
+name=CamelKubernetes-custom-resourcesSourceConnector
+connector.class=org.apache.camel.kafkaconnector.kubernetescustomresources.CamelKubernetescustomresourcesSourceConnector
 tasks.max=1
 
 # use the kafka converters that better suit your needs, these are just defaults:
@@ -28,8 +28,6 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The hostname to use
-camel.source.path.hostname=
-# The protocol to use
-camel.source.path.protocol=
+# Kubernetes Master url
+camel.source.path.masterUrl=
 
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSinkConnector.java b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSinkConnector.java
new file mode 100644
index 0000000..1661951
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSinkConnector.java
@@ -0,0 +1,37 @@
+/*
+ * 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.kubernetescustomresources;
+
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.kafka.common.config.ConfigDef;
+import org.apache.kafka.connect.connector.Task;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelKubernetescustomresourcesSinkConnector
+        extends
+            CamelSinkConnector {
+
+    @Override
+    public ConfigDef config() {
+        return CamelKubernetescustomresourcesSinkConnectorConfig.conf();
+    }
+    @Override
+    public Class<? extends Task> taskClass() {
+        return CamelKubernetescustomresourcesSinkTask.class;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSinkConnectorConfig.java b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSinkConnectorConfig.java
new file mode 100644
index 0000000..176107b
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSinkConnectorConfig.java
@@ -0,0 +1,145 @@
+/*
+ * 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.kubernetescustomresources;
+
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.kafka.common.config.ConfigDef;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelKubernetescustomresourcesSinkConnectorConfig
+        extends
+            CamelSinkConnectorConfig {
+
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_CONF = "camel.sink.path.masterUrl";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_DOC = "Kubernetes Master url";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_CONF = "camel.sink.endpoint.apiVersion";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_DOC = "The Kubernetes API Version to use";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_CONF = "camel.sink.endpoint.dnsDomain";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_DOC = "The dns domain, used for ServiceCall EIP";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_CONF = "camel.sink.endpoint.kubernetesClient";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_DOC = "Default KubernetesClient to use if provided";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_CONF = "camel.sink.endpoint.portName";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_DOC = "The port name, used for ServiceCall EIP";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_CONF = "camel.sink.endpoint.portProtocol";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_DOC = "The port protocol, used for ServiceCall EIP";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_DEFAULT = "tcp";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_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 handle [...]
+    public static final Boolean CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OPERATION_DOC = "Producer operation to do on Kubernetes";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
+    public static final Boolean CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_CONF = "camel.sink.endpoint.connectionTimeout";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_DOC = "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
+    public static final Boolean CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_CONF = "camel.sink.endpoint.caCertData";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_DOC = "The CA Cert Data";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_CONF = "camel.sink.endpoint.caCertFile";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_DOC = "The CA Cert File";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_CONF = "camel.sink.endpoint.clientCertData";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_DOC = "The Client Cert Data";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_CONF = "camel.sink.endpoint.clientCertFile";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_DOC = "The Client Cert File";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_CONF = "camel.sink.endpoint.clientKeyAlgo";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_DOC = "The Key Algorithm used by the client";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_CONF = "camel.sink.endpoint.clientKeyData";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_DOC = "The Client Key data";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_CONF = "camel.sink.endpoint.clientKeyFile";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_DOC = "The Client Key file";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_CONF = "camel.sink.endpoint.clientKeyPassphrase";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_DOC = "The Client Key Passphrase";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_CONF = "camel.sink.endpoint.oauthToken";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_DOC = "The Auth Token";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_CONF = "camel.sink.endpoint.password";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_DOC = "Password to connect to Kubernetes";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_CONF = "camel.sink.endpoint.trustCerts";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_DOC = "Define if the certs we used are trusted anyway or not";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_CONF = "camel.sink.endpoint.username";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_DOC = "Username to connect to Kubernetes";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.kubernetes-custom-resources.lazyStartProducer";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_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 handl [...]
+    public static final Boolean CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.kubernetes-custom-resources.basicPropertyBinding";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
+    public static final Boolean CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+
+    public CamelKubernetescustomresourcesSinkConnectorConfig(
+            ConfigDef config,
+            Map<String, String> parsedConfig) {
+        super(config, parsedConfig);
+    }
+
+    public CamelKubernetescustomresourcesSinkConnectorConfig(
+            Map<String, String> parsedConfig) {
+        this(conf(), parsedConfig);
+    }
+
+    public static ConfigDef conf() {
+        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        return conf;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSinkTask.java b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSinkTask.java
new file mode 100644
index 0000000..c177da9
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSinkTask.java
@@ -0,0 +1,39 @@
+/*
+ * 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.kubernetescustomresources;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.camel.kafkaconnector.CamelSinkTask;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelKubernetescustomresourcesSinkTask extends CamelSinkTask {
+
+    @Override
+    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
+            Map<String, String> props) {
+        return new CamelKubernetescustomresourcesSinkConnectorConfig(props);
+    }
+    @Override
+    protected Map<String, String> getDefaultConfig() {
+        return new HashMap<String, String>() {{
+            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "kubernetes-custom-resources");
+        }};
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSourceConnector.java b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSourceConnector.java
new file mode 100644
index 0000000..2efc733
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSourceConnector.java
@@ -0,0 +1,37 @@
+/*
+ * 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.kubernetescustomresources;
+
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.kafka.common.config.ConfigDef;
+import org.apache.kafka.connect.connector.Task;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelKubernetescustomresourcesSourceConnector
+        extends
+            CamelSourceConnector {
+
+    @Override
+    public ConfigDef config() {
+        return CamelKubernetescustomresourcesSourceConnectorConfig.conf();
+    }
+    @Override
+    public Class<? extends Task> taskClass() {
+        return CamelKubernetescustomresourcesSourceTask.class;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSourceConnectorConfig.java b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSourceConnectorConfig.java
new file mode 100644
index 0000000..8f2b656
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSourceConnectorConfig.java
@@ -0,0 +1,189 @@
+/*
+ * 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.kubernetescustomresources;
+
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
+import org.apache.kafka.common.config.ConfigDef;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelKubernetescustomresourcesSourceConnectorConfig
+        extends
+            CamelSourceConnectorConfig {
+
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_CONF = "camel.source.path.masterUrl";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_DOC = "Kubernetes Master url";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_CONF = "camel.source.endpoint.apiVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_DOC = "The Kubernetes API Version to use";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_CONF = "camel.source.endpoint.dnsDomain";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_DOC = "The dns domain, used for ServiceCall EIP";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_CONF = "camel.source.endpoint.kubernetesClient";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_DOC = "Default KubernetesClient to use if provided";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_CONF = "camel.source.endpoint.portName";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_DOC = "The port name, used for ServiceCall EIP";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_CONF = "camel.source.endpoint.portProtocol";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_DOC = "The port protocol, used for ServiceCall EIP";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_DEFAULT = "tcp";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or E [...]
+    public static final Boolean CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_GROUP_CONF = "camel.source.endpoint.crdGroup";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_GROUP_DOC = "The Consumer CRD Resource Group we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_GROUP_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_NAME_CONF = "camel.source.endpoint.crdName";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_NAME_DOC = "The Consumer CRD Resource name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_PLURAL_CONF = "camel.source.endpoint.crdPlural";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_PLURAL_DOC = "The Consumer CRD Resource Plural we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_PLURAL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_SCOPE_CONF = "camel.source.endpoint.crdScope";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_SCOPE_DOC = "The Consumer CRD Resource Scope we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_SCOPE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_VERSION_CONF = "camel.source.endpoint.crdVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_VERSION_DOC = "The Consumer CRD Resource Version we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_VERSION_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_KEY_CONF = "camel.source.endpoint.labelKey";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_KEY_DOC = "The Consumer Label key when watching at some resources";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_KEY_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_VALUE_CONF = "camel.source.endpoint.labelValue";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_VALUE_DOC = "The Consumer Label value when watching at some resources";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_VALUE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_NAMESPACE_CONF = "camel.source.endpoint.namespace";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_NAMESPACE_DOC = "The namespace";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_NAMESPACE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_POOL_SIZE_CONF = "camel.source.endpoint.poolSize";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_POOL_SIZE_DOC = "The Consumer pool size";
+    public static final Integer CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_POOL_SIZE_DEFAULT = 1;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_RESOURCE_NAME_CONF = "camel.source.endpoint.resourceName";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_RESOURCE_NAME_DOC = "The Consumer Resource Name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_RESOURCE_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCEPTION_HANDLER_CONF = "camel.source.endpoint.exceptionHandler";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCEPTION_HANDLER_DOC = "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCEPTION_HANDLER_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
+    public static final Boolean CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_CONF = "camel.source.endpoint.connectionTimeout";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_DOC = "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
+    public static final Boolean CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_CONF = "camel.source.endpoint.caCertData";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_DOC = "The CA Cert Data";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_CONF = "camel.source.endpoint.caCertFile";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_DOC = "The CA Cert File";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_CONF = "camel.source.endpoint.clientCertData";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_DOC = "The Client Cert Data";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_CONF = "camel.source.endpoint.clientCertFile";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_DOC = "The Client Cert File";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_CONF = "camel.source.endpoint.clientKeyAlgo";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_DOC = "The Key Algorithm used by the client";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_CONF = "camel.source.endpoint.clientKeyData";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_DOC = "The Client Key data";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_CONF = "camel.source.endpoint.clientKeyFile";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_DOC = "The Client Key file";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_CONF = "camel.source.endpoint.clientKeyPassphrase";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_DOC = "The Client Key Passphrase";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_CONF = "camel.source.endpoint.oauthToken";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_DOC = "The Auth Token";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_CONF = "camel.source.endpoint.password";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_DOC = "Password to connect to Kubernetes";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_CONF = "camel.source.endpoint.trustCerts";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_DOC = "Define if the certs we used are trusted anyway or not";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_CONF = "camel.source.endpoint.username";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_DOC = "Username to connect to Kubernetes";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.kubernetes-custom-resources.bridgeErrorHandler";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or  [...]
+    public static final Boolean CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.kubernetes-custom-resources.basicPropertyBinding";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
+    public static final Boolean CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+
+    public CamelKubernetescustomresourcesSourceConnectorConfig(
+            ConfigDef config,
+            Map<String, String> parsedConfig) {
+        super(config, parsedConfig);
+    }
+
+    public CamelKubernetescustomresourcesSourceConnectorConfig(
+            Map<String, String> parsedConfig) {
+        this(conf(), parsedConfig);
+    }
+
+    public static ConfigDef conf() {
+        ConfigDef conf = new ConfigDef(CamelSourceConnectorConfig.conf());
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_GROUP_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_PLURAL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_PLURAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_PLURAL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_SCOPE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_VERSION_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_KEY_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_VALUE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_NAMESPACE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_NAMESPACE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_POOL_SIZE_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_POOL_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_POOL_SIZE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_RESOURCE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_RESOURCE_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_RESOURCE_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCEPTION_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCHANGE_PATTERN_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        return conf;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSourceTask.java b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSourceTask.java
new file mode 100644
index 0000000..f22f7bc
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSourceTask.java
@@ -0,0 +1,39 @@
+/*
+ * 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.kubernetescustomresources;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
+import org.apache.camel.kafkaconnector.CamelSourceTask;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelKubernetescustomresourcesSourceTask extends CamelSourceTask {
+
+    @Override
+    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
+            Map<String, String> props) {
+        return new CamelKubernetescustomresourcesSourceConnectorConfig(props);
+    }
+    @Override
+    protected Map<String, String> getDefaultConfig() {
+        return new HashMap<String, String>() {{
+            put(CamelSourceConnectorConfig.CAMEL_SOURCE_COMPONENT_CONF, "kubernetes-custom-resources");
+        }};
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.
diff --git a/connectors/camel-kubernetes-deployments-kafka-connector/src/generated/resources/camel-kubernetes-deployments-source.json b/connectors/camel-kubernetes-deployments-kafka-connector/src/generated/resources/camel-kubernetes-deployments-source.json
index 2d6443f..bfb7af9 100644
--- a/connectors/camel-kubernetes-deployments-kafka-connector/src/generated/resources/camel-kubernetes-deployments-source.json
+++ b/connectors/camel-kubernetes-deployments-kafka-connector/src/generated/resources/camel-kubernetes-deployments-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/connectors/camel-kubernetes-deployments-kafka-connector/src/main/docs/camel-kubernetes-deployments-kafka-source-connector.adoc b/connectors/camel-kubernetes-deployments-kafka-connector/src/main/docs/camel-kubernetes-deployments-kafka-source-connector.adoc
index 50b850b..af44770 100644
--- a/connectors/camel-kubernetes-deployments-kafka-connector/src/main/docs/camel-kubernetes-deployments-kafka-source-connector.adoc
+++ b/connectors/camel-kubernetes-deployments-kafka-connector/src/main/docs/camel-kubernetes-deployments-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesdeployments.CamelKuber
 ----
 
 
-The camel-kubernetes-deployments source connector supports 31 options, which are listed below.
+The camel-kubernetes-deployments source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-deployments source connector supports 31 options, which are
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/connectors/camel-kubernetes-deployments-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesdeployments/CamelKubernetesdeploymentsSourceConnectorConfig.java b/connectors/camel-kubernetes-deployments-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesdeployments/CamelKubernetesdeploymentsSourceConnectorConfig.java
index 7f88fde..11f8530 100644
--- a/connectors/camel-kubernetes-deployments-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesdeployments/CamelKubernetesdeploymentsSourceConnectorConfig.java
+++ b/connectors/camel-kubernetes-deployments-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesdeployments/CamelKubernetesdeploymentsSourceConnectorConfig.java
@@ -47,6 +47,21 @@ public class CamelKubernetesdeploymentsSourceConnectorConfig
     public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR [...]
     public static final Boolean CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_GROUP_CONF = "camel.source.endpoint.crdGroup";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_GROUP_DOC = "The Consumer CRD Resource Group we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_GROUP_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_NAME_CONF = "camel.source.endpoint.crdName";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_NAME_DOC = "The Consumer CRD Resource name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_PLURAL_CONF = "camel.source.endpoint.crdPlural";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_PLURAL_DOC = "The Consumer CRD Resource Plural we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_PLURAL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_SCOPE_CONF = "camel.source.endpoint.crdScope";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_SCOPE_DOC = "The Consumer CRD Resource Scope we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_SCOPE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_VERSION_CONF = "camel.source.endpoint.crdVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_VERSION_DOC = "The Consumer CRD Resource Version we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_VERSION_DEFAULT = null;
     public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_LABEL_KEY_CONF = "camel.source.endpoint.labelKey";
     public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_LABEL_KEY_DOC = "The Consumer Label key when watching at some resources";
     public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_LABEL_KEY_DEFAULT = null;
@@ -140,6 +155,11 @@ public class CamelKubernetesdeploymentsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_PORT_NAME_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_PORT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_GROUP_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_PLURAL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_PLURAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_PLURAL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_SCOPE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_VERSION_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_LABEL_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_LABEL_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_LABEL_KEY_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_LABEL_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_LABEL_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_LABEL_VALUE_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_NAMESPACE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_NAMESPACE_DOC);
diff --git a/connectors/camel-kubernetes-hpa-kafka-connector/src/generated/resources/camel-kubernetes-hpa-source.json b/connectors/camel-kubernetes-hpa-kafka-connector/src/generated/resources/camel-kubernetes-hpa-source.json
index 0088ab1..d88584c 100644
--- a/connectors/camel-kubernetes-hpa-kafka-connector/src/generated/resources/camel-kubernetes-hpa-source.json
+++ b/connectors/camel-kubernetes-hpa-kafka-connector/src/generated/resources/camel-kubernetes-hpa-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/connectors/camel-kubernetes-hpa-kafka-connector/src/main/docs/camel-kubernetes-hpa-kafka-source-connector.adoc b/connectors/camel-kubernetes-hpa-kafka-connector/src/main/docs/camel-kubernetes-hpa-kafka-source-connector.adoc
index 41f8af4..7478695 100644
--- a/connectors/camel-kubernetes-hpa-kafka-connector/src/main/docs/camel-kubernetes-hpa-kafka-source-connector.adoc
+++ b/connectors/camel-kubernetes-hpa-kafka-connector/src/main/docs/camel-kubernetes-hpa-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kuberneteshpa.CamelKuberneteshpa
 ----
 
 
-The camel-kubernetes-hpa source connector supports 31 options, which are listed below.
+The camel-kubernetes-hpa source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-hpa source connector supports 31 options, which are listed
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/connectors/camel-kubernetes-hpa-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kuberneteshpa/CamelKuberneteshpaSourceConnectorConfig.java b/connectors/camel-kubernetes-hpa-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kuberneteshpa/CamelKuberneteshpaSourceConnectorConfig.java
index 350f172..3984aec 100644
--- a/connectors/camel-kubernetes-hpa-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kuberneteshpa/CamelKuberneteshpaSourceConnectorConfig.java
+++ b/connectors/camel-kubernetes-hpa-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kuberneteshpa/CamelKuberneteshpaSourceConnectorConfig.java
@@ -47,6 +47,21 @@ public class CamelKuberneteshpaSourceConnectorConfig
     public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level a [...]
     public static final Boolean CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_GROUP_CONF = "camel.source.endpoint.crdGroup";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_GROUP_DOC = "The Consumer CRD Resource Group we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_GROUP_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_NAME_CONF = "camel.source.endpoint.crdName";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_NAME_DOC = "The Consumer CRD Resource name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_PLURAL_CONF = "camel.source.endpoint.crdPlural";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_PLURAL_DOC = "The Consumer CRD Resource Plural we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_PLURAL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_SCOPE_CONF = "camel.source.endpoint.crdScope";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_SCOPE_DOC = "The Consumer CRD Resource Scope we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_SCOPE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_VERSION_CONF = "camel.source.endpoint.crdVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_VERSION_DOC = "The Consumer CRD Resource Version we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_VERSION_DEFAULT = null;
     public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_LABEL_KEY_CONF = "camel.source.endpoint.labelKey";
     public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_LABEL_KEY_DOC = "The Consumer Label key when watching at some resources";
     public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_LABEL_KEY_DEFAULT = null;
@@ -140,6 +155,11 @@ public class CamelKuberneteshpaSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_PORT_NAME_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_PORT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_GROUP_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_PLURAL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_PLURAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_PLURAL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_SCOPE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_VERSION_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_LABEL_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_LABEL_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_LABEL_KEY_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_LABEL_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_LABEL_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_LABEL_VALUE_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_NAMESPACE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_NAMESPACE_DOC);
diff --git a/connectors/camel-kubernetes-job-kafka-connector/src/generated/resources/camel-kubernetes-job-source.json b/connectors/camel-kubernetes-job-kafka-connector/src/generated/resources/camel-kubernetes-job-source.json
index 0de6735..dcea34d 100644
--- a/connectors/camel-kubernetes-job-kafka-connector/src/generated/resources/camel-kubernetes-job-source.json
+++ b/connectors/camel-kubernetes-job-kafka-connector/src/generated/resources/camel-kubernetes-job-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/connectors/camel-kubernetes-job-kafka-connector/src/main/docs/camel-kubernetes-job-kafka-source-connector.adoc b/connectors/camel-kubernetes-job-kafka-connector/src/main/docs/camel-kubernetes-job-kafka-source-connector.adoc
index 5567b8e..c004ffe 100644
--- a/connectors/camel-kubernetes-job-kafka-connector/src/main/docs/camel-kubernetes-job-kafka-source-connector.adoc
+++ b/connectors/camel-kubernetes-job-kafka-connector/src/main/docs/camel-kubernetes-job-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesjob.CamelKubernetesjob
 ----
 
 
-The camel-kubernetes-job source connector supports 31 options, which are listed below.
+The camel-kubernetes-job source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-job source connector supports 31 options, which are listed
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/connectors/camel-kubernetes-job-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesjob/CamelKubernetesjobSourceConnectorConfig.java b/connectors/camel-kubernetes-job-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesjob/CamelKubernetesjobSourceConnectorConfig.java
index cffcfdf..f0ebf5c 100644
--- a/connectors/camel-kubernetes-job-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesjob/CamelKubernetesjobSourceConnectorConfig.java
+++ b/connectors/camel-kubernetes-job-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesjob/CamelKubernetesjobSourceConnectorConfig.java
@@ -47,6 +47,21 @@ public class CamelKubernetesjobSourceConnectorConfig
     public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level a [...]
     public static final Boolean CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_GROUP_CONF = "camel.source.endpoint.crdGroup";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_GROUP_DOC = "The Consumer CRD Resource Group we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_GROUP_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_NAME_CONF = "camel.source.endpoint.crdName";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_NAME_DOC = "The Consumer CRD Resource name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_PLURAL_CONF = "camel.source.endpoint.crdPlural";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_PLURAL_DOC = "The Consumer CRD Resource Plural we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_PLURAL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_SCOPE_CONF = "camel.source.endpoint.crdScope";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_SCOPE_DOC = "The Consumer CRD Resource Scope we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_SCOPE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_VERSION_CONF = "camel.source.endpoint.crdVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_VERSION_DOC = "The Consumer CRD Resource Version we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_VERSION_DEFAULT = null;
     public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_LABEL_KEY_CONF = "camel.source.endpoint.labelKey";
     public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_LABEL_KEY_DOC = "The Consumer Label key when watching at some resources";
     public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_LABEL_KEY_DEFAULT = null;
@@ -140,6 +155,11 @@ public class CamelKubernetesjobSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_PORT_NAME_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_PORT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_GROUP_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_PLURAL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_PLURAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_PLURAL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_SCOPE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_VERSION_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_LABEL_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_LABEL_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_LABEL_KEY_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_LABEL_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_LABEL_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_LABEL_VALUE_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_NAMESPACE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_NAMESPACE_DOC);
diff --git a/connectors/camel-kubernetes-namespaces-kafka-connector/src/generated/resources/camel-kubernetes-namespaces-source.json b/connectors/camel-kubernetes-namespaces-kafka-connector/src/generated/resources/camel-kubernetes-namespaces-source.json
index 80f11cd..a38bb65 100644
--- a/connectors/camel-kubernetes-namespaces-kafka-connector/src/generated/resources/camel-kubernetes-namespaces-source.json
+++ b/connectors/camel-kubernetes-namespaces-kafka-connector/src/generated/resources/camel-kubernetes-namespaces-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/connectors/camel-kubernetes-namespaces-kafka-connector/src/main/docs/camel-kubernetes-namespaces-kafka-source-connector.adoc b/connectors/camel-kubernetes-namespaces-kafka-connector/src/main/docs/camel-kubernetes-namespaces-kafka-source-connector.adoc
index 9f4800f..f91d7d5 100644
--- a/connectors/camel-kubernetes-namespaces-kafka-connector/src/main/docs/camel-kubernetes-namespaces-kafka-source-connector.adoc
+++ b/connectors/camel-kubernetes-namespaces-kafka-connector/src/main/docs/camel-kubernetes-namespaces-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesnamespaces.CamelKubern
 ----
 
 
-The camel-kubernetes-namespaces source connector supports 31 options, which are listed below.
+The camel-kubernetes-namespaces source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-namespaces source connector supports 31 options, which are
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/connectors/camel-kubernetes-namespaces-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesnamespaces/CamelKubernetesnamespacesSourceConnectorConfig.java b/connectors/camel-kubernetes-namespaces-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesnamespaces/CamelKubernetesnamespacesSourceConnectorConfig.java
index 675e91c..9acdb73 100644
--- a/connectors/camel-kubernetes-namespaces-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesnamespaces/CamelKubernetesnamespacesSourceConnectorConfig.java
+++ b/connectors/camel-kubernetes-namespaces-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesnamespaces/CamelKubernetesnamespacesSourceConnectorConfig.java
@@ -47,6 +47,21 @@ public class CamelKubernetesnamespacesSourceConnectorConfig
     public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR  [...]
     public static final Boolean CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_GROUP_CONF = "camel.source.endpoint.crdGroup";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_GROUP_DOC = "The Consumer CRD Resource Group we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_GROUP_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_NAME_CONF = "camel.source.endpoint.crdName";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_NAME_DOC = "The Consumer CRD Resource name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_PLURAL_CONF = "camel.source.endpoint.crdPlural";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_PLURAL_DOC = "The Consumer CRD Resource Plural we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_PLURAL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_SCOPE_CONF = "camel.source.endpoint.crdScope";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_SCOPE_DOC = "The Consumer CRD Resource Scope we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_SCOPE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_VERSION_CONF = "camel.source.endpoint.crdVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_VERSION_DOC = "The Consumer CRD Resource Version we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_VERSION_DEFAULT = null;
     public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_LABEL_KEY_CONF = "camel.source.endpoint.labelKey";
     public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_LABEL_KEY_DOC = "The Consumer Label key when watching at some resources";
     public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_LABEL_KEY_DEFAULT = null;
@@ -140,6 +155,11 @@ public class CamelKubernetesnamespacesSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_PORT_NAME_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_PORT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_GROUP_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_PLURAL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_PLURAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_PLURAL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_SCOPE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_VERSION_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_LABEL_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_LABEL_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_LABEL_KEY_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_LABEL_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_LABEL_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_LABEL_VALUE_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_NAMESPACE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_NAMESPACE_DOC);
diff --git a/connectors/camel-kubernetes-nodes-kafka-connector/src/generated/resources/camel-kubernetes-nodes-source.json b/connectors/camel-kubernetes-nodes-kafka-connector/src/generated/resources/camel-kubernetes-nodes-source.json
index 6cafbfe..320bb79 100644
--- a/connectors/camel-kubernetes-nodes-kafka-connector/src/generated/resources/camel-kubernetes-nodes-source.json
+++ b/connectors/camel-kubernetes-nodes-kafka-connector/src/generated/resources/camel-kubernetes-nodes-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/connectors/camel-kubernetes-nodes-kafka-connector/src/main/docs/camel-kubernetes-nodes-kafka-source-connector.adoc b/connectors/camel-kubernetes-nodes-kafka-connector/src/main/docs/camel-kubernetes-nodes-kafka-source-connector.adoc
index 0142cb6..f894c79 100644
--- a/connectors/camel-kubernetes-nodes-kafka-connector/src/main/docs/camel-kubernetes-nodes-kafka-source-connector.adoc
+++ b/connectors/camel-kubernetes-nodes-kafka-connector/src/main/docs/camel-kubernetes-nodes-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesnodes.CamelKubernetesn
 ----
 
 
-The camel-kubernetes-nodes source connector supports 31 options, which are listed below.
+The camel-kubernetes-nodes source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-nodes source connector supports 31 options, which are liste
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/connectors/camel-kubernetes-nodes-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesnodes/CamelKubernetesnodesSourceConnectorConfig.java b/connectors/camel-kubernetes-nodes-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesnodes/CamelKubernetesnodesSourceConnectorConfig.java
index 1c92564..ed270b7 100644
--- a/connectors/camel-kubernetes-nodes-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesnodes/CamelKubernetesnodesSourceConnectorConfig.java
+++ b/connectors/camel-kubernetes-nodes-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesnodes/CamelKubernetesnodesSourceConnectorConfig.java
@@ -47,6 +47,21 @@ public class CamelKubernetesnodesSourceConnectorConfig
     public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level [...]
     public static final Boolean CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_GROUP_CONF = "camel.source.endpoint.crdGroup";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_GROUP_DOC = "The Consumer CRD Resource Group we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_GROUP_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_NAME_CONF = "camel.source.endpoint.crdName";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_NAME_DOC = "The Consumer CRD Resource name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_PLURAL_CONF = "camel.source.endpoint.crdPlural";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_PLURAL_DOC = "The Consumer CRD Resource Plural we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_PLURAL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_SCOPE_CONF = "camel.source.endpoint.crdScope";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_SCOPE_DOC = "The Consumer CRD Resource Scope we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_SCOPE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_VERSION_CONF = "camel.source.endpoint.crdVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_VERSION_DOC = "The Consumer CRD Resource Version we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_VERSION_DEFAULT = null;
     public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_LABEL_KEY_CONF = "camel.source.endpoint.labelKey";
     public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_LABEL_KEY_DOC = "The Consumer Label key when watching at some resources";
     public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_LABEL_KEY_DEFAULT = null;
@@ -140,6 +155,11 @@ public class CamelKubernetesnodesSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_PORT_NAME_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_PORT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_GROUP_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_PLURAL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_PLURAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_PLURAL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_SCOPE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_VERSION_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_LABEL_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_LABEL_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_LABEL_KEY_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_LABEL_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_LABEL_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_LABEL_VALUE_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_NAMESPACE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_NAMESPACE_DOC);
diff --git a/connectors/camel-kubernetes-pods-kafka-connector/src/generated/resources/camel-kubernetes-pods-source.json b/connectors/camel-kubernetes-pods-kafka-connector/src/generated/resources/camel-kubernetes-pods-source.json
index 983d302..1679e6e 100644
--- a/connectors/camel-kubernetes-pods-kafka-connector/src/generated/resources/camel-kubernetes-pods-source.json
+++ b/connectors/camel-kubernetes-pods-kafka-connector/src/generated/resources/camel-kubernetes-pods-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc b/connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc
index 8268d5a..0144dfe 100644
--- a/connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc
+++ b/connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetespods.CamelKubernetespo
 ----
 
 
-The camel-kubernetes-pods source connector supports 31 options, which are listed below.
+The camel-kubernetes-pods source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-pods source connector supports 31 options, which are listed
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/connectors/camel-kubernetes-pods-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetespods/CamelKubernetespodsSourceConnectorConfig.java b/connectors/camel-kubernetes-pods-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetespods/CamelKubernetespodsSourceConnectorConfig.java
index 125bbc0..925cb9b 100644
--- a/connectors/camel-kubernetes-pods-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetespods/CamelKubernetespodsSourceConnectorConfig.java
+++ b/connectors/camel-kubernetes-pods-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetespods/CamelKubernetespodsSourceConnectorConfig.java
@@ -47,6 +47,21 @@ public class CamelKubernetespodsSourceConnectorConfig
     public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level  [...]
     public static final Boolean CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_GROUP_CONF = "camel.source.endpoint.crdGroup";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_GROUP_DOC = "The Consumer CRD Resource Group we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_GROUP_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_NAME_CONF = "camel.source.endpoint.crdName";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_NAME_DOC = "The Consumer CRD Resource name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_PLURAL_CONF = "camel.source.endpoint.crdPlural";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_PLURAL_DOC = "The Consumer CRD Resource Plural we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_PLURAL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_SCOPE_CONF = "camel.source.endpoint.crdScope";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_SCOPE_DOC = "The Consumer CRD Resource Scope we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_SCOPE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_VERSION_CONF = "camel.source.endpoint.crdVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_VERSION_DOC = "The Consumer CRD Resource Version we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_VERSION_DEFAULT = null;
     public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_LABEL_KEY_CONF = "camel.source.endpoint.labelKey";
     public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_LABEL_KEY_DOC = "The Consumer Label key when watching at some resources";
     public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_LABEL_KEY_DEFAULT = null;
@@ -140,6 +155,11 @@ public class CamelKubernetespodsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_PORT_NAME_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_PORT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_GROUP_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_PLURAL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_PLURAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_PLURAL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_SCOPE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_VERSION_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_LABEL_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_LABEL_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_LABEL_KEY_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_LABEL_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_LABEL_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_LABEL_VALUE_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_NAMESPACE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_NAMESPACE_DOC);
diff --git a/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/generated/resources/camel-kubernetes-replication-controllers-source.json b/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/generated/resources/camel-kubernetes-replication-controllers-source.json
index 878a9ca..693f9c0 100644
--- a/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/generated/resources/camel-kubernetes-replication-controllers-source.json
+++ b/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/generated/resources/camel-kubernetes-replication-controllers-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/main/docs/camel-kubernetes-replication-controllers-kafka-source-connector.adoc b/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/main/docs/camel-kubernetes-replication-controllers-kafka-source-connector.adoc
index 9558c33..d02bebb 100644
--- a/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/main/docs/camel-kubernetes-replication-controllers-kafka-source-connector.adoc
+++ b/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/main/docs/camel-kubernetes-replication-controllers-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesreplicationcontrollers
 ----
 
 
-The camel-kubernetes-replication-controllers source connector supports 31 options, which are listed below.
+The camel-kubernetes-replication-controllers source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-replication-controllers source connector supports 31 option
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesreplicationcontrollers/CamelKubernetesreplicationcontrollersSourceConnectorConfig.java b/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesreplicationcontrollers/CamelKubernetesreplicationcontrollersSourceConnectorConfig.java
index b365833..c8ec87d 100644
--- a/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesreplicationcontrollers/CamelKubernetesreplicationcontrollersSourceConnectorConfig.java
+++ b/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesreplicationcontrollers/CamelKubernetesreplicationcontrollersSourceConnectorConfig.java
@@ -47,6 +47,21 @@ public class CamelKubernetesreplicationcontrollersSourceConnectorConfig
     public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WA [...]
     public static final Boolean CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_GROUP_CONF = "camel.source.endpoint.crdGroup";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_GROUP_DOC = "The Consumer CRD Resource Group we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_GROUP_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_NAME_CONF = "camel.source.endpoint.crdName";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_NAME_DOC = "The Consumer CRD Resource name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_PLURAL_CONF = "camel.source.endpoint.crdPlural";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_PLURAL_DOC = "The Consumer CRD Resource Plural we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_PLURAL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_SCOPE_CONF = "camel.source.endpoint.crdScope";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_SCOPE_DOC = "The Consumer CRD Resource Scope we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_SCOPE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_VERSION_CONF = "camel.source.endpoint.crdVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_VERSION_DOC = "The Consumer CRD Resource Version we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_VERSION_DEFAULT = null;
     public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_LABEL_KEY_CONF = "camel.source.endpoint.labelKey";
     public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_LABEL_KEY_DOC = "The Consumer Label key when watching at some resources";
     public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_LABEL_KEY_DEFAULT = null;
@@ -140,6 +155,11 @@ public class CamelKubernetesreplicationcontrollersSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_PORT_NAME_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_PORT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_GROUP_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_PLURAL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_PLURAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_PLURAL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_SCOPE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_VERSION_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_LABEL_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_LABEL_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_LABEL_KEY_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_LABEL_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_LABEL_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_LABEL_VALUE_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_NAMESPACE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_NAMESPACE_DOC);
diff --git a/connectors/camel-kubernetes-services-kafka-connector/src/generated/resources/camel-kubernetes-services-source.json b/connectors/camel-kubernetes-services-kafka-connector/src/generated/resources/camel-kubernetes-services-source.json
index c889b93..0151fa7 100644
--- a/connectors/camel-kubernetes-services-kafka-connector/src/generated/resources/camel-kubernetes-services-source.json
+++ b/connectors/camel-kubernetes-services-kafka-connector/src/generated/resources/camel-kubernetes-services-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/connectors/camel-kubernetes-services-kafka-connector/src/main/docs/camel-kubernetes-services-kafka-source-connector.adoc b/connectors/camel-kubernetes-services-kafka-connector/src/main/docs/camel-kubernetes-services-kafka-source-connector.adoc
index cb22eb5..9959302 100644
--- a/connectors/camel-kubernetes-services-kafka-connector/src/main/docs/camel-kubernetes-services-kafka-source-connector.adoc
+++ b/connectors/camel-kubernetes-services-kafka-connector/src/main/docs/camel-kubernetes-services-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesservices.CamelKubernet
 ----
 
 
-The camel-kubernetes-services source connector supports 31 options, which are listed below.
+The camel-kubernetes-services source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-services source connector supports 31 options, which are li
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/connectors/camel-kubernetes-services-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesservices/CamelKubernetesservicesSourceConnectorConfig.java b/connectors/camel-kubernetes-services-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesservices/CamelKubernetesservicesSourceConnectorConfig.java
index 1dd50ea..113d14d 100644
--- a/connectors/camel-kubernetes-services-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesservices/CamelKubernetesservicesSourceConnectorConfig.java
+++ b/connectors/camel-kubernetes-services-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesservices/CamelKubernetesservicesSourceConnectorConfig.java
@@ -47,6 +47,21 @@ public class CamelKubernetesservicesSourceConnectorConfig
     public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR le [...]
     public static final Boolean CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_GROUP_CONF = "camel.source.endpoint.crdGroup";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_GROUP_DOC = "The Consumer CRD Resource Group we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_GROUP_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_NAME_CONF = "camel.source.endpoint.crdName";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_NAME_DOC = "The Consumer CRD Resource name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_PLURAL_CONF = "camel.source.endpoint.crdPlural";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_PLURAL_DOC = "The Consumer CRD Resource Plural we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_PLURAL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_SCOPE_CONF = "camel.source.endpoint.crdScope";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_SCOPE_DOC = "The Consumer CRD Resource Scope we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_SCOPE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_VERSION_CONF = "camel.source.endpoint.crdVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_VERSION_DOC = "The Consumer CRD Resource Version we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_VERSION_DEFAULT = null;
     public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_LABEL_KEY_CONF = "camel.source.endpoint.labelKey";
     public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_LABEL_KEY_DOC = "The Consumer Label key when watching at some resources";
     public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_LABEL_KEY_DEFAULT = null;
@@ -140,6 +155,11 @@ public class CamelKubernetesservicesSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_PORT_NAME_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_PORT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_GROUP_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_PLURAL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_PLURAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_PLURAL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_SCOPE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_VERSION_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_LABEL_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_LABEL_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_LABEL_KEY_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_LABEL_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_LABEL_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_LABEL_VALUE_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_NAMESPACE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_NAMESPACE_DOC);
diff --git a/connectors/camel-pulsar-kafka-connector/src/generated/resources/camel-pulsar-source.json b/connectors/camel-pulsar-kafka-connector/src/generated/resources/camel-pulsar-source.json
index e6e4bbc..36414b3 100644
--- a/connectors/camel-pulsar-kafka-connector/src/generated/resources/camel-pulsar-source.json
+++ b/connectors/camel-pulsar-kafka-connector/src/generated/resources/camel-pulsar-source.json
@@ -108,6 +108,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.readCompacted": {
+			"name": "camel.source.endpoint.readCompacted",
+			"description": "Enable compacted topic reading.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.subscriptionInitialPosition": {
 			"name": "camel.source.endpoint.subscriptionInitialPosition",
 			"description": "Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST]",
@@ -250,6 +257,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.pulsar.readCompacted": {
+			"name": "camel.component.pulsar.readCompacted",
+			"description": "Enable compacted topic reading.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.pulsar.subscriptionInitialPosition": {
 			"name": "camel.component.pulsar.subscriptionInitialPosition",
 			"description": "Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST]",
diff --git a/connectors/camel-pulsar-kafka-connector/src/main/docs/camel-pulsar-kafka-source-connector.adoc b/connectors/camel-pulsar-kafka-connector/src/main/docs/camel-pulsar-kafka-source-connector.adoc
index 61f835b..ac577d8 100644
--- a/connectors/camel-pulsar-kafka-connector/src/main/docs/camel-pulsar-kafka-source-connector.adoc
+++ b/connectors/camel-pulsar-kafka-connector/src/main/docs/camel-pulsar-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.pulsar.CamelPulsarSourceConnecto
 ----
 
 
-The camel-pulsar source connector supports 45 options, which are listed below.
+The camel-pulsar source connector supports 47 options, which are listed below.
 
 
 
@@ -44,6 +44,7 @@ The camel-pulsar source connector supports 45 options, which are listed below.
 | *camel.source.endpoint.maxRedeliverCount* | Maximum number of times that a message will be redelivered before being sent to the dead letter queue. If this value is not set, no Dead Letter Policy will be created | null | false | MEDIUM
 | *camel.source.endpoint.negativeAckRedeliveryDelay Micros* | Set the negative acknowledgement delay | 60000000L | false | MEDIUM
 | *camel.source.endpoint.numberOfConsumers* | Number of consumers - defaults to 1 | 1 | false | MEDIUM
+| *camel.source.endpoint.readCompacted* | Enable compacted topic reading. | false | false | MEDIUM
 | *camel.source.endpoint.subscriptionInitialPosition* | Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST] | "LATEST" | false | MEDIUM
 | *camel.source.endpoint.subscriptionName* | Name of the subscription to use | "subs" | false | MEDIUM
 | *camel.source.endpoint.subscriptionTopicsMode* | Determines to which topics this consumer should be subscribed to - Persistent, Non-Persistent, or both. Only used with pattern subscriptions. One of: [PersistentOnly] [NonPersistentOnly] [AllTopics] | "PersistentOnly" | false | MEDIUM
@@ -65,6 +66,7 @@ The camel-pulsar source connector supports 45 options, which are listed below.
 | *camel.component.pulsar.maxRedeliverCount* | Maximum number of times that a message will be redelivered before being sent to the dead letter queue. If this value is not set, no Dead Letter Policy will be created | null | false | MEDIUM
 | *camel.component.pulsar.negativeAckRedeliveryDelay Micros* | Set the negative acknowledgement delay | 60000000L | false | MEDIUM
 | *camel.component.pulsar.numberOfConsumers* | Number of consumers - defaults to 1 | 1 | false | MEDIUM
+| *camel.component.pulsar.readCompacted* | Enable compacted topic reading. | false | false | MEDIUM
 | *camel.component.pulsar.subscriptionInitialPosition* | Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST] | "LATEST" | false | MEDIUM
 | *camel.component.pulsar.subscriptionName* | Name of the subscription to use | "subs" | false | MEDIUM
 | *camel.component.pulsar.subscriptionTopicsMode* | Determines to which topics this consumer should be subscribed to - Persistent, Non-Persistent, or both. Only used with pattern subscriptions. One of: [PersistentOnly] [NonPersistentOnly] [AllTopics] | "PersistentOnly" | false | MEDIUM
diff --git a/connectors/camel-pulsar-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/pulsar/CamelPulsarSourceConnectorConfig.java b/connectors/camel-pulsar-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/pulsar/CamelPulsarSourceConnectorConfig.java
index 899cbc4..b44b964 100644
--- a/connectors/camel-pulsar-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/pulsar/CamelPulsarSourceConnectorConfig.java
+++ b/connectors/camel-pulsar-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/pulsar/CamelPulsarSourceConnectorConfig.java
@@ -71,6 +71,9 @@ public class CamelPulsarSourceConnectorConfig
     public static final String CAMEL_SOURCE_PULSAR_ENDPOINT_NUMBER_OF_CONSUMERS_CONF = "camel.source.endpoint.numberOfConsumers";
     public static final String CAMEL_SOURCE_PULSAR_ENDPOINT_NUMBER_OF_CONSUMERS_DOC = "Number of consumers - defaults to 1";
     public static final Integer CAMEL_SOURCE_PULSAR_ENDPOINT_NUMBER_OF_CONSUMERS_DEFAULT = 1;
+    public static final String CAMEL_SOURCE_PULSAR_ENDPOINT_READ_COMPACTED_CONF = "camel.source.endpoint.readCompacted";
+    public static final String CAMEL_SOURCE_PULSAR_ENDPOINT_READ_COMPACTED_DOC = "Enable compacted topic reading.";
+    public static final Boolean CAMEL_SOURCE_PULSAR_ENDPOINT_READ_COMPACTED_DEFAULT = false;
     public static final String CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_INITIAL_POSITION_CONF = "camel.source.endpoint.subscriptionInitialPosition";
     public static final String CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_INITIAL_POSITION_DOC = "Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST]";
     public static final String CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_INITIAL_POSITION_DEFAULT = "LATEST";
@@ -134,6 +137,9 @@ public class CamelPulsarSourceConnectorConfig
     public static final String CAMEL_SOURCE_PULSAR_COMPONENT_NUMBER_OF_CONSUMERS_CONF = "camel.component.pulsar.numberOfConsumers";
     public static final String CAMEL_SOURCE_PULSAR_COMPONENT_NUMBER_OF_CONSUMERS_DOC = "Number of consumers - defaults to 1";
     public static final Integer CAMEL_SOURCE_PULSAR_COMPONENT_NUMBER_OF_CONSUMERS_DEFAULT = 1;
+    public static final String CAMEL_SOURCE_PULSAR_COMPONENT_READ_COMPACTED_CONF = "camel.component.pulsar.readCompacted";
+    public static final String CAMEL_SOURCE_PULSAR_COMPONENT_READ_COMPACTED_DOC = "Enable compacted topic reading.";
+    public static final Boolean CAMEL_SOURCE_PULSAR_COMPONENT_READ_COMPACTED_DEFAULT = false;
     public static final String CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_INITIAL_POSITION_CONF = "camel.component.pulsar.subscriptionInitialPosition";
     public static final String CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_INITIAL_POSITION_DOC = "Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST]";
     public static final String CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_INITIAL_POSITION_DEFAULT = "LATEST";
@@ -189,6 +195,7 @@ public class CamelPulsarSourceConnectorConfig
         conf.define(CAMEL_SOURCE_PULSAR_ENDPOINT_MAX_REDELIVER_COUNT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_PULSAR_ENDPOINT_MAX_REDELIVER_COUNT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_ENDPOINT_MAX_REDELIVER_COUNT_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_ENDPOINT_NEGATIVE_ACK_REDELIVERY_DELAY_MICROS_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_PULSAR_ENDPOINT_NEGATIVE_ACK_REDELIVERY_DELAY_MICROS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_ENDPOINT_NEGATIVE_ACK_REDELIVERY_DELAY_MICROS_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_ENDPOINT_NUMBER_OF_CONSUMERS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_PULSAR_ENDPOINT_NUMBER_OF_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_ENDPOINT_NUMBER_OF_CONSUMERS_DOC);
+        conf.define(CAMEL_SOURCE_PULSAR_ENDPOINT_READ_COMPACTED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_PULSAR_ENDPOINT_READ_COMPACTED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_ENDPOINT_READ_COMPACTED_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_INITIAL_POSITION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_INITIAL_POSITION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_INITIAL_POSITION_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_NAME_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_TOPICS_MODE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_TOPICS_MODE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_TOPICS_MODE_DOC);
@@ -210,6 +217,7 @@ public class CamelPulsarSourceConnectorConfig
         conf.define(CAMEL_SOURCE_PULSAR_COMPONENT_MAX_REDELIVER_COUNT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_PULSAR_COMPONENT_MAX_REDELIVER_COUNT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_COMPONENT_MAX_REDELIVER_COUNT_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_COMPONENT_NEGATIVE_ACK_REDELIVERY_DELAY_MICROS_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_PULSAR_COMPONENT_NEGATIVE_ACK_REDELIVERY_DELAY_MICROS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_COMPONENT_NEGATIVE_ACK_REDELIVERY_DELAY_MICROS_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_COMPONENT_NUMBER_OF_CONSUMERS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_PULSAR_COMPONENT_NUMBER_OF_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_COMPONENT_NUMBER_OF_CONSUMERS_DOC);
+        conf.define(CAMEL_SOURCE_PULSAR_COMPONENT_READ_COMPACTED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_PULSAR_COMPONENT_READ_COMPACTED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_COMPONENT_READ_COMPACTED_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_INITIAL_POSITION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_INITIAL_POSITION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_INITIAL_POSITION_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_NAME_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_TOPICS_MODE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_TOPICS_MODE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_TOPICS_MODE_DOC);
diff --git a/connectors/camel-vertx-websocket-kafka-connector/src/generated/resources/camel-vertx-websocket-sink.json b/connectors/camel-vertx-websocket-kafka-connector/src/generated/resources/camel-vertx-websocket-sink.json
index 4653fa2..e1bc267 100644
--- a/connectors/camel-vertx-websocket-kafka-connector/src/generated/resources/camel-vertx-websocket-sink.json
+++ b/connectors/camel-vertx-websocket-kafka-connector/src/generated/resources/camel-vertx-websocket-sink.json
@@ -36,6 +36,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.clientSubProtocols": {
+			"name": "camel.sink.endpoint.clientSubProtocols",
+			"description": "Comma separated list of WebSocket subprotocols that the client should use for the Sec-WebSocket-Protocol header",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"description": "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 when the first message is processed then creating and starting the pr [...]
diff --git a/connectors/camel-vertx-websocket-kafka-connector/src/main/docs/camel-vertx-websocket-kafka-sink-connector.adoc b/connectors/camel-vertx-websocket-kafka-connector/src/main/docs/camel-vertx-websocket-kafka-sink-connector.adoc
index 95cc27e..de18bdb 100644
--- a/connectors/camel-vertx-websocket-kafka-connector/src/main/docs/camel-vertx-websocket-kafka-sink-connector.adoc
+++ b/connectors/camel-vertx-websocket-kafka-connector/src/main/docs/camel-vertx-websocket-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.vertxwebsocket.CamelVertxwebsock
 ----
 
 
-The camel-vertx-websocket sink connector supports 15 options, which are listed below.
+The camel-vertx-websocket sink connector supports 16 options, which are listed below.
 
 
 
@@ -33,6 +33,7 @@ The camel-vertx-websocket sink connector supports 15 options, which are listed b
 | *camel.sink.path.port* | The port that the consumer should bind to or port of the remote websocket destination that the producer should connect to | 0 | false | MEDIUM
 | *camel.sink.path.path* | The path that the consumer should bind to or path of the remote websocket destination that the producer should connect to | "/" | true | HIGH
 | *camel.sink.endpoint.clientOptions* | Sets customized options for configuring the WebSocket client used in the producer | null | false | MEDIUM
+| *camel.sink.endpoint.clientSubProtocols* | Comma separated list of WebSocket subprotocols that the client should use for the Sec-WebSocket-Protocol header | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 when the first message is processed then cre [...]
 | *camel.sink.endpoint.sendToAll* | To send to all websocket subscribers. Can be used to configure on endpoint level, instead of having to use the VertxWebsocketConstants.SEND_TO_ALL header on the message. | false | false | MEDIUM
 | *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
diff --git a/connectors/camel-vertx-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/vertxwebsocket/CamelVertxwebsocketSinkConnectorConfig.java b/connectors/camel-vertx-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/vertxwebsocket/CamelVertxwebsocketSinkConnectorConfig.java
index 3298d8e..08d80d6 100644
--- a/connectors/camel-vertx-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/vertxwebsocket/CamelVertxwebsocketSinkConnectorConfig.java
+++ b/connectors/camel-vertx-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/vertxwebsocket/CamelVertxwebsocketSinkConnectorConfig.java
@@ -38,6 +38,9 @@ public class CamelVertxwebsocketSinkConnectorConfig
     public static final String CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_OPTIONS_CONF = "camel.sink.endpoint.clientOptions";
     public static final String CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_OPTIONS_DOC = "Sets customized options for configuring the WebSocket client used in the producer";
     public static final String CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_OPTIONS_DEFAULT = null;
+    public static final String CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_SUB_PROTOCOLS_CONF = "camel.sink.endpoint.clientSubProtocols";
+    public static final String CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_SUB_PROTOCOLS_DOC = "Comma separated list of WebSocket subprotocols that the client should use for the Sec-WebSocket-Protocol header";
+    public static final String CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_SUB_PROTOCOLS_DEFAULT = null;
     public static final String CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_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  [...]
     public static final Boolean CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
@@ -89,6 +92,7 @@ public class CamelVertxwebsocketSinkConnectorConfig
         conf.define(CAMEL_SINK_VERTXWEBSOCKET_PATH_PORT_CONF, ConfigDef.Type.INT, CAMEL_SINK_VERTXWEBSOCKET_PATH_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXWEBSOCKET_PATH_PORT_DOC);
         conf.define(CAMEL_SINK_VERTXWEBSOCKET_PATH_PATH_CONF, ConfigDef.Type.STRING, CAMEL_SINK_VERTXWEBSOCKET_PATH_PATH_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_VERTXWEBSOCKET_PATH_PATH_DOC);
         conf.define(CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_OPTIONS_DOC);
+        conf.define(CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_SUB_PROTOCOLS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_SUB_PROTOCOLS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_SUB_PROTOCOLS_DOC);
         conf.define(CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_SEND_TO_ALL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_SEND_TO_ALL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_SEND_TO_ALL_DOC);
         conf.define(CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
diff --git a/connectors/pom.xml b/connectors/pom.xml
index cd26555..50bc535 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -202,6 +202,7 @@
         <module>camel-arangodb-kafka-connector</module>
         <module>camel-as2-kafka-connector</module>
         <module>camel-asterisk-kafka-connector</module>
+        <module>camel-atlasmap-kafka-connector</module>
         <module>camel-atmos-kafka-connector</module>
         <module>camel-atmosphere-websocket-kafka-connector</module>
         <module>camel-atom-kafka-connector</module>
@@ -386,6 +387,7 @@
         <module>camel-jt400-kafka-connector</module>
         <module>camel-kafka-kafka-connector</module>
         <module>camel-kubernetes-config-maps-kafka-connector</module>
+        <module>camel-kubernetes-custom-resources-kafka-connector</module>
         <module>camel-kubernetes-deployments-kafka-connector</module>
         <module>camel-kubernetes-hpa-kafka-connector</module>
         <module>camel-kubernetes-job-kafka-connector</module>
diff --git a/docs/modules/ROOT/pages/connectors/camel-atlasmap-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-atlasmap-kafka-sink-connector.adoc
new file mode 100644
index 0000000..72187e3
--- /dev/null
+++ b/docs/modules/ROOT/pages/connectors/camel-atlasmap-kafka-sink-connector.adoc
@@ -0,0 +1,66 @@
+// kafka-connector options: START
+[[camel-atlasmap-kafka-connector-sink]]
+= camel-atlasmap-kafka-connector sink configuration
+
+When using camel-atlasmap-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.apache.camel.kafkaconnector</groupId>
+  <artifactId>camel-atlasmap-kafka-connector</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel Kafka connector version -->
+</dependency>
+----
+
+To use this Sink connector in Kafka connect you'll need to set the following connector.class
+
+[source,java]
+----
+connector.class=org.apache.camel.kafkaconnector.atlasmap.CamelAtlasmapSinkConnector
+----
+
+
+The camel-atlasmap sink connector supports 13 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,1,1",options="header"]
+|===
+| Name | Description | Default | Required | Priority
+| *camel.sink.path.resourceUri* | Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For bean you can specify the method name after dot, eg bean:myBean.myMethod. | null | true | HIGH
+| *camel.sink.endpoint.allowContextMapAll* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | false | MEDIUM
+| *camel.sink.endpoint.contentCache* | Sets whether to use resource content cache or not | false | false | MEDIUM
+| *camel.sink.endpoint.lazyStartProducer* | 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 when the first message is processed then cre [...]
+| *camel.sink.endpoint.sourceMapName* | The Exchange property name for a source message map which hold java.util.Map&lt;String, Message&gt; where the key is AtlasMap Document ID. AtlasMap consumes Message bodies as source documents, as well as message headers as source properties where the scope equals to Document ID. | null | false | MEDIUM
+| *camel.sink.endpoint.targetMapMode* | TargetMapMode enum value to specify how multiple target documents are delivered if exist. 'MAP': Stores them into a java.util.Map, and the java.util.Map is set to an exchange property if 'targetMapName' is specified, otherwise message body. 'MESSAGE_HEADER': Stores them into message headers. 'EXCHANGE_PROPERTY': Stores them into exchange properties. ) One of: [MAP] [MESSAGE_HEADER] [EXCHANGE_PROPERTY] | "MAP" | false | MEDIUM
+| *camel.sink.endpoint.targetMapName* | The Exchange property name for a target document map which hold java.util.Map&lt;String, Object&gt; where the key is AtlasMap Document ID. AtlasMap populates multiple target documents into this map. | null | false | MEDIUM
+| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
+| *camel.sink.endpoint.propertiesFile* | The URI of the properties file which is used for AtlasContextFactory initialization. | null | false | MEDIUM
+| *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
+| *camel.component.atlasmap.lazyStartProducer* | 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 when the first message is processed the [...]
+| *camel.component.atlasmap.atlasContextFactory* | To use the AtlasContextFactory otherwise a new engine is created. | null | false | MEDIUM
+| *camel.component.atlasmap.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+|===
+
+
+
+The camel-atlasmap sink connector has no converters out of the box.
+
+
+
+
+
+The camel-atlasmap sink connector has no transforms out of the box.
+
+
+
+
+
+The camel-atlasmap sink connector has no aggregation strategies out of the box.
+
+
+
+
+// kafka-connector options: END
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc
index c440385..6ef24fb 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sqs.CamelAws2sqsSinkConnecto
 ----
 
 
-The camel-aws2-sqs sink connector supports 56 options, which are listed below.
+The camel-aws2-sqs sink connector supports 58 options, which are listed below.
 
 
 
@@ -40,6 +40,7 @@ The camel-aws2-sqs sink connector supports 56 options, which are listed below.
 | *camel.sink.endpoint.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.sink.endpoint.delaySeconds* | Delay sending messages for a number of seconds. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 when the first message is processed then cre [...]
 | *camel.sink.endpoint.messageDeduplicationIdStrategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
@@ -68,6 +69,7 @@ The camel-aws2-sqs sink connector supports 56 options, which are listed below.
 | *camel.component.aws2-sqs.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.component.aws2-sqs.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-sqs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-sqs.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-sqs.delaySeconds* | Delay sending messages for a number of seconds. | null | false | MEDIUM
 | *camel.component.aws2-sqs.lazyStartProducer* | 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 when the first message is processed the [...]
 | *camel.component.aws2-sqs.messageDeduplicationId Strategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc
index 88d9b18..8556305 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sqs.CamelAws2sqsSourceConnec
 ----
 
 
-The camel-aws2-sqs source connector supports 91 options, which are listed below.
+The camel-aws2-sqs source connector supports 93 options, which are listed below.
 
 
 
@@ -40,6 +40,7 @@ The camel-aws2-sqs source connector supports 91 options, which are listed below.
 | *camel.source.endpoint.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.source.endpoint.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.source.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.source.endpoint.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.source.endpoint.attributeNames* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | null | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM
@@ -95,6 +96,7 @@ The camel-aws2-sqs source connector supports 91 options, which are listed below.
 | *camel.component.aws2-sqs.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.component.aws2-sqs.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-sqs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-sqs.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-sqs.attributeNames* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | null | false | MEDIUM
 | *camel.component.aws2-sqs.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.component.aws2-sqs.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-azure-storage-blob-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-azure-storage-blob-kafka-sink-connector.adoc
index eb964c1..7ccac04 100644
--- a/docs/modules/ROOT/pages/connectors/camel-azure-storage-blob-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-azure-storage-blob-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.azurestorageblob.CamelAzurestora
 ----
 
 
-The camel-azure-storage-blob sink connector supports 55 options, which are listed below.
+The camel-azure-storage-blob sink connector supports 57 options, which are listed below.
 
 
 
@@ -43,6 +43,7 @@ The camel-azure-storage-blob sink connector supports 55 options, which are liste
 | *camel.sink.endpoint.maxResultsPerPage* | Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxResultsPerPage or specifies a value greater than 5,000, the server will return up to 5,000 items. | null | false | MEDIUM
 | *camel.sink.endpoint.maxRetryRequests* | Specifies the maximum number of additional HTTP Get requests that will be made while reading the data from a response body. | 0 | false | MEDIUM
 | *camel.sink.endpoint.prefix* | Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs. | null | false | MEDIUM
+| *camel.sink.endpoint.regex* | Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored. | null | false | MEDIUM
 | *camel.sink.endpoint.serviceClient* | Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations [...]
 | *camel.sink.endpoint.timeout* | An optional timeout value beyond which a RuntimeException will be raised. | null | false | MEDIUM
 | *camel.sink.endpoint.blobSequenceNumber* | A user-controlled value that you can use to track requests. The value of the sequence number must be between 0 and 263 - 1.The default value is 0. | "0" | false | MEDIUM
@@ -70,6 +71,7 @@ The camel-azure-storage-blob sink connector supports 55 options, which are liste
 | *camel.component.azure-storage-blob.maxResultsPer Page* | Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxResultsPerPage or specifies a value greater than 5,000, the server will return up to 5,000 items. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.maxRetry Requests* | Specifies the maximum number of additional HTTP Get requests that will be made while reading the data from a response body. | 0 | false | MEDIUM
 | *camel.component.azure-storage-blob.prefix* | Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs. | null | false | MEDIUM
+| *camel.component.azure-storage-blob.regex* | Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.serviceClient* | Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), [...]
 | *camel.component.azure-storage-blob.timeout* | An optional timeout value beyond which a RuntimeException will be raised. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.blobSequence Number* | A user-controlled value that you can use to track requests. The value of the sequence number must be between 0 and 263 - 1.The default value is 0. | "0" | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-azure-storage-blob-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-azure-storage-blob-kafka-source-connector.adoc
index 1d42bda..aa2e872 100644
--- a/docs/modules/ROOT/pages/connectors/camel-azure-storage-blob-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-azure-storage-blob-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.azurestorageblob.CamelAzurestora
 ----
 
 
-The camel-azure-storage-blob source connector supports 39 options, which are listed below.
+The camel-azure-storage-blob source connector supports 41 options, which are listed below.
 
 
 
@@ -43,6 +43,7 @@ The camel-azure-storage-blob source connector supports 39 options, which are lis
 | *camel.source.endpoint.maxResultsPerPage* | Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxResultsPerPage or specifies a value greater than 5,000, the server will return up to 5,000 items. | null | false | MEDIUM
 | *camel.source.endpoint.maxRetryRequests* | Specifies the maximum number of additional HTTP Get requests that will be made while reading the data from a response body. | 0 | false | MEDIUM
 | *camel.source.endpoint.prefix* | Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs. | null | false | MEDIUM
+| *camel.source.endpoint.regex* | Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored. | null | false | MEDIUM
 | *camel.source.endpoint.serviceClient* | Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operatio [...]
 | *camel.source.endpoint.timeout* | An optional timeout value beyond which a RuntimeException will be raised. | null | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
@@ -63,6 +64,7 @@ The camel-azure-storage-blob source connector supports 39 options, which are lis
 | *camel.component.azure-storage-blob.maxResultsPer Page* | Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxResultsPerPage or specifies a value greater than 5,000, the server will return up to 5,000 items. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.maxRetry Requests* | Specifies the maximum number of additional HTTP Get requests that will be made while reading the data from a response body. | 0 | false | MEDIUM
 | *camel.component.azure-storage-blob.prefix* | Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs. | null | false | MEDIUM
+| *camel.component.azure-storage-blob.regex* | Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.serviceClient* | Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), [...]
 | *camel.component.azure-storage-blob.timeout* | An optional timeout value beyond which a RuntimeException will be raised. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.bridgeError Handler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-couchbase-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-couchbase-kafka-sink-connector.adoc
index ae2f60d..25299ae 100644
--- a/docs/modules/ROOT/pages/connectors/camel-couchbase-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-couchbase-kafka-sink-connector.adoc
@@ -32,7 +32,7 @@ The camel-couchbase sink connector supports 23 options, which are listed below.
 | *camel.sink.path.protocol* | The protocol to use | null | true | HIGH
 | *camel.sink.path.hostname* | The hostname to use | null | true | HIGH
 | *camel.sink.path.port* | The port number to use | 8091 | false | MEDIUM
-| *camel.sink.endpoint.bucket* | The bucket to use | null | false | MEDIUM
+| *camel.sink.endpoint.bucket* | The bucket to use | null | true | HIGH
 | *camel.sink.endpoint.collection* | The collection to use | null | false | MEDIUM
 | *camel.sink.endpoint.key* | The key to use | null | false | MEDIUM
 | *camel.sink.endpoint.scope* | The scope to use | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-couchbase-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-couchbase-kafka-source-connector.adoc
index 474abfc..3d6f169 100644
--- a/docs/modules/ROOT/pages/connectors/camel-couchbase-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-couchbase-kafka-source-connector.adoc
@@ -32,7 +32,7 @@ The camel-couchbase source connector supports 42 options, which are listed below
 | *camel.source.path.protocol* | The protocol to use | null | true | HIGH
 | *camel.source.path.hostname* | The hostname to use | null | true | HIGH
 | *camel.source.path.port* | The port number to use | 8091 | false | MEDIUM
-| *camel.source.endpoint.bucket* | The bucket to use | null | false | MEDIUM
+| *camel.source.endpoint.bucket* | The bucket to use | null | true | HIGH
 | *camel.source.endpoint.collection* | The collection to use | null | false | MEDIUM
 | *camel.source.endpoint.key* | The key to use | null | false | MEDIUM
 | *camel.source.endpoint.scope* | The scope to use | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-git-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-git-kafka-sink-connector.adoc
index 11b02be..ba7d35c 100644
--- a/docs/modules/ROOT/pages/connectors/camel-git-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-git-kafka-sink-connector.adoc
@@ -31,14 +31,14 @@ The camel-git sink connector supports 14 options, which are listed below.
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.localPath* | Local repository path | null | true | HIGH
 | *camel.sink.endpoint.branchName* | The branch name to work on | null | false | MEDIUM
+| *camel.sink.endpoint.allowEmpty* | The flag to manage empty git commits | true | false | MEDIUM
+| *camel.sink.endpoint.lazyStartProducer* | 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 when the first message is processed then cre [...]
+| *camel.sink.endpoint.operation* | The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList] | null | false | MEDIUM
 | *camel.sink.endpoint.password* | Remote repository password | null | false | MEDIUM
 | *camel.sink.endpoint.remoteName* | The remote repository name to use in particular operation like pull | null | false | MEDIUM
 | *camel.sink.endpoint.remotePath* | The remote repository path | null | false | MEDIUM
 | *camel.sink.endpoint.tagName* | The tag name to work on | null | false | MEDIUM
 | *camel.sink.endpoint.username* | Remote repository username | null | false | MEDIUM
-| *camel.sink.endpoint.allowEmpty* | The flag to manage empty git commits | true | false | MEDIUM
-| *camel.sink.endpoint.lazyStartProducer* | 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 when the first message is processed then cre [...]
-| *camel.sink.endpoint.operation* | The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList] | null | false | MEDIUM
 | *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.git.lazyStartProducer* | 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 when the first message is processed then cre [...]
diff --git a/docs/modules/ROOT/pages/connectors/camel-git-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-git-kafka-source-connector.adoc
index 8d96def..f3f93a9 100644
--- a/docs/modules/ROOT/pages/connectors/camel-git-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-git-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.git.CamelGitSourceConnector
 ----
 
 
-The camel-git source connector supports 15 options, which are listed below.
+The camel-git source connector supports 10 options, which are listed below.
 
 
 
@@ -31,11 +31,6 @@ The camel-git source connector supports 15 options, which are listed below.
 | Name | Description | Default | Required | Priority
 | *camel.source.path.localPath* | Local repository path | null | true | HIGH
 | *camel.source.endpoint.branchName* | The branch name to work on | null | false | MEDIUM
-| *camel.source.endpoint.password* | Remote repository password | null | false | MEDIUM
-| *camel.source.endpoint.remoteName* | The remote repository name to use in particular operation like pull | null | false | MEDIUM
-| *camel.source.endpoint.remotePath* | The remote repository path | null | false | MEDIUM
-| *camel.source.endpoint.tagName* | The tag name to work on | null | false | MEDIUM
-| *camel.source.endpoint.username* | Remote repository username | null | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.type* | The consumer type One of: [commit] [tag] [branch] | null | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-grpc-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-grpc-kafka-sink-connector.adoc
index 71c1ddf..60d52b1 100644
--- a/docs/modules/ROOT/pages/connectors/camel-grpc-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-grpc-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.grpc.CamelGrpcSinkConnector
 ----
 
 
-The camel-grpc sink connector supports 25 options, which are listed below.
+The camel-grpc sink connector supports 26 options, which are listed below.
 
 
 
@@ -32,6 +32,7 @@ The camel-grpc sink connector supports 25 options, which are listed below.
 | *camel.sink.path.host* | The gRPC server host name. This is localhost or 0.0.0.0 when being a consumer or remote server host name when using producer. | null | true | HIGH
 | *camel.sink.path.port* | The gRPC local or remote server port | null | true | HIGH
 | *camel.sink.path.service* | Fully qualified service name from the protocol buffer descriptor file (package dot service definition name) | null | true | HIGH
+| *camel.sink.endpoint.autoDiscoverClientInterceptors* | Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.sink.endpoint.flowControlWindow* | The HTTP/2 flow control window size (MiB) | 1048576 | false | MEDIUM
 | *camel.sink.endpoint.maxMessageSize* | The maximum message size allowed to be received/sent (MiB) | 4194304 | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 when the first message is processed then cre [...]
diff --git a/docs/modules/ROOT/pages/connectors/camel-grpc-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-grpc-kafka-source-connector.adoc
index 773f507..2e3b58b 100644
--- a/docs/modules/ROOT/pages/connectors/camel-grpc-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-grpc-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.grpc.CamelGrpcSourceConnector
 ----
 
 
-The camel-grpc source connector supports 27 options, which are listed below.
+The camel-grpc source connector supports 29 options, which are listed below.
 
 
 
@@ -32,6 +32,7 @@ The camel-grpc source connector supports 27 options, which are listed below.
 | *camel.source.path.host* | The gRPC server host name. This is localhost or 0.0.0.0 when being a consumer or remote server host name when using producer. | null | true | HIGH
 | *camel.source.path.port* | The gRPC local or remote server port | null | true | HIGH
 | *camel.source.path.service* | Fully qualified service name from the protocol buffer descriptor file (package dot service definition name) | null | true | HIGH
+| *camel.source.endpoint.autoDiscoverClient Interceptors* | Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.source.endpoint.flowControlWindow* | The HTTP/2 flow control window size (MiB) | 1048576 | false | MEDIUM
 | *camel.source.endpoint.maxMessageSize* | The maximum message size allowed to be received/sent (MiB) | 4194304 | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
@@ -39,6 +40,7 @@ The camel-grpc source connector supports 27 options, which are listed below.
 | *camel.source.endpoint.forwardOnCompleted* | Determines if onCompleted events should be pushed to the Camel route. | false | false | MEDIUM
 | *camel.source.endpoint.forwardOnError* | Determines if onError events should be pushed to the Camel route. Exceptions will be set as message body. | false | false | MEDIUM
 | *camel.source.endpoint.maxConcurrentCallsPer Connection* | The maximum number of concurrent calls permitted for each incoming server connection | 2147483647 | false | MEDIUM
+| *camel.source.endpoint.routeControlledStream Observer* | Lets the route to take control over stream observer. If this value is set to true, then the response observer of gRPC call will be set with the name GrpcConstants.GRPC_RESPONSE_OBSERVER in the Exchange object. Please note that the stream observer's onNext(), onError(), onCompleted() methods should be called in the route. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
 | *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kafka-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kafka-kafka-sink-connector.adoc
index b82f46e..375d202 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kafka-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kafka-kafka-sink-connector.adoc
@@ -40,9 +40,9 @@ The camel-kafka sink connector supports 134 options, which are listed below.
 | *camel.sink.endpoint.compressionCodec* | This parameter allows you to specify the compression codec for all data generated by this producer. Valid values are none, gzip and snappy. One of: [none] [gzip] [snappy] [lz4] | "none" | false | MEDIUM
 | *camel.sink.endpoint.connectionMaxIdleMs* | Close idle connections after the number of milliseconds specified by this config. | "540000" | false | MEDIUM
 | *camel.sink.endpoint.enableIdempotence* | If set to 'true' the producer will ensure that exactly one copy of each message is written in the stream. If 'false', producer retries may write duplicates of the retried message in the stream. If set to true this option will require max.in.flight.requests.per.connection to be set to 1 and retries cannot be zero and additionally acks must be set to 'all'. | false | false | MEDIUM
-| *camel.sink.endpoint.kafkaHeaderSerializer* | To use a custom KafkaHeaderSerializer to serialize kafka headers values | null | false | MEDIUM
+| *camel.sink.endpoint.headerSerializer* | To use a custom KafkaHeaderSerializer to serialize kafka headers values | null | false | MEDIUM
 | *camel.sink.endpoint.key* | The record key (or null if no key is specified). If this option has been configured then it take precedence over header KafkaConstants#KEY | null | false | MEDIUM
-| *camel.sink.endpoint.keySerializerClass* | The serializer class for keys (defaults to the same as for messages if nothing is given). | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
+| *camel.sink.endpoint.keySerializer* | The serializer class for keys (defaults to the same as for messages if nothing is given). | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 when the first message is processed then cre [...]
 | *camel.sink.endpoint.lingerMs* | The producer groups together any records that arrive in between request transmissions into a single batched request. Normally this occurs only under load when records arrive faster than they can be sent out. However in some circumstances the client may want to reduce the number of requests even under moderate load. This setting accomplishes this by adding a small amount of artificial delay that is, rather than immediately sending out a record the produc [...]
 | *camel.sink.endpoint.maxBlockMs* | The configuration controls how long sending to kafka will block. These methods can be blocked for multiple reasons. For e.g: buffer full, metadata unavailable.This configuration imposes maximum limit on the total time spent in fetching metadata, serialization of key and value, partitioning and allocation of buffer memory when doing a send(). In case of partitionsFor(), this configuration imposes a maximum time threshold on waiting for metadata | "6000 [...]
@@ -64,7 +64,7 @@ The camel-kafka sink connector supports 134 options, which are listed below.
 | *camel.sink.endpoint.retries* | Setting a value greater than zero will cause the client to resend any record whose send fails with a potentially transient error. Note that this retry is no different than if the client resent the record upon receiving the error. Allowing retries will potentially change the ordering of records because if two records are sent to a single partition, and the first fails and is retried but the second succeeds, then the second record may appear first. | "0" | [...]
 | *camel.sink.endpoint.retryBackoffMs* | Before each retry, the producer refreshes the metadata of relevant topics to see if a new leader has been elected. Since leader election takes a bit of time, this property specifies the amount of time that the producer waits before refreshing the metadata. | "100" | false | MEDIUM
 | *camel.sink.endpoint.sendBufferBytes* | Socket write buffer size | "131072" | false | MEDIUM
-| *camel.sink.endpoint.serializerClass* | The serializer class for messages. | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
+| *camel.sink.endpoint.valueSerializer* | The serializer class for messages. | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
 | *camel.sink.endpoint.workerPool* | To use a custom worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. If using this option then you must handle the lifecycle of the thread pool to shut the pool down when no longer needed. | null | false | MEDIUM
 | *camel.sink.endpoint.workerPoolCoreSize* | Number of core threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | "10" | false | MEDIUM
 | *camel.sink.endpoint.workerPoolMaxSize* | Maximum number of threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | "20" | false | MEDIUM
@@ -107,9 +107,9 @@ The camel-kafka sink connector supports 134 options, which are listed below.
 | *camel.component.kafka.compressionCodec* | This parameter allows you to specify the compression codec for all data generated by this producer. Valid values are none, gzip and snappy. One of: [none] [gzip] [snappy] [lz4] | "none" | false | MEDIUM
 | *camel.component.kafka.connectionMaxIdleMs* | Close idle connections after the number of milliseconds specified by this config. | "540000" | false | MEDIUM
 | *camel.component.kafka.enableIdempotence* | If set to 'true' the producer will ensure that exactly one copy of each message is written in the stream. If 'false', producer retries may write duplicates of the retried message in the stream. If set to true this option will require max.in.flight.requests.per.connection to be set to 1 and retries cannot be zero and additionally acks must be set to 'all'. | false | false | MEDIUM
-| *camel.component.kafka.kafkaHeaderSerializer* | To use a custom KafkaHeaderSerializer to serialize kafka headers values | null | false | MEDIUM
+| *camel.component.kafka.headerSerializer* | To use a custom KafkaHeaderSerializer to serialize kafka headers values | null | false | MEDIUM
 | *camel.component.kafka.key* | The record key (or null if no key is specified). If this option has been configured then it take precedence over header KafkaConstants#KEY | null | false | MEDIUM
-| *camel.component.kafka.keySerializerClass* | The serializer class for keys (defaults to the same as for messages if nothing is given). | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
+| *camel.component.kafka.keySerializer* | The serializer class for keys (defaults to the same as for messages if nothing is given). | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
 | *camel.component.kafka.lazyStartProducer* | 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 when the first message is processed then c [...]
 | *camel.component.kafka.lingerMs* | The producer groups together any records that arrive in between request transmissions into a single batched request. Normally this occurs only under load when records arrive faster than they can be sent out. However in some circumstances the client may want to reduce the number of requests even under moderate load. This setting accomplishes this by adding a small amount of artificial delay that is, rather than immediately sending out a record the prod [...]
 | *camel.component.kafka.maxBlockMs* | The configuration controls how long sending to kafka will block. These methods can be blocked for multiple reasons. For e.g: buffer full, metadata unavailable.This configuration imposes maximum limit on the total time spent in fetching metadata, serialization of key and value, partitioning and allocation of buffer memory when doing a send(). In case of partitionsFor(), this configuration imposes a maximum time threshold on waiting for metadata | "60 [...]
@@ -131,7 +131,7 @@ The camel-kafka sink connector supports 134 options, which are listed below.
 | *camel.component.kafka.retries* | Setting a value greater than zero will cause the client to resend any record whose send fails with a potentially transient error. Note that this retry is no different than if the client resent the record upon receiving the error. Allowing retries will potentially change the ordering of records because if two records are sent to a single partition, and the first fails and is retried but the second succeeds, then the second record may appear first. | "0" [...]
 | *camel.component.kafka.retryBackoffMs* | Before each retry, the producer refreshes the metadata of relevant topics to see if a new leader has been elected. Since leader election takes a bit of time, this property specifies the amount of time that the producer waits before refreshing the metadata. | "100" | false | MEDIUM
 | *camel.component.kafka.sendBufferBytes* | Socket write buffer size | "131072" | false | MEDIUM
-| *camel.component.kafka.serializerClass* | The serializer class for messages. | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
+| *camel.component.kafka.valueSerializer* | The serializer class for messages. | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
 | *camel.component.kafka.workerPool* | To use a custom worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. If using this option then you must handle the lifecycle of the thread pool to shut the pool down when no longer needed. | null | false | MEDIUM
 | *camel.component.kafka.workerPoolCoreSize* | Number of core threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | "10" | false | MEDIUM
 | *camel.component.kafka.workerPoolMaxSize* | Maximum number of threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | "20" | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kafka-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kafka-kafka-source-connector.adoc
index 41f8248..d0d3a71 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kafka-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kafka-kafka-source-connector.adoc
@@ -51,8 +51,8 @@ The camel-kafka source connector supports 121 options, which are listed below.
 | *camel.source.endpoint.fetchMinBytes* | The minimum amount of data the server should return for a fetch request. If insufficient data is available the request will wait for that much data to accumulate before answering the request. | "1" | false | MEDIUM
 | *camel.source.endpoint.fetchWaitMaxMs* | The maximum amount of time the server will block before answering the fetch request if there isn't sufficient data to immediately satisfy fetch.min.bytes | "500" | false | MEDIUM
 | *camel.source.endpoint.groupId* | A string that uniquely identifies the group of consumer processes to which this consumer belongs. By setting the same group id multiple processes indicate that they are all part of the same consumer group. This option is required for consumers. | null | false | MEDIUM
+| *camel.source.endpoint.headerDeserializer* | To use a custom KafkaHeaderDeserializer to deserialize kafka headers values | null | false | MEDIUM
 | *camel.source.endpoint.heartbeatIntervalMs* | The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1/3 of that value. It can be adjusted even lower to control the expected time for normal r [...]
-| *camel.source.endpoint.kafkaHeaderDeserializer* | To use a custom KafkaHeaderDeserializer to deserialize kafka headers values | null | false | MEDIUM
 | *camel.source.endpoint.keyDeserializer* | Deserializer class for key that implements the Deserializer interface. | "org.apache.kafka.common.serialization.StringDeserializer" | false | MEDIUM
 | *camel.source.endpoint.maxPartitionFetchBytes* | The maximum amount of data per-partition the server will return. The maximum total memory used for a request will be #partitions max.partition.fetch.bytes. This size must be at least as large as the maximum message size the server allows or else it is possible for the producer to send messages larger than the consumer can fetch. If that happens, the consumer can get stuck trying to fetch a large message on a certain partition. | "1048576 [...]
 | *camel.source.endpoint.maxPollIntervalMs* | The maximum delay between invocations of poll() when using consumer group management. This places an upper bound on the amount of time that the consumer can be idle before fetching more records. If poll() is not called before expiration of this timeout, then the consumer is considered failed and the group will rebalance in order to reassign the partitions to another member. | null | false | MEDIUM
@@ -112,8 +112,8 @@ The camel-kafka source connector supports 121 options, which are listed below.
 | *camel.component.kafka.fetchMinBytes* | The minimum amount of data the server should return for a fetch request. If insufficient data is available the request will wait for that much data to accumulate before answering the request. | "1" | false | MEDIUM
 | *camel.component.kafka.fetchWaitMaxMs* | The maximum amount of time the server will block before answering the fetch request if there isn't sufficient data to immediately satisfy fetch.min.bytes | "500" | false | MEDIUM
 | *camel.component.kafka.groupId* | A string that uniquely identifies the group of consumer processes to which this consumer belongs. By setting the same group id multiple processes indicate that they are all part of the same consumer group. This option is required for consumers. | null | false | MEDIUM
+| *camel.component.kafka.headerDeserializer* | To use a custom KafkaHeaderDeserializer to deserialize kafka headers values | null | false | MEDIUM
 | *camel.component.kafka.heartbeatIntervalMs* | The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1/3 of that value. It can be adjusted even lower to control the expected time for normal r [...]
-| *camel.component.kafka.kafkaHeaderDeserializer* | To use a custom KafkaHeaderDeserializer to deserialize kafka headers values | null | false | MEDIUM
 | *camel.component.kafka.keyDeserializer* | Deserializer class for key that implements the Deserializer interface. | "org.apache.kafka.common.serialization.StringDeserializer" | false | MEDIUM
 | *camel.component.kafka.maxPartitionFetchBytes* | The maximum amount of data per-partition the server will return. The maximum total memory used for a request will be #partitions max.partition.fetch.bytes. This size must be at least as large as the maximum message size the server allows or else it is possible for the producer to send messages larger than the consumer can fetch. If that happens, the consumer can get stuck trying to fetch a large message on a certain partition. | "1048576 [...]
 | *camel.component.kafka.maxPollIntervalMs* | The maximum delay between invocations of poll() when using consumer group management. This places an upper bound on the amount of time that the consumer can be idle before fetching more records. If poll() is not called before expiration of this timeout, then the consumer is considered failed and the group will rebalance in order to reassign the partitions to another member. | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kubernetes-custom-resources-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-custom-resources-kafka-sink-connector.adoc
new file mode 100644
index 0000000..7eef4e7
--- /dev/null
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-custom-resources-kafka-sink-connector.adoc
@@ -0,0 +1,78 @@
+// kafka-connector options: START
+[[camel-kubernetes-custom-resources-kafka-connector-sink]]
+= camel-kubernetes-custom-resources-kafka-connector sink configuration
+
+When using camel-kubernetes-custom-resources-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.apache.camel.kafkaconnector</groupId>
+  <artifactId>camel-kubernetes-custom-resources-kafka-connector</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel Kafka connector version -->
+</dependency>
+----
+
+To use this Sink connector in Kafka connect you'll need to set the following connector.class
+
+[source,java]
+----
+connector.class=org.apache.camel.kafkaconnector.kubernetescustomresources.CamelKubernetescustomresourcesSinkConnector
+----
+
+
+The camel-kubernetes-custom-resources sink connector supports 25 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,1,1",options="header"]
+|===
+| Name | Description | Default | Required | Priority
+| *camel.sink.path.masterUrl* | Kubernetes Master url | null | true | HIGH
+| *camel.sink.endpoint.apiVersion* | The Kubernetes API Version to use | null | false | MEDIUM
+| *camel.sink.endpoint.dnsDomain* | The dns domain, used for ServiceCall EIP | null | false | MEDIUM
+| *camel.sink.endpoint.kubernetesClient* | Default KubernetesClient to use if provided | null | false | MEDIUM
+| *camel.sink.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
+| *camel.sink.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
+| *camel.sink.endpoint.lazyStartProducer* | 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 when the first message is processed then cre [...]
+| *camel.sink.endpoint.operation* | Producer operation to do on Kubernetes | null | false | MEDIUM
+| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
+| *camel.sink.endpoint.connectionTimeout* | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. | null | false | MEDIUM
+| *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
+| *camel.sink.endpoint.caCertData* | The CA Cert Data | null | false | MEDIUM
+| *camel.sink.endpoint.caCertFile* | The CA Cert File | null | false | MEDIUM
+| *camel.sink.endpoint.clientCertData* | The Client Cert Data | null | false | MEDIUM
+| *camel.sink.endpoint.clientCertFile* | The Client Cert File | null | false | MEDIUM
+| *camel.sink.endpoint.clientKeyAlgo* | The Key Algorithm used by the client | null | false | MEDIUM
+| *camel.sink.endpoint.clientKeyData* | The Client Key data | null | false | MEDIUM
+| *camel.sink.endpoint.clientKeyFile* | The Client Key file | null | false | MEDIUM
+| *camel.sink.endpoint.clientKeyPassphrase* | The Client Key Passphrase | null | false | MEDIUM
+| *camel.sink.endpoint.oauthToken* | The Auth Token | null | false | MEDIUM
+| *camel.sink.endpoint.password* | Password to connect to Kubernetes | null | false | MEDIUM
+| *camel.sink.endpoint.trustCerts* | Define if the certs we used are trusted anyway or not | null | false | MEDIUM
+| *camel.sink.endpoint.username* | Username to connect to Kubernetes | null | false | MEDIUM
+| *camel.component.kubernetes-custom-resources.lazy StartProducer* | 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 when the first mess [...]
+| *camel.component.kubernetes-custom-resources.basic PropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+|===
+
+
+
+The camel-kubernetes-custom-resources sink connector has no converters out of the box.
+
+
+
+
+
+The camel-kubernetes-custom-resources sink connector has no transforms out of the box.
+
+
+
+
+
+The camel-kubernetes-custom-resources sink connector has no aggregation strategies out of the box.
+
+
+
+
+// kafka-connector options: END
diff --git a/connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-custom-resources-kafka-source-connector.adoc
similarity index 66%
copy from connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc
copy to docs/modules/ROOT/pages/connectors/camel-kubernetes-custom-resources-kafka-source-connector.adoc
index 8268d5a..392112e 100644
--- a/connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-custom-resources-kafka-source-connector.adoc
@@ -1,14 +1,14 @@
 // kafka-connector options: START
-[[camel-kubernetes-pods-kafka-connector-source]]
-= camel-kubernetes-pods-kafka-connector source configuration
+[[camel-kubernetes-custom-resources-kafka-connector-source]]
+= camel-kubernetes-custom-resources-kafka-connector source configuration
 
-When using camel-kubernetes-pods-kafka-connector as source make sure to use the following Maven dependency to have support for the connector:
+When using camel-kubernetes-custom-resources-kafka-connector as source make sure to use the following Maven dependency to have support for the connector:
 
 [source,xml]
 ----
 <dependency>
   <groupId>org.apache.camel.kafkaconnector</groupId>
-  <artifactId>camel-kubernetes-pods-kafka-connector</artifactId>
+  <artifactId>camel-kubernetes-custom-resources-kafka-connector</artifactId>
   <version>x.x.x</version>
   <!-- use the same version as your Camel Kafka connector version -->
 </dependency>
@@ -18,11 +18,11 @@ To use this Source connector in Kafka connect you'll need to set the following c
 
 [source,java]
 ----
-connector.class=org.apache.camel.kafkaconnector.kubernetespods.CamelKubernetespodsSourceConnector
+connector.class=org.apache.camel.kafkaconnector.kubernetescustomresources.CamelKubernetescustomresourcesSourceConnector
 ----
 
 
-The camel-kubernetes-pods source connector supports 31 options, which are listed below.
+The camel-kubernetes-custom-resources source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-pods source connector supports 31 options, which are listed
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
@@ -58,23 +63,27 @@ The camel-kubernetes-pods source connector supports 31 options, which are listed
 | *camel.source.endpoint.password* | Password to connect to Kubernetes | null | false | MEDIUM
 | *camel.source.endpoint.trustCerts* | Define if the certs we used are trusted anyway or not | null | false | MEDIUM
 | *camel.source.endpoint.username* | Username to connect to Kubernetes | null | false | MEDIUM
-| *camel.component.kubernetes-pods.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.kubernetes-pods.basicProperty Binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.kubernetes-custom-resources.bridge ErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | fal [...]
+| *camel.component.kubernetes-custom-resources.basic PropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
 |===
 
 
 
-The camel-kubernetes-pods sink connector has no converters out of the box.
+The camel-kubernetes-custom-resources sink connector has no converters out of the box.
 
 
 
 
 
-The camel-kubernetes-pods sink connector has no transforms out of the box.
+The camel-kubernetes-custom-resources sink connector has no transforms out of the box.
 
 
 
 
 
-The camel-kubernetes-pods sink connector has no aggregation strategies out of the box.
+The camel-kubernetes-custom-resources sink connector has no aggregation strategies out of the box.
+
+
+
+
 // kafka-connector options: END
diff --git a/docs/modules/ROOT/pages/connectors/camel-kubernetes-deployments-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-deployments-kafka-source-connector.adoc
index 50b850b..af44770 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kubernetes-deployments-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-deployments-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesdeployments.CamelKuber
 ----
 
 
-The camel-kubernetes-deployments source connector supports 31 options, which are listed below.
+The camel-kubernetes-deployments source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-deployments source connector supports 31 options, which are
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kubernetes-hpa-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-hpa-kafka-source-connector.adoc
index 41f8af4..7478695 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kubernetes-hpa-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-hpa-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kuberneteshpa.CamelKuberneteshpa
 ----
 
 
-The camel-kubernetes-hpa source connector supports 31 options, which are listed below.
+The camel-kubernetes-hpa source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-hpa source connector supports 31 options, which are listed
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kubernetes-job-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-job-kafka-source-connector.adoc
index 5567b8e..c004ffe 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kubernetes-job-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-job-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesjob.CamelKubernetesjob
 ----
 
 
-The camel-kubernetes-job source connector supports 31 options, which are listed below.
+The camel-kubernetes-job source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-job source connector supports 31 options, which are listed
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kubernetes-namespaces-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-namespaces-kafka-source-connector.adoc
index 9f4800f..f91d7d5 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kubernetes-namespaces-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-namespaces-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesnamespaces.CamelKubern
 ----
 
 
-The camel-kubernetes-namespaces source connector supports 31 options, which are listed below.
+The camel-kubernetes-namespaces source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-namespaces source connector supports 31 options, which are
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kubernetes-nodes-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-nodes-kafka-source-connector.adoc
index 0142cb6..f894c79 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kubernetes-nodes-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-nodes-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesnodes.CamelKubernetesn
 ----
 
 
-The camel-kubernetes-nodes source connector supports 31 options, which are listed below.
+The camel-kubernetes-nodes source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-nodes source connector supports 31 options, which are liste
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kubernetes-pods-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-pods-kafka-source-connector.adoc
index 8268d5a..0144dfe 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kubernetes-pods-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-pods-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetespods.CamelKubernetespo
 ----
 
 
-The camel-kubernetes-pods source connector supports 31 options, which are listed below.
+The camel-kubernetes-pods source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-pods source connector supports 31 options, which are listed
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kubernetes-replication-controllers-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-replication-controllers-kafka-source-connector.adoc
index 9558c33..d02bebb 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kubernetes-replication-controllers-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-replication-controllers-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesreplicationcontrollers
 ----
 
 
-The camel-kubernetes-replication-controllers source connector supports 31 options, which are listed below.
+The camel-kubernetes-replication-controllers source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-replication-controllers source connector supports 31 option
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kubernetes-services-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-services-kafka-source-connector.adoc
index cb22eb5..9959302 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kubernetes-services-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-services-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesservices.CamelKubernet
 ----
 
 
-The camel-kubernetes-services source connector supports 31 options, which are listed below.
+The camel-kubernetes-services source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-services source connector supports 31 options, which are li
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-pulsar-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-pulsar-kafka-source-connector.adoc
index 61f835b..ac577d8 100644
--- a/docs/modules/ROOT/pages/connectors/camel-pulsar-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-pulsar-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.pulsar.CamelPulsarSourceConnecto
 ----
 
 
-The camel-pulsar source connector supports 45 options, which are listed below.
+The camel-pulsar source connector supports 47 options, which are listed below.
 
 
 
@@ -44,6 +44,7 @@ The camel-pulsar source connector supports 45 options, which are listed below.
 | *camel.source.endpoint.maxRedeliverCount* | Maximum number of times that a message will be redelivered before being sent to the dead letter queue. If this value is not set, no Dead Letter Policy will be created | null | false | MEDIUM
 | *camel.source.endpoint.negativeAckRedeliveryDelay Micros* | Set the negative acknowledgement delay | 60000000L | false | MEDIUM
 | *camel.source.endpoint.numberOfConsumers* | Number of consumers - defaults to 1 | 1 | false | MEDIUM
+| *camel.source.endpoint.readCompacted* | Enable compacted topic reading. | false | false | MEDIUM
 | *camel.source.endpoint.subscriptionInitialPosition* | Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST] | "LATEST" | false | MEDIUM
 | *camel.source.endpoint.subscriptionName* | Name of the subscription to use | "subs" | false | MEDIUM
 | *camel.source.endpoint.subscriptionTopicsMode* | Determines to which topics this consumer should be subscribed to - Persistent, Non-Persistent, or both. Only used with pattern subscriptions. One of: [PersistentOnly] [NonPersistentOnly] [AllTopics] | "PersistentOnly" | false | MEDIUM
@@ -65,6 +66,7 @@ The camel-pulsar source connector supports 45 options, which are listed below.
 | *camel.component.pulsar.maxRedeliverCount* | Maximum number of times that a message will be redelivered before being sent to the dead letter queue. If this value is not set, no Dead Letter Policy will be created | null | false | MEDIUM
 | *camel.component.pulsar.negativeAckRedeliveryDelay Micros* | Set the negative acknowledgement delay | 60000000L | false | MEDIUM
 | *camel.component.pulsar.numberOfConsumers* | Number of consumers - defaults to 1 | 1 | false | MEDIUM
+| *camel.component.pulsar.readCompacted* | Enable compacted topic reading. | false | false | MEDIUM
 | *camel.component.pulsar.subscriptionInitialPosition* | Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST] | "LATEST" | false | MEDIUM
 | *camel.component.pulsar.subscriptionName* | Name of the subscription to use | "subs" | false | MEDIUM
 | *camel.component.pulsar.subscriptionTopicsMode* | Determines to which topics this consumer should be subscribed to - Persistent, Non-Persistent, or both. Only used with pattern subscriptions. One of: [PersistentOnly] [NonPersistentOnly] [AllTopics] | "PersistentOnly" | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-vertx-websocket-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-vertx-websocket-kafka-sink-connector.adoc
index 95cc27e..de18bdb 100644
--- a/docs/modules/ROOT/pages/connectors/camel-vertx-websocket-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-vertx-websocket-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.vertxwebsocket.CamelVertxwebsock
 ----
 
 
-The camel-vertx-websocket sink connector supports 15 options, which are listed below.
+The camel-vertx-websocket sink connector supports 16 options, which are listed below.
 
 
 
@@ -33,6 +33,7 @@ The camel-vertx-websocket sink connector supports 15 options, which are listed b
 | *camel.sink.path.port* | The port that the consumer should bind to or port of the remote websocket destination that the producer should connect to | 0 | false | MEDIUM
 | *camel.sink.path.path* | The path that the consumer should bind to or path of the remote websocket destination that the producer should connect to | "/" | true | HIGH
 | *camel.sink.endpoint.clientOptions* | Sets customized options for configuring the WebSocket client used in the producer | null | false | MEDIUM
+| *camel.sink.endpoint.clientSubProtocols* | Comma separated list of WebSocket subprotocols that the client should use for the Sec-WebSocket-Protocol header | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 when the first message is processed then cre [...]
 | *camel.sink.endpoint.sendToAll* | To send to all websocket subscribers. Can be used to configure on endpoint level, instead of having to use the VertxWebsocketConstants.SEND_TO_ALL header on the message. | false | false | MEDIUM
 | *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM