You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/03/04 05:12:55 UTC

[camel-kafka-connector] branch camel-master updated: [create-pull-request] automated change

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

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


The following commit(s) were added to refs/heads/camel-master by this push:
     new f346be2  [create-pull-request] automated change
f346be2 is described below

commit f346be26563f1e3bb1809faa939efe2a7ced1dbe
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Thu Mar 4 03:40:50 2021 +0000

    [create-pull-request] automated change
---
 .../resources/connectors/camel-aws2-cw-sink.json   | 26 +++++++
 .../resources/connectors/camel-aws2-ddb-sink.json  | 26 +++++++
 .../connectors/camel-aws2-ddbstream-source.json    | 26 +++++++
 .../resources/connectors/camel-aws2-ec2-sink.json  | 26 +++++++
 .../resources/connectors/camel-aws2-ecs-sink.json  | 26 +++++++
 .../resources/connectors/camel-aws2-eks-sink.json  | 26 +++++++
 .../connectors/camel-aws2-eventbridge-sink.json    | 26 +++++++
 .../resources/connectors/camel-aws2-iam-sink.json  | 26 +++++++
 .../resources/connectors/camel-aws2-kms-sink.json  | 26 +++++++
 .../connectors/camel-aws2-lambda-sink.json         | 26 +++++++
 .../resources/connectors/camel-aws2-mq-sink.json   | 26 +++++++
 .../resources/connectors/camel-aws2-msk-sink.json  | 26 +++++++
 .../resources/connectors/camel-aws2-ses-sink.json  | 26 +++++++
 .../resources/connectors/camel-aws2-sns-sink.json  | 26 +++++++
 .../resources/connectors/camel-aws2-sqs-sink.json  | 26 +++++++
 .../connectors/camel-aws2-sqs-source.json          | 26 +++++++
 .../resources/connectors/camel-file-sink.json      |  2 +-
 .../connectors/camel-google-pubsub-sink.json       |  6 ++
 .../connectors/camel-google-pubsub-source.json     |  6 ++
 .../connectors/camel-google-storage-sink.json      |  6 +-
 .../connectors/camel-google-storage-source.json    |  6 +-
 .../resources/connectors/camel-http-sink.json      | 86 +++++++++++++++++++++-
 .../resources/connectors/camel-https-sink.json     | 86 +++++++++++++++++++++-
 .../resources/connectors/camel-resteasy-sink.json  | 86 +++++++++++++++++++++-
 .../connectors/camel-resteasy-source.json          | 49 ++++++++++++
 .../resources/connectors/camel-slack-sink.json     | 12 +++
 .../resources/connectors/camel-slack-source.json   | 38 ++++++++--
 .../resources/descriptors/connectors.properties    |  2 -
 .../generated/resources/camel-aws2-cw-sink.json    | 26 +++++++
 .../docs/camel-aws2-cw-kafka-sink-connector.adoc   |  6 +-
 .../aws2cw/CamelAws2cwSinkConnectorConfig.java     | 16 ++++
 .../generated/resources/camel-aws2-ddb-sink.json   | 26 +++++++
 .../docs/camel-aws2-ddb-kafka-sink-connector.adoc  |  6 +-
 .../aws2ddb/CamelAws2ddbSinkConnectorConfig.java   | 16 ++++
 .../resources/camel-aws2-ddbstream-source.json     | 26 +++++++
 ...amel-aws2-ddbstream-kafka-source-connector.adoc |  6 +-
 .../CamelAws2ddbstreamSourceConnectorConfig.java   | 16 ++++
 .../generated/resources/camel-aws2-ec2-sink.json   | 26 +++++++
 .../docs/camel-aws2-ec2-kafka-sink-connector.adoc  |  6 +-
 .../aws2ec2/CamelAws2ec2SinkConnectorConfig.java   | 16 ++++
 .../generated/resources/camel-aws2-ecs-sink.json   | 26 +++++++
 .../docs/camel-aws2-ecs-kafka-sink-connector.adoc  |  6 +-
 .../aws2ecs/CamelAws2ecsSinkConnectorConfig.java   | 16 ++++
 .../generated/resources/camel-aws2-eks-sink.json   | 26 +++++++
 .../docs/camel-aws2-eks-kafka-sink-connector.adoc  |  6 +-
 .../aws2eks/CamelAws2eksSinkConnectorConfig.java   | 16 ++++
 .../resources/camel-aws2-eventbridge-sink.json     | 26 +++++++
 ...amel-aws2-eventbridge-kafka-sink-connector.adoc |  6 +-
 .../CamelAws2eventbridgeSinkConnectorConfig.java   | 16 ++++
 .../generated/resources/camel-aws2-iam-sink.json   | 26 +++++++
 .../docs/camel-aws2-iam-kafka-sink-connector.adoc  |  6 +-
 .../aws2iam/CamelAws2iamSinkConnectorConfig.java   | 16 ++++
 .../generated/resources/camel-aws2-kms-sink.json   | 26 +++++++
 .../docs/camel-aws2-kms-kafka-sink-connector.adoc  |  6 +-
 .../aws2kms/CamelAws2kmsSinkConnectorConfig.java   | 16 ++++
 .../resources/camel-aws2-lambda-sink.json          | 26 +++++++
 .../camel-aws2-lambda-kafka-sink-connector.adoc    |  6 +-
 .../CamelAws2lambdaSinkConnectorConfig.java        | 16 ++++
 .../generated/resources/camel-aws2-mq-sink.json    | 26 +++++++
 .../docs/camel-aws2-mq-kafka-sink-connector.adoc   |  6 +-
 .../aws2mq/CamelAws2mqSinkConnectorConfig.java     | 16 ++++
 .../generated/resources/camel-aws2-msk-sink.json   | 26 +++++++
 .../docs/camel-aws2-msk-kafka-sink-connector.adoc  |  6 +-
 .../aws2msk/CamelAws2mskSinkConnectorConfig.java   | 16 ++++
 .../generated/resources/camel-aws2-ses-sink.json   | 26 +++++++
 .../docs/camel-aws2-ses-kafka-sink-connector.adoc  |  6 +-
 .../aws2ses/CamelAws2sesSinkConnectorConfig.java   | 16 ++++
 .../generated/resources/camel-aws2-sns-sink.json   | 26 +++++++
 .../docs/camel-aws2-sns-kafka-sink-connector.adoc  |  6 +-
 .../aws2sns/CamelAws2snsSinkConnectorConfig.java   | 16 ++++
 .../generated/resources/camel-aws2-sqs-sink.json   | 26 +++++++
 .../generated/resources/camel-aws2-sqs-source.json | 26 +++++++
 .../docs/camel-aws2-sqs-kafka-sink-connector.adoc  |  6 +-
 .../camel-aws2-sqs-kafka-source-connector.adoc     |  6 +-
 .../aws2sqs/CamelAws2sqsSinkConnectorConfig.java   | 16 ++++
 .../aws2sqs/CamelAws2sqsSourceConnectorConfig.java | 16 ++++
 .../src/generated/resources/camel-file-sink.json   |  2 +-
 .../main/docs/camel-file-kafka-sink-connector.adoc |  2 +-
 .../file/CamelFileSinkConnectorConfig.java         |  2 +-
 .../resources/camel-google-pubsub-sink.json        |  6 ++
 .../resources/camel-google-pubsub-source.json      |  6 ++
 .../camel-google-pubsub-kafka-sink-connector.adoc  |  3 +-
 ...camel-google-pubsub-kafka-source-connector.adoc |  3 +-
 .../CamelGooglepubsubSinkConnectorConfig.java      |  4 +
 .../CamelGooglepubsubSourceConnectorConfig.java    |  4 +
 .../resources/camel-google-storage-sink.json       |  6 +-
 .../resources/camel-google-storage-source.json     |  6 +-
 .../camel-google-storage-kafka-sink-connector.adoc |  8 +-
 ...amel-google-storage-kafka-source-connector.adoc |  8 +-
 .../CamelGooglestorageSinkConnectorConfig.java     |  4 +-
 .../CamelGooglestorageSourceConnectorConfig.java   |  4 +-
 .../src/generated/resources/camel-http-sink.json   | 86 +++++++++++++++++++++-
 .../main/docs/camel-http-kafka-sink-connector.adoc | 16 +++-
 .../http/CamelHttpSinkConnectorConfig.java         | 50 ++++++++++++-
 .../src/generated/resources/camel-https-sink.json  | 86 +++++++++++++++++++++-
 .../docs/camel-https-kafka-sink-connector.adoc     | 16 +++-
 .../https/CamelHttpsSinkConnectorConfig.java       | 50 ++++++++++++-
 .../generated/resources/camel-resteasy-sink.json   | 86 +++++++++++++++++++++-
 .../generated/resources/camel-resteasy-source.json | 49 ++++++++++++
 .../docs/camel-resteasy-kafka-sink-connector.adoc  | 16 +++-
 .../camel-resteasy-kafka-source-connector.adoc     |  9 ++-
 .../resteasy/CamelResteasySinkConnectorConfig.java | 50 ++++++++++++-
 .../CamelResteasySourceConnectorConfig.java        | 28 +++++++
 .../src/generated/resources/camel-slack-sink.json  | 12 +++
 .../generated/resources/camel-slack-source.json    | 38 ++++++++--
 .../docs/camel-slack-kafka-sink-connector.adoc     |  4 +-
 .../docs/camel-slack-kafka-source-connector.adoc   |  7 +-
 .../slack/CamelSlackSinkConnectorConfig.java       |  8 ++
 .../slack/CamelSlackSourceConnectorConfig.java     | 20 ++++-
 docs/modules/ROOT/nav.adoc                         |  3 -
 docs/modules/ROOT/pages/connectors.adoc            |  3 +-
 .../camel-aws2-cw-kafka-sink-connector.adoc        |  6 +-
 .../camel-aws2-ddb-kafka-sink-connector.adoc       |  6 +-
 ...amel-aws2-ddbstream-kafka-source-connector.adoc |  6 +-
 .../camel-aws2-ec2-kafka-sink-connector.adoc       |  6 +-
 .../camel-aws2-ecs-kafka-sink-connector.adoc       |  6 +-
 .../camel-aws2-eks-kafka-sink-connector.adoc       |  6 +-
 ...amel-aws2-eventbridge-kafka-sink-connector.adoc |  6 +-
 .../camel-aws2-iam-kafka-sink-connector.adoc       |  6 +-
 .../camel-aws2-kms-kafka-sink-connector.adoc       |  6 +-
 .../camel-aws2-lambda-kafka-sink-connector.adoc    |  6 +-
 .../camel-aws2-mq-kafka-sink-connector.adoc        |  6 +-
 .../camel-aws2-msk-kafka-sink-connector.adoc       |  6 +-
 .../camel-aws2-ses-kafka-sink-connector.adoc       |  6 +-
 .../camel-aws2-sns-kafka-sink-connector.adoc       |  6 +-
 .../camel-aws2-sqs-kafka-sink-connector.adoc       |  6 +-
 .../camel-aws2-sqs-kafka-source-connector.adoc     |  6 +-
 .../camel-file-kafka-sink-connector.adoc           |  2 +-
 .../camel-google-pubsub-kafka-sink-connector.adoc  |  3 +-
 ...camel-google-pubsub-kafka-source-connector.adoc |  3 +-
 .../camel-google-storage-kafka-sink-connector.adoc |  8 +-
 ...amel-google-storage-kafka-source-connector.adoc |  8 +-
 .../camel-http-kafka-sink-connector.adoc           | 16 +++-
 .../camel-https-kafka-sink-connector.adoc          | 16 +++-
 .../camel-resteasy-kafka-sink-connector.adoc       | 16 +++-
 .../camel-resteasy-kafka-source-connector.adoc     |  9 ++-
 .../camel-slack-kafka-sink-connector.adoc          |  4 +-
 .../camel-slack-kafka-source-connector.adoc        |  7 +-
 138 files changed, 2329 insertions(+), 133 deletions(-)

diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-cw-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-cw-sink.json
index e52bdd2..6862b65 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-cw-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-cw-sink.json
@@ -34,6 +34,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.proxyHost": {
 			"name": "camel.sink.endpoint.proxyHost",
 			"description": "To define a proxy host when instantiating the CW client",
@@ -82,6 +89,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.value": {
 			"name": "camel.sink.endpoint.value",
 			"description": "The metric value",
@@ -125,6 +138,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-cw.overrideEndpoint": {
+			"name": "camel.component.aws2-cw.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-cw.proxyHost": {
 			"name": "camel.component.aws2-cw.proxyHost",
 			"description": "To define a proxy host when instantiating the CW client",
@@ -173,6 +193,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-cw.uriEndpointOverride": {
+			"name": "camel.component.aws2-cw.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-cw.value": {
 			"name": "camel.component.aws2-cw.value",
 			"description": "The metric value",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddb-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddb-sink.json
index ee6819a..4b9f96b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddb-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddb-sink.json
@@ -66,6 +66,13 @@
 				"UpdateTable"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.proxyHost": {
 			"name": "camel.sink.endpoint.proxyHost",
 			"description": "To define a proxy host when instantiating the DDB client",
@@ -108,6 +115,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.writeCapacity": {
 			"name": "camel.sink.endpoint.writeCapacity",
 			"description": "The provisioned throughput to reserved for writing resources to your table",
@@ -183,6 +196,13 @@
 				"UpdateTable"
 			]
 		},
+		"camel.component.aws2-ddb.overrideEndpoint": {
+			"name": "camel.component.aws2-ddb.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ddb.proxyHost": {
 			"name": "camel.component.aws2-ddb.proxyHost",
 			"description": "To define a proxy host when instantiating the DDB client",
@@ -225,6 +245,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ddb.uriEndpointOverride": {
+			"name": "camel.component.aws2-ddb.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ddb.writeCapacity": {
 			"name": "camel.component.aws2-ddb.writeCapacity",
 			"description": "The provisioned throughput to reserved for writing resources to your table",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json
index 055f135..11afb82 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json
@@ -48,6 +48,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.overrideEndpoint": {
+			"name": "camel.source.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.proxyHost": {
 			"name": "camel.source.endpoint.proxyHost",
 			"description": "To define a proxy host when instantiating the DDBStreams client",
@@ -97,6 +104,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.uriEndpointOverride": {
+			"name": "camel.source.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"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.",
@@ -281,6 +294,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ddbstream.overrideEndpoint": {
+			"name": "camel.component.aws2-ddbstream.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ddbstream.proxyHost": {
 			"name": "camel.component.aws2-ddbstream.proxyHost",
 			"description": "To define a proxy host when instantiating the DDBStreams client",
@@ -323,6 +343,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ddbstream.uriEndpointOverride": {
+			"name": "camel.component.aws2-ddbstream.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ddbstream.autowiredEnabled": {
 			"name": "camel.component.aws2-ddbstream.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ec2-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ec2-sink.json
index 5407786..74926ea 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ec2-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ec2-sink.json
@@ -53,6 +53,13 @@
 				"deleteTags"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -102,6 +109,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ec2.accessKey": {
 			"name": "camel.component.aws2-ec2.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -146,6 +159,13 @@
 				"deleteTags"
 			]
 		},
+		"camel.component.aws2-ec2.overrideEndpoint": {
+			"name": "camel.component.aws2-ec2.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ec2.pojoRequest": {
 			"name": "camel.component.aws2-ec2.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -195,6 +215,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ec2.uriEndpointOverride": {
+			"name": "camel.component.aws2-ec2.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ec2.autowiredEnabled": {
 			"name": "camel.component.aws2-ec2.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ecs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ecs-sink.json
index 60749a6..7003584 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ecs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ecs-sink.json
@@ -40,6 +40,13 @@
 				"deleteCluster"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -83,6 +90,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -126,6 +139,13 @@
 				"deleteCluster"
 			]
 		},
+		"camel.component.aws2-ecs.overrideEndpoint": {
+			"name": "camel.component.aws2-ecs.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ecs.pojoRequest": {
 			"name": "camel.component.aws2-ecs.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -169,6 +189,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ecs.uriEndpointOverride": {
+			"name": "camel.component.aws2-ecs.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ecs.autowiredEnabled": {
 			"name": "camel.component.aws2-ecs.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eks-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eks-sink.json
index 903214c..6815882 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eks-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eks-sink.json
@@ -40,6 +40,13 @@
 				"deleteCluster"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -83,6 +90,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -126,6 +139,13 @@
 				"deleteCluster"
 			]
 		},
+		"camel.component.aws2-eks.overrideEndpoint": {
+			"name": "camel.component.aws2-eks.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-eks.pojoRequest": {
 			"name": "camel.component.aws2-eks.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -169,6 +189,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-eks.uriEndpointOverride": {
+			"name": "camel.component.aws2-eks.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-eks.autowiredEnabled": {
 			"name": "camel.component.aws2-eks.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eventbridge-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eventbridge-sink.json
index dbe8f00..31dc703 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eventbridge-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eventbridge-sink.json
@@ -53,6 +53,13 @@
 				"listRuleNamesByTarget"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -96,6 +103,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -152,6 +165,13 @@
 				"listRuleNamesByTarget"
 			]
 		},
+		"camel.component.aws2-eventbridge.overrideEndpoint": {
+			"name": "camel.component.aws2-eventbridge.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-eventbridge.pojoRequest": {
 			"name": "camel.component.aws2-eventbridge.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -195,6 +215,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-eventbridge.uriEndpointOverride": {
+			"name": "camel.component.aws2-eventbridge.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-eventbridge.autowiredEnabled": {
 			"name": "camel.component.aws2-eventbridge.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-iam-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-iam-sink.json
index bf4a377..ef28770 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-iam-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-iam-sink.json
@@ -49,6 +49,13 @@
 				"removeUserFromGroup"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -93,6 +100,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -145,6 +158,13 @@
 				"removeUserFromGroup"
 			]
 		},
+		"camel.component.aws2-iam.overrideEndpoint": {
+			"name": "camel.component.aws2-iam.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-iam.pojoRequest": {
 			"name": "camel.component.aws2-iam.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -189,6 +209,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-iam.uriEndpointOverride": {
+			"name": "camel.component.aws2-iam.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-iam.autowiredEnabled": {
 			"name": "camel.component.aws2-iam.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kms-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kms-sink.json
index 6bda133..972405c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kms-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kms-sink.json
@@ -42,6 +42,13 @@
 				"enableKey"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -85,6 +92,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -130,6 +143,13 @@
 				"enableKey"
 			]
 		},
+		"camel.component.aws2-kms.overrideEndpoint": {
+			"name": "camel.component.aws2-kms.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-kms.pojoRequest": {
 			"name": "camel.component.aws2-kms.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -173,6 +193,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-kms.uriEndpointOverride": {
+			"name": "camel.component.aws2-kms.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-kms.autowiredEnabled": {
 			"name": "camel.component.aws2-kms.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-lambda-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-lambda-sink.json
index 40b5cac..9f3f3b0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-lambda-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-lambda-sink.json
@@ -49,6 +49,13 @@
 				"listVersions"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -69,6 +76,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.awsLambdaClient": {
 			"name": "camel.sink.endpoint.awsLambdaClient",
 			"description": "To use a existing configured AwsLambdaClient as client",
@@ -150,6 +163,13 @@
 				"listVersions"
 			]
 		},
+		"camel.component.aws2-lambda.overrideEndpoint": {
+			"name": "camel.component.aws2-lambda.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-lambda.pojoRequest": {
 			"name": "camel.component.aws2-lambda.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -170,6 +190,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-lambda.uriEndpointOverride": {
+			"name": "camel.component.aws2-lambda.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-lambda.autowiredEnabled": {
 			"name": "camel.component.aws2-lambda.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-mq-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-mq-sink.json
index c4a0c68..b3726e5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-mq-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-mq-sink.json
@@ -42,6 +42,13 @@
 				"describeBroker"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -85,6 +92,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -130,6 +143,13 @@
 				"describeBroker"
 			]
 		},
+		"camel.component.aws2-mq.overrideEndpoint": {
+			"name": "camel.component.aws2-mq.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-mq.pojoRequest": {
 			"name": "camel.component.aws2-mq.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -173,6 +193,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-mq.uriEndpointOverride": {
+			"name": "camel.component.aws2-mq.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-mq.autowiredEnabled": {
 			"name": "camel.component.aws2-mq.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-msk-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-msk-sink.json
index b12150a..8ea8509 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-msk-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-msk-sink.json
@@ -40,6 +40,13 @@
 				"describeCluster"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -83,6 +90,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -126,6 +139,13 @@
 				"describeCluster"
 			]
 		},
+		"camel.component.aws2-msk.overrideEndpoint": {
+			"name": "camel.component.aws2-msk.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-msk.pojoRequest": {
 			"name": "camel.component.aws2-msk.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -169,6 +189,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-msk.uriEndpointOverride": {
+			"name": "camel.component.aws2-msk.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-msk.autowiredEnabled": {
 			"name": "camel.component.aws2-msk.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ses-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ses-sink.json
index e213542..cf18cf1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ses-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ses-sink.json
@@ -28,6 +28,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.proxyHost": {
 			"name": "camel.sink.endpoint.proxyHost",
 			"description": "To define a proxy host when instantiating the SES client",
@@ -88,6 +95,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -119,6 +132,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ses.overrideEndpoint": {
+			"name": "camel.component.aws2-ses.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ses.proxyHost": {
 			"name": "camel.component.aws2-ses.proxyHost",
 			"description": "To define a proxy host when instantiating the SES client",
@@ -179,6 +199,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ses.uriEndpointOverride": {
+			"name": "camel.component.aws2-ses.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ses.autowiredEnabled": {
 			"name": "camel.component.aws2-ses.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sns-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sns-sink.json
index 123aec7..7b059d4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sns-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sns-sink.json
@@ -75,6 +75,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.policy": {
 			"name": "camel.sink.endpoint.policy",
 			"description": "The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
@@ -143,6 +150,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.useDefaultCredentialsProvider": {
 			"name": "camel.sink.endpoint.useDefaultCredentialsProvider",
 			"description": "Set whether the SNS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
@@ -222,6 +235,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sns.overrideEndpoint": {
+			"name": "camel.component.aws2-sns.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sns.policy": {
 			"name": "camel.component.aws2-sns.policy",
 			"description": "The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
@@ -290,6 +310,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sns.uriEndpointOverride": {
+			"name": "camel.component.aws2-sns.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sns.useDefaultCredentialsProvider": {
 			"name": "camel.component.aws2-sns.useDefaultCredentialsProvider",
 			"description": "Set whether the SNS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
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 37fa656..33feaa7 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
@@ -41,6 +41,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.protocol": {
 			"name": "camel.sink.endpoint.protocol",
 			"description": "The underlying protocol used to communicate with SQS",
@@ -78,6 +85,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.useDefaultCredentialsProvider": {
 			"name": "camel.sink.endpoint.useDefaultCredentialsProvider",
 			"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.",
@@ -232,6 +245,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.overrideEndpoint": {
+			"name": "camel.component.aws2-sqs.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.protocol": {
 			"name": "camel.component.aws2-sqs.protocol",
 			"description": "The underlying protocol used to communicate with SQS",
@@ -269,6 +289,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.uriEndpointOverride": {
+			"name": "camel.component.aws2-sqs.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.useDefaultCredentialsProvider": {
 			"name": "camel.component.aws2-sqs.useDefaultCredentialsProvider",
 			"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.",
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 5f56d2f..22ad918 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
@@ -41,6 +41,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.overrideEndpoint": {
+			"name": "camel.source.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.protocol": {
 			"name": "camel.source.endpoint.protocol",
 			"description": "The underlying protocol used to communicate with SQS",
@@ -78,6 +85,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.uriEndpointOverride": {
+			"name": "camel.source.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.useDefaultCredentialsProvider": {
 			"name": "camel.source.endpoint.useDefaultCredentialsProvider",
 			"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.",
@@ -408,6 +421,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.overrideEndpoint": {
+			"name": "camel.component.aws2-sqs.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.protocol": {
 			"name": "camel.component.aws2-sqs.protocol",
 			"description": "The underlying protocol used to communicate with SQS",
@@ -445,6 +465,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.uriEndpointOverride": {
+			"name": "camel.component.aws2-sqs.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.useDefaultCredentialsProvider": {
 			"name": "camel.component.aws2-sqs.useDefaultCredentialsProvider",
 			"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.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-sink.json
index a4faf60..1d99852 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-sink.json
@@ -35,7 +35,7 @@
 		},
 		"camel.sink.endpoint.appendChars": {
 			"name": "camel.sink.endpoint.appendChars",
-			"description": "Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending to existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n.",
+			"description": "Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending new files or existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-sink.json
index e932581..a269fbd 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-sink.json
@@ -52,6 +52,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.serviceAccountKey": {
+			"name": "camel.sink.endpoint.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the PubSub publisher\/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.synchronousPull": {
 			"name": "camel.sink.endpoint.synchronousPull",
 			"description": "Synchronously pull batches of messages",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-source.json
index 5f7616a..203e05a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-source.json
@@ -52,6 +52,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.serviceAccountKey": {
+			"name": "camel.source.endpoint.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the PubSub publisher\/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.synchronousPull": {
 			"name": "camel.source.endpoint.synchronousPull",
 			"description": "Synchronously pull batches of messages",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-sink.json
index fdecc64..a07f363 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-sink.json
@@ -24,7 +24,7 @@
 		},
 		"camel.sink.endpoint.serviceAccountKey": {
 			"name": "camel.sink.endpoint.serviceAccountKey",
-			"description": "Service account key to authenticate an application as a service account",
+			"description": "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -91,7 +91,7 @@
 		},
 		"camel.component.google-storage.serviceAccountKey": {
 			"name": "camel.component.google-storage.serviceAccountKey",
-			"description": "Service account key to authenticate an application as a service account",
+			"description": "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -151,4 +151,4 @@
 			"required": "false"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-source.json
index 4fa2f06..cc1c02c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-storage-source.json
@@ -24,7 +24,7 @@
 		},
 		"camel.source.endpoint.serviceAccountKey": {
 			"name": "camel.source.endpoint.serviceAccountKey",
-			"description": "Service account key to authenticate an application as a service account",
+			"description": "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -244,7 +244,7 @@
 		},
 		"camel.component.google-storage.serviceAccountKey": {
 			"name": "camel.component.google-storage.serviceAccountKey",
-			"description": "Service account key to authenticate an application as a service account",
+			"description": "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -317,4 +317,4 @@
 			"required": "false"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-http-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-http-sink.json
index 5ea269c..7ab2e41 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-http-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-http-sink.json
@@ -50,7 +50,7 @@
 		},
 		"camel.sink.endpoint.clearExpiredCookies": {
 			"name": "camel.sink.endpoint.clearExpiredCookies",
-			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired.",
+			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -159,6 +159,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.skipRequestHeaders": {
+			"name": "camel.sink.endpoint.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.skipResponseHeaders": {
+			"name": "camel.sink.endpoint.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.clientBuilder": {
 			"name": "camel.sink.endpoint.clientBuilder",
 			"description": "Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint.",
@@ -351,6 +365,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.copyHeaders": {
+			"name": "camel.component.http.copyHeaders",
+			"description": "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers).",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.lazyStartProducer": {
 			"name": "camel.component.http.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 [...]
@@ -365,6 +386,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.skipRequestHeaders": {
+			"name": "camel.component.http.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.http.skipResponseHeaders": {
+			"name": "camel.component.http.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.allowJavaSerializedObject": {
 			"name": "camel.component.http.allowJavaSerializedObject",
 			"description": "Whether to allow java serialization when a request uses context-type=application\/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.",
@@ -372,6 +407,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.authCachingDisabled": {
+			"name": "camel.component.http.authCachingDisabled",
+			"description": "Disables authentication scheme caching",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.http.automaticRetriesDisabled": {
+			"name": "camel.component.http.automaticRetriesDisabled",
+			"description": "Disables automatic request recovery and re-execution",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.autowiredEnabled": {
 			"name": "camel.component.http.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
@@ -392,12 +441,40 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.connectionStateDisabled": {
+			"name": "camel.component.http.connectionStateDisabled",
+			"description": "Disables connection state tracking",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.connectionTimeToLive": {
 			"name": "camel.component.http.connectionTimeToLive",
 			"description": "The time for connection to live, the time unit is millisecond, the default value is always keep alive.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.contentCompressionDisabled": {
+			"name": "camel.component.http.contentCompressionDisabled",
+			"description": "Disables automatic content decompression",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.http.cookieManagementDisabled": {
+			"name": "camel.component.http.cookieManagementDisabled",
+			"description": "Disables state (cookie) management",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.http.defaultUserAgentDisabled": {
+			"name": "camel.component.http.defaultUserAgentDisabled",
+			"description": "Disables the default user agent set by this builder if none has been provided by the user",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.httpBinding": {
 			"name": "camel.component.http.httpBinding",
 			"description": "To use a custom HttpBinding to control the mapping between Camel message and HttpClient.",
@@ -429,6 +506,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.redirectHandlingDisabled": {
+			"name": "camel.component.http.redirectHandlingDisabled",
+			"description": "Disables automatic redirect handling",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.headerFilterStrategy": {
 			"name": "camel.component.http.headerFilterStrategy",
 			"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json
index a858f83..9cf955c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json
@@ -50,7 +50,7 @@
 		},
 		"camel.sink.endpoint.clearExpiredCookies": {
 			"name": "camel.sink.endpoint.clearExpiredCookies",
-			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired.",
+			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -159,6 +159,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.skipRequestHeaders": {
+			"name": "camel.sink.endpoint.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.skipResponseHeaders": {
+			"name": "camel.sink.endpoint.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.clientBuilder": {
 			"name": "camel.sink.endpoint.clientBuilder",
 			"description": "Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint.",
@@ -351,6 +365,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.copyHeaders": {
+			"name": "camel.component.https.copyHeaders",
+			"description": "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers).",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.lazyStartProducer": {
 			"name": "camel.component.https.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 [...]
@@ -365,6 +386,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.skipRequestHeaders": {
+			"name": "camel.component.https.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.https.skipResponseHeaders": {
+			"name": "camel.component.https.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.allowJavaSerializedObject": {
 			"name": "camel.component.https.allowJavaSerializedObject",
 			"description": "Whether to allow java serialization when a request uses context-type=application\/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.",
@@ -372,6 +407,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.authCachingDisabled": {
+			"name": "camel.component.https.authCachingDisabled",
+			"description": "Disables authentication scheme caching",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.https.automaticRetriesDisabled": {
+			"name": "camel.component.https.automaticRetriesDisabled",
+			"description": "Disables automatic request recovery and re-execution",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.autowiredEnabled": {
 			"name": "camel.component.https.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
@@ -392,12 +441,40 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.connectionStateDisabled": {
+			"name": "camel.component.https.connectionStateDisabled",
+			"description": "Disables connection state tracking",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.connectionTimeToLive": {
 			"name": "camel.component.https.connectionTimeToLive",
 			"description": "The time for connection to live, the time unit is millisecond, the default value is always keep alive.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.contentCompressionDisabled": {
+			"name": "camel.component.https.contentCompressionDisabled",
+			"description": "Disables automatic content decompression",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.https.cookieManagementDisabled": {
+			"name": "camel.component.https.cookieManagementDisabled",
+			"description": "Disables state (cookie) management",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.https.defaultUserAgentDisabled": {
+			"name": "camel.component.https.defaultUserAgentDisabled",
+			"description": "Disables the default user agent set by this builder if none has been provided by the user",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.httpBinding": {
 			"name": "camel.component.https.httpBinding",
 			"description": "To use a custom HttpBinding to control the mapping between Camel message and HttpClient.",
@@ -429,6 +506,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.redirectHandlingDisabled": {
+			"name": "camel.component.https.redirectHandlingDisabled",
+			"description": "Disables automatic redirect handling",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.headerFilterStrategy": {
 			"name": "camel.component.https.headerFilterStrategy",
 			"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-sink.json
index 3a6b57f..86ec319 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-sink.json
@@ -58,7 +58,7 @@
 		},
 		"camel.sink.endpoint.clearExpiredCookies": {
 			"name": "camel.sink.endpoint.clearExpiredCookies",
-			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired.",
+			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -154,6 +154,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.skipRequestHeaders": {
+			"name": "camel.sink.endpoint.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.skipResponseHeaders": {
+			"name": "camel.sink.endpoint.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.headerFilterStrategy": {
 			"name": "camel.sink.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -197,6 +211,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.copyHeaders": {
+			"name": "camel.component.resteasy.copyHeaders",
+			"description": "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers).",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.lazyStartProducer": {
 			"name": "camel.component.resteasy.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 [...]
@@ -211,6 +232,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.skipRequestHeaders": {
+			"name": "camel.component.resteasy.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.skipResponseHeaders": {
+			"name": "camel.component.resteasy.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.allowJavaSerializedObject": {
 			"name": "camel.component.resteasy.allowJavaSerializedObject",
 			"description": "Whether to allow java serialization when a request uses context-type=application\/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.",
@@ -218,6 +253,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.authCachingDisabled": {
+			"name": "camel.component.resteasy.authCachingDisabled",
+			"description": "Disables authentication scheme caching",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.automaticRetriesDisabled": {
+			"name": "camel.component.resteasy.automaticRetriesDisabled",
+			"description": "Disables automatic request recovery and re-execution",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.autowiredEnabled": {
 			"name": "camel.component.resteasy.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
@@ -225,6 +274,41 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.connectionStateDisabled": {
+			"name": "camel.component.resteasy.connectionStateDisabled",
+			"description": "Disables connection state tracking",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.contentCompressionDisabled": {
+			"name": "camel.component.resteasy.contentCompressionDisabled",
+			"description": "Disables automatic content decompression",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.cookieManagementDisabled": {
+			"name": "camel.component.resteasy.cookieManagementDisabled",
+			"description": "Disables state (cookie) management",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.defaultUserAgentDisabled": {
+			"name": "camel.component.resteasy.defaultUserAgentDisabled",
+			"description": "Disables the default user agent set by this builder if none has been provided by the user",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.redirectHandlingDisabled": {
+			"name": "camel.component.resteasy.redirectHandlingDisabled",
+			"description": "Disables automatic redirect handling",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.headerFilterStrategy": {
 			"name": "camel.component.resteasy.headerFilterStrategy",
 			"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-source.json
index 264c925..a7d40dc 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-source.json
@@ -211,6 +211,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.authCachingDisabled": {
+			"name": "camel.component.resteasy.authCachingDisabled",
+			"description": "Disables authentication scheme caching",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.automaticRetriesDisabled": {
+			"name": "camel.component.resteasy.automaticRetriesDisabled",
+			"description": "Disables automatic request recovery and re-execution",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.autowiredEnabled": {
 			"name": "camel.component.resteasy.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
@@ -218,6 +232,41 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.connectionStateDisabled": {
+			"name": "camel.component.resteasy.connectionStateDisabled",
+			"description": "Disables connection state tracking",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.contentCompressionDisabled": {
+			"name": "camel.component.resteasy.contentCompressionDisabled",
+			"description": "Disables automatic content decompression",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.cookieManagementDisabled": {
+			"name": "camel.component.resteasy.cookieManagementDisabled",
+			"description": "Disables state (cookie) management",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.defaultUserAgentDisabled": {
+			"name": "camel.component.resteasy.defaultUserAgentDisabled",
+			"description": "Disables the default user agent set by this builder if none has been provided by the user",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.redirectHandlingDisabled": {
+			"name": "camel.component.resteasy.redirectHandlingDisabled",
+			"description": "Disables automatic redirect handling",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.headerFilterStrategy": {
 			"name": "camel.component.resteasy.headerFilterStrategy",
 			"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json
index c1a9e38..7f21500 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json
@@ -15,6 +15,12 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.sink.endpoint.token": {
+			"name": "camel.sink.endpoint.token",
+			"description": "The token to use",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.iconEmoji": {
 			"name": "camel.sink.endpoint.iconEmoji",
 			"description": "Use a Slack emoji as an avatar",
@@ -60,6 +66,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.slack.token": {
+			"name": "camel.component.slack.token",
+			"description": "The token to use",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.slack.webhookUrl": {
 			"name": "camel.component.slack.webhookUrl",
 			"description": "The incoming webhook URL",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json
index 4edf1c0..592bcec 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json
@@ -15,6 +15,12 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.source.endpoint.token": {
+			"name": "camel.source.endpoint.token",
+			"description": "The token to use",
+			"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.",
@@ -22,6 +28,19 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.conversationType": {
+			"name": "camel.source.endpoint.conversationType",
+			"description": "Type of conversation One of: [PUBLIC_CHANNEL] [PRIVATE_CHANNEL] [MPIM] [IM]",
+			"defaultValue": "\"PUBLIC_CHANNEL\"",
+			"priority": "MEDIUM",
+			"required": "false",
+			"enum": [
+				"PUBLIC_CHANNEL",
+				"PRIVATE_CHANNEL",
+				"MPIM",
+				"IM"
+			]
+		},
 		"camel.source.endpoint.maxResults": {
 			"name": "camel.source.endpoint.maxResults",
 			"description": "The Max Result for the poll",
@@ -29,6 +48,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.naturalOrder": {
+			"name": "camel.source.endpoint.naturalOrder",
+			"description": "Create exchanges in natural order (oldest to newest) or not",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.sendEmptyMessageWhenIdle": {
 			"name": "camel.source.endpoint.sendEmptyMessageWhenIdle",
 			"description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.",
@@ -43,12 +69,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.token": {
-			"name": "camel.source.endpoint.token",
-			"description": "The token to use",
-			"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.",
@@ -196,6 +216,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.slack.token": {
+			"name": "camel.component.slack.token",
+			"description": "The token to use",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.slack.webhookUrl": {
 			"name": "camel.component.slack.webhookUrl",
 			"description": "The incoming webhook URL",
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 3e21850..06de0ee 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties
+++ b/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties
@@ -33,8 +33,6 @@ camel-atomix-value-source
 camel-atomix-value-sink
 camel-avro-source
 camel-avro-sink
-camel-aws-swf-source
-camel-aws-swf-sink
 camel-aws2-athena-sink
 camel-aws2-cw-sink
 camel-aws2-ddb-sink
diff --git a/connectors/camel-aws2-cw-kafka-connector/src/generated/resources/camel-aws2-cw-sink.json b/connectors/camel-aws2-cw-kafka-connector/src/generated/resources/camel-aws2-cw-sink.json
index e52bdd2..6862b65 100644
--- a/connectors/camel-aws2-cw-kafka-connector/src/generated/resources/camel-aws2-cw-sink.json
+++ b/connectors/camel-aws2-cw-kafka-connector/src/generated/resources/camel-aws2-cw-sink.json
@@ -34,6 +34,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.proxyHost": {
 			"name": "camel.sink.endpoint.proxyHost",
 			"description": "To define a proxy host when instantiating the CW client",
@@ -82,6 +89,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.value": {
 			"name": "camel.sink.endpoint.value",
 			"description": "The metric value",
@@ -125,6 +138,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-cw.overrideEndpoint": {
+			"name": "camel.component.aws2-cw.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-cw.proxyHost": {
 			"name": "camel.component.aws2-cw.proxyHost",
 			"description": "To define a proxy host when instantiating the CW client",
@@ -173,6 +193,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-cw.uriEndpointOverride": {
+			"name": "camel.component.aws2-cw.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-cw.value": {
 			"name": "camel.component.aws2-cw.value",
 			"description": "The metric value",
diff --git a/connectors/camel-aws2-cw-kafka-connector/src/main/docs/camel-aws2-cw-kafka-sink-connector.adoc b/connectors/camel-aws2-cw-kafka-connector/src/main/docs/camel-aws2-cw-kafka-sink-connector.adoc
index 63140b0..d99283c 100644
--- a/connectors/camel-aws2-cw-kafka-connector/src/main/docs/camel-aws2-cw-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-cw-kafka-connector/src/main/docs/camel-aws2-cw-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2cw.CamelAws2cwSinkConnector
 ----
 
 
-The camel-aws2-cw sink connector supports 29 options, which are listed below.
+The camel-aws2-cw sink connector supports 33 options, which are listed below.
 
 
 
@@ -35,6 +35,7 @@ The camel-aws2-cw sink connector supports 29 options, which are listed below.
 | *camel.sink.endpoint.amazonCwClient* | To use the AmazonCloudWatch as the client | 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.name* | The metric name | null | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the CW client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the CW client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the CW client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -42,6 +43,7 @@ The camel-aws2-cw sink connector supports 29 options, which are listed below.
 | *camel.sink.endpoint.timestamp* | The metric timestamp | 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.unit* | The metric unit | null | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.value* | The metric value | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -49,6 +51,7 @@ The camel-aws2-cw sink connector supports 29 options, which are listed below.
 | *camel.component.aws2-cw.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-cw.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 [...]
 | *camel.component.aws2-cw.name* | The metric name | null | false | MEDIUM
+| *camel.component.aws2-cw.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-cw.proxyHost* | To define a proxy host when instantiating the CW client | null | false | MEDIUM
 | *camel.component.aws2-cw.proxyPort* | To define a proxy port when instantiating the CW client | null | false | MEDIUM
 | *camel.component.aws2-cw.proxyProtocol* | To define a proxy protocol when instantiating the CW client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -56,6 +59,7 @@ The camel-aws2-cw sink connector supports 29 options, which are listed below.
 | *camel.component.aws2-cw.timestamp* | The metric timestamp | null | false | MEDIUM
 | *camel.component.aws2-cw.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
 | *camel.component.aws2-cw.unit* | The metric unit | null | false | MEDIUM
+| *camel.component.aws2-cw.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-cw.value* | The metric value | null | false | MEDIUM
 | *camel.component.aws2-cw.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-cw.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2cw/CamelAws2cwSinkConnectorConfig.java b/connectors/camel-aws2-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2cw/CamelAws2cwSinkConnectorConfig.java
index 99fb9c1..7f9efef 100644
--- a/connectors/camel-aws2-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2cw/CamelAws2cwSinkConnectorConfig.java
+++ b/connectors/camel-aws2-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2cw/CamelAws2cwSinkConnectorConfig.java
@@ -36,6 +36,9 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_NAME_CONF = "camel.sink.endpoint.name";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_NAME_DOC = "The metric name";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_NAME_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2CW_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2CW_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2CW_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_HOST_CONF = "camel.sink.endpoint.proxyHost";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the CW client";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_HOST_DEFAULT = null;
@@ -57,6 +60,9 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_UNIT_CONF = "camel.sink.endpoint.unit";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_UNIT_DOC = "The metric unit";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_UNIT_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2CW_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2CW_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2CW_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_VALUE_CONF = "camel.sink.endpoint.value";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_VALUE_DOC = "The metric value";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_VALUE_DEFAULT = null;
@@ -78,6 +84,9 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_NAME_CONF = "camel.component.aws2-cw.name";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_NAME_DOC = "The metric name";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_NAME_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2CW_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-cw.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2CW_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2CW_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_PROXY_HOST_CONF = "camel.component.aws2-cw.proxyHost";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the CW client";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_PROXY_HOST_DEFAULT = null;
@@ -99,6 +108,9 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_UNIT_CONF = "camel.component.aws2-cw.unit";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_UNIT_DOC = "The metric unit";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_UNIT_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2CW_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-cw.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2CW_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2CW_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_VALUE_CONF = "camel.component.aws2-cw.value";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_VALUE_DOC = "The metric value";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_VALUE_DEFAULT = null;
@@ -128,6 +140,7 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_AMAZON_CW_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_AMAZON_CW_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_AMAZON_CW_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_NAME_DOC);
+        conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_PROTOCOL_DOC);
@@ -135,6 +148,7 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_TIMESTAMP_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_TIMESTAMP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_TIMESTAMP_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_UNIT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_UNIT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_UNIT_DOC);
+        conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_VALUE_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2CW_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2CW_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_SECRET_KEY_DOC);
@@ -142,6 +156,7 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_NAME_DOC);
+        conf.define(CAMEL_SINK_AWS2CW_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_PROXY_PROTOCOL_DOC);
@@ -149,6 +164,7 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_TIMESTAMP_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_TIMESTAMP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_TIMESTAMP_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_UNIT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_UNIT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_UNIT_DOC);
+        conf.define(CAMEL_SINK_AWS2CW_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_VALUE_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2CW_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_ACCESS_KEY_DOC);
diff --git a/connectors/camel-aws2-ddb-kafka-connector/src/generated/resources/camel-aws2-ddb-sink.json b/connectors/camel-aws2-ddb-kafka-connector/src/generated/resources/camel-aws2-ddb-sink.json
index ee6819a..4b9f96b 100644
--- a/connectors/camel-aws2-ddb-kafka-connector/src/generated/resources/camel-aws2-ddb-sink.json
+++ b/connectors/camel-aws2-ddb-kafka-connector/src/generated/resources/camel-aws2-ddb-sink.json
@@ -66,6 +66,13 @@
 				"UpdateTable"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.proxyHost": {
 			"name": "camel.sink.endpoint.proxyHost",
 			"description": "To define a proxy host when instantiating the DDB client",
@@ -108,6 +115,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.writeCapacity": {
 			"name": "camel.sink.endpoint.writeCapacity",
 			"description": "The provisioned throughput to reserved for writing resources to your table",
@@ -183,6 +196,13 @@
 				"UpdateTable"
 			]
 		},
+		"camel.component.aws2-ddb.overrideEndpoint": {
+			"name": "camel.component.aws2-ddb.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ddb.proxyHost": {
 			"name": "camel.component.aws2-ddb.proxyHost",
 			"description": "To define a proxy host when instantiating the DDB client",
@@ -225,6 +245,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ddb.uriEndpointOverride": {
+			"name": "camel.component.aws2-ddb.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ddb.writeCapacity": {
 			"name": "camel.component.aws2-ddb.writeCapacity",
 			"description": "The provisioned throughput to reserved for writing resources to your table",
diff --git a/connectors/camel-aws2-ddb-kafka-connector/src/main/docs/camel-aws2-ddb-kafka-sink-connector.adoc b/connectors/camel-aws2-ddb-kafka-connector/src/main/docs/camel-aws2-ddb-kafka-sink-connector.adoc
index d29ab1e..e618515 100644
--- a/connectors/camel-aws2-ddb-kafka-connector/src/main/docs/camel-aws2-ddb-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-ddb-kafka-connector/src/main/docs/camel-aws2-ddb-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ddb.CamelAws2ddbSinkConnecto
 ----
 
 
-The camel-aws2-ddb sink connector supports 33 options, which are listed below.
+The camel-aws2-ddb sink connector supports 37 options, which are listed below.
 
 
 
@@ -38,12 +38,14 @@ The camel-aws2-ddb sink connector supports 33 options, which are listed below.
 | *camel.sink.endpoint.keyAttributeType* | Attribute type when creating table | 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.operation* | What operation to perform One of: [BatchGetItems] [DeleteItem] [DeleteTable] [DescribeTable] [GetItem] [PutItem] [Query] [Scan] [UpdateItem] [UpdateTable] | "PutItem" | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the DDB client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | The region in which DynamoDB 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.proxyProtocol* | To define a proxy protocol when instantiating the DDB client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.readCapacity* | The provisioned throughput to reserve for reading resources from your table | null | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which DDB client needs to work | 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.writeCapacity* | The provisioned throughput to reserved for writing resources to your table | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -54,12 +56,14 @@ The camel-aws2-ddb sink connector supports 33 options, which are listed below.
 | *camel.component.aws2-ddb.keyAttributeType* | Attribute type when creating table | null | false | MEDIUM
 | *camel.component.aws2-ddb.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-ddb.operation* | What operation to perform One of: [BatchGetItems] [DeleteItem] [DeleteTable] [DescribeTable] [GetItem] [PutItem] [Query] [Scan] [UpdateItem] [UpdateTable] | "PutItem" | false | MEDIUM
+| *camel.component.aws2-ddb.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ddb.proxyHost* | To define a proxy host when instantiating the DDB client | null | false | MEDIUM
 | *camel.component.aws2-ddb.proxyPort* | The region in which DynamoDB 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-ddb.proxyProtocol* | To define a proxy protocol when instantiating the DDB client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-ddb.readCapacity* | The provisioned throughput to reserve for reading resources from your table | null | false | MEDIUM
 | *camel.component.aws2-ddb.region* | The region in which DDB client needs to work | null | false | MEDIUM
 | *camel.component.aws2-ddb.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-ddb.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-ddb.writeCapacity* | The provisioned throughput to reserved for writing resources to your table | null | false | MEDIUM
 | *camel.component.aws2-ddb.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-ddb.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddb/CamelAws2ddbSinkConnectorConfig.java b/connectors/camel-aws2-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddb/CamelAws2ddbSinkConnectorConfig.java
index cf3927b..dba4635 100644
--- a/connectors/camel-aws2-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddb/CamelAws2ddbSinkConnectorConfig.java
+++ b/connectors/camel-aws2-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddb/CamelAws2ddbSinkConnectorConfig.java
@@ -45,6 +45,9 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_OPERATION_DOC = "What operation to perform One of: [BatchGetItems] [DeleteItem] [DeleteTable] [DescribeTable] [GetItem] [PutItem] [Query] [Scan] [UpdateItem] [UpdateTable]";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_OPERATION_DEFAULT = "PutItem";
+    public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2DDB_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_HOST_CONF = "camel.sink.endpoint.proxyHost";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the DDB client";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_HOST_DEFAULT = null;
@@ -63,6 +66,9 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2DDB_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_WRITE_CAPACITY_CONF = "camel.sink.endpoint.writeCapacity";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_WRITE_CAPACITY_DOC = "The provisioned throughput to reserved for writing resources to your table";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_WRITE_CAPACITY_DEFAULT = null;
@@ -93,6 +99,9 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_OPERATION_CONF = "camel.component.aws2-ddb.operation";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_OPERATION_DOC = "What operation to perform One of: [BatchGetItems] [DeleteItem] [DeleteTable] [DescribeTable] [GetItem] [PutItem] [Query] [Scan] [UpdateItem] [UpdateTable]";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_OPERATION_DEFAULT = "PutItem";
+    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-ddb.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2DDB_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_HOST_CONF = "camel.component.aws2-ddb.proxyHost";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the DDB client";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_HOST_DEFAULT = null;
@@ -111,6 +120,9 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-ddb.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2DDB_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-ddb.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_WRITE_CAPACITY_CONF = "camel.component.aws2-ddb.writeCapacity";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_WRITE_CAPACITY_DOC = "The provisioned throughput to reserved for writing resources to your table";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_WRITE_CAPACITY_DEFAULT = null;
@@ -143,12 +155,14 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_KEY_ATTRIBUTE_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_KEY_ATTRIBUTE_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_KEY_ATTRIBUTE_TYPE_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_READ_CAPACITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_READ_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_READ_CAPACITY_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_WRITE_CAPACITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_WRITE_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_WRITE_CAPACITY_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2DDB_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2DDB_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_SECRET_KEY_DOC);
@@ -159,12 +173,14 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_KEY_ATTRIBUTE_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_KEY_ATTRIBUTE_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_KEY_ATTRIBUTE_TYPE_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_READ_CAPACITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_READ_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_READ_CAPACITY_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_WRITE_CAPACITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_WRITE_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_WRITE_CAPACITY_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2DDB_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_ACCESS_KEY_DOC);
diff --git a/connectors/camel-aws2-ddbstream-kafka-connector/src/generated/resources/camel-aws2-ddbstream-source.json b/connectors/camel-aws2-ddbstream-kafka-connector/src/generated/resources/camel-aws2-ddbstream-source.json
index 055f135..11afb82 100644
--- a/connectors/camel-aws2-ddbstream-kafka-connector/src/generated/resources/camel-aws2-ddbstream-source.json
+++ b/connectors/camel-aws2-ddbstream-kafka-connector/src/generated/resources/camel-aws2-ddbstream-source.json
@@ -48,6 +48,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.overrideEndpoint": {
+			"name": "camel.source.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.proxyHost": {
 			"name": "camel.source.endpoint.proxyHost",
 			"description": "To define a proxy host when instantiating the DDBStreams client",
@@ -97,6 +104,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.uriEndpointOverride": {
+			"name": "camel.source.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"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.",
@@ -281,6 +294,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ddbstream.overrideEndpoint": {
+			"name": "camel.component.aws2-ddbstream.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ddbstream.proxyHost": {
 			"name": "camel.component.aws2-ddbstream.proxyHost",
 			"description": "To define a proxy host when instantiating the DDBStreams client",
@@ -323,6 +343,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ddbstream.uriEndpointOverride": {
+			"name": "camel.component.aws2-ddbstream.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ddbstream.autowiredEnabled": {
 			"name": "camel.component.aws2-ddbstream.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-ddbstream-kafka-connector/src/main/docs/camel-aws2-ddbstream-kafka-source-connector.adoc b/connectors/camel-aws2-ddbstream-kafka-connector/src/main/docs/camel-aws2-ddbstream-kafka-source-connector.adoc
index 0f29b14..0f57a52 100644
--- a/connectors/camel-aws2-ddbstream-kafka-connector/src/main/docs/camel-aws2-ddbstream-kafka-source-connector.adoc
+++ b/connectors/camel-aws2-ddbstream-kafka-connector/src/main/docs/camel-aws2-ddbstream-kafka-source-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ddbstream.CamelAws2ddbstream
 ----
 
 
-The camel-aws2-ddbstream source connector supports 45 options, which are listed below.
+The camel-aws2-ddbstream source connector supports 49 options, which are listed below.
 
 
 
@@ -36,6 +36,7 @@ The camel-aws2-ddbstream source connector supports 45 options, which are listed
 | *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.iteratorType* | Defines where in the DynaboDB stream to start getting records. Note that using TRIM_HORIZON can cause a significant delay before the stream has caught up to real-time. if {AT,AFTER}_SEQUENCE_NUMBER are used, then a sequenceNumberProvider MUST be supplied. One of: [TRIM_HORIZON] [LATEST] [AT_SEQUENCE_NUMBER] [AFTER_SEQUENCE_NUMBER] [null] | "LATEST" | false | MEDIUM
 | *camel.source.endpoint.maxResultsPerRequest* | Maximum number of records that will be fetched in each poll | null | false | MEDIUM
+| *camel.source.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.source.endpoint.proxyHost* | To define a proxy host when instantiating the DDBStreams client | null | false | MEDIUM
 | *camel.source.endpoint.proxyPort* | To define a proxy port when instantiating the DDBStreams client | null | false | MEDIUM
 | *camel.source.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -43,6 +44,7 @@ The camel-aws2-ddbstream source connector supports 45 options, which are listed
 | *camel.source.endpoint.sendEmptyMessageWhenIdle* | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | false | MEDIUM
 | *camel.source.endpoint.sequenceNumberProvider* | Provider for the sequence number when using one of the two ShardIteratorType.{AT,AFTER}_SEQUENCE_NUMBER iterator types. Can be a registry reference or a literal sequence number. | 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | 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
 | *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.pollStrategy* | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | null | false | MEDIUM
@@ -67,12 +69,14 @@ The camel-aws2-ddbstream source connector supports 45 options, which are listed
 | *camel.component.aws2-ddbstream.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.iteratorType* | Defines where in the DynaboDB stream to start getting records. Note that using TRIM_HORIZON can cause a significant delay before the stream has caught up to real-time. if {AT,AFTER}_SEQUENCE_NUMBER are used, then a sequenceNumberProvider MUST be supplied. One of: [TRIM_HORIZON] [LATEST] [AT_SEQUENCE_NUMBER] [AFTER_SEQUENCE_NUMBER] [null] | "LATEST" | false | MEDIUM
 | *camel.component.aws2-ddbstream.maxResultsPer Request* | Maximum number of records that will be fetched in each poll | null | false | MEDIUM
+| *camel.component.aws2-ddbstream.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ddbstream.proxyHost* | To define a proxy host when instantiating the DDBStreams client | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.proxyPort* | To define a proxy port when instantiating the DDBStreams client | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.proxyProtocol* | To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-ddbstream.region* | The region in which DDBStreams client needs to work | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.sequenceNumber Provider* | Provider for the sequence number when using one of the two ShardIteratorType.{AT,AFTER}_SEQUENCE_NUMBER iterator types. Can be a registry reference or a literal sequence number. | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.trustAll Certificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-ddbstream.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-ddbstream.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddbstream/CamelAws2ddbstreamSourceConnectorConfig.java b/connectors/camel-aws2-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddbstream/CamelAws2ddbstreamSourceConnectorConfig.java
index 955d441..cf499ef 100644
--- a/connectors/camel-aws2-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddbstream/CamelAws2ddbstreamSourceConnectorConfig.java
+++ b/connectors/camel-aws2-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddbstream/CamelAws2ddbstreamSourceConnectorConfig.java
@@ -41,6 +41,9 @@ public class CamelAws2ddbstreamSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_MAX_RESULTS_PER_REQUEST_CONF = "camel.source.endpoint.maxResultsPerRequest";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_MAX_RESULTS_PER_REQUEST_DOC = "Maximum number of records that will be fetched in each poll";
     public static final Integer CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_MAX_RESULTS_PER_REQUEST_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.source.endpoint.overrideEndpoint";
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_HOST_CONF = "camel.source.endpoint.proxyHost";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the DDBStreams client";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_HOST_DEFAULT = null;
@@ -62,6 +65,9 @@ public class CamelAws2ddbstreamSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.source.endpoint.trustAllCertificates";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.source.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_CONF = "camel.source.endpoint.exceptionHandler";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_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_AWS2DDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_DEFAULT = null;
@@ -134,6 +140,9 @@ public class CamelAws2ddbstreamSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_MAX_RESULTS_PER_REQUEST_CONF = "camel.component.aws2-ddbstream.maxResultsPerRequest";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_MAX_RESULTS_PER_REQUEST_DOC = "Maximum number of records that will be fetched in each poll";
     public static final Integer CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_MAX_RESULTS_PER_REQUEST_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-ddbstream.overrideEndpoint";
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_HOST_CONF = "camel.component.aws2-ddbstream.proxyHost";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the DDBStreams client";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_HOST_DEFAULT = null;
@@ -152,6 +161,9 @@ public class CamelAws2ddbstreamSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-ddbstream.trustAllCertificates";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-ddbstream.uriEndpointOverride";
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-ddbstream.autowiredEnabled";
     public static final String CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
     public static final Boolean CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -180,6 +192,7 @@ public class CamelAws2ddbstreamSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_ITERATOR_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_ITERATOR_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_ITERATOR_TYPE_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_MAX_RESULTS_PER_REQUEST_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_MAX_RESULTS_PER_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_MAX_RESULTS_PER_REQUEST_DOC);
+        conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_PROXY_PROTOCOL_DOC);
@@ -187,6 +200,7 @@ public class CamelAws2ddbstreamSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_SEQUENCE_NUMBER_PROVIDER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_SEQUENCE_NUMBER_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_SEQUENCE_NUMBER_PROVIDER_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_EXCHANGE_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_POLL_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_POLL_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_ENDPOINT_POLL_STRATEGY_DOC);
@@ -211,12 +225,14 @@ public class CamelAws2ddbstreamSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_ITERATOR_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_ITERATOR_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_ITERATOR_TYPE_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_MAX_RESULTS_PER_REQUEST_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_MAX_RESULTS_PER_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_MAX_RESULTS_PER_REQUEST_DOC);
+        conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_SEQUENCE_NUMBER_PROVIDER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_SEQUENCE_NUMBER_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_SEQUENCE_NUMBER_PROVIDER_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2DDBSTREAM_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-ec2-kafka-connector/src/generated/resources/camel-aws2-ec2-sink.json b/connectors/camel-aws2-ec2-kafka-connector/src/generated/resources/camel-aws2-ec2-sink.json
index 5407786..74926ea 100644
--- a/connectors/camel-aws2-ec2-kafka-connector/src/generated/resources/camel-aws2-ec2-sink.json
+++ b/connectors/camel-aws2-ec2-kafka-connector/src/generated/resources/camel-aws2-ec2-sink.json
@@ -53,6 +53,13 @@
 				"deleteTags"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -102,6 +109,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ec2.accessKey": {
 			"name": "camel.component.aws2-ec2.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -146,6 +159,13 @@
 				"deleteTags"
 			]
 		},
+		"camel.component.aws2-ec2.overrideEndpoint": {
+			"name": "camel.component.aws2-ec2.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ec2.pojoRequest": {
 			"name": "camel.component.aws2-ec2.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -195,6 +215,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ec2.uriEndpointOverride": {
+			"name": "camel.component.aws2-ec2.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ec2.autowiredEnabled": {
 			"name": "camel.component.aws2-ec2.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-ec2-kafka-connector/src/main/docs/camel-aws2-ec2-kafka-sink-connector.adoc b/connectors/camel-aws2-ec2-kafka-connector/src/main/docs/camel-aws2-ec2-kafka-sink-connector.adoc
index b9790a3..3097f40 100644
--- a/connectors/camel-aws2-ec2-kafka-connector/src/main/docs/camel-aws2-ec2-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-ec2-kafka-connector/src/main/docs/camel-aws2-ec2-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ec2.CamelAws2ec2SinkConnecto
 ----
 
 
-The camel-aws2-ec2 sink connector supports 25 options, which are listed below.
+The camel-aws2-ec2 sink connector supports 29 options, which are listed below.
 
 
 
@@ -36,6 +36,7 @@ The camel-aws2-ec2 sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.amazonEc2Client* | To use a existing configured AmazonEC2Client as client | 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.operation* | The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorInstances] [createTags] [deleteTags] | null [...]
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the EC2 client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the EC2 client | null | false | MEDIUM
@@ -43,11 +44,13 @@ The camel-aws2-ec2 sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.region* | The region in which EC2 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.secretKey* | Amazon AWS Secret Key | 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-ec2.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-ec2.amazonEc2Client* | To use a existing configured AmazonEC2Client as client | null | false | MEDIUM
 | *camel.component.aws2-ec2.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-ec2.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-ec2.operation* | The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorInstances] [createTags] [deleteTags] | [...]
+| *camel.component.aws2-ec2.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ec2.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-ec2.proxyHost* | To define a proxy host when instantiating the EC2 client | null | false | MEDIUM
 | *camel.component.aws2-ec2.proxyPort* | To define a proxy port when instantiating the EC2 client | null | false | MEDIUM
@@ -55,6 +58,7 @@ The camel-aws2-ec2 sink connector supports 25 options, which are listed below.
 | *camel.component.aws2-ec2.region* | The region in which EC2 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-ec2.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-ec2.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-ec2.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-ec2.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
diff --git a/connectors/camel-aws2-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ec2/CamelAws2ec2SinkConnectorConfig.java b/connectors/camel-aws2-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ec2/CamelAws2ec2SinkConnectorConfig.java
index 47b368b..c6d4ecd 100644
--- a/connectors/camel-aws2-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ec2/CamelAws2ec2SinkConnectorConfig.java
+++ b/connectors/camel-aws2-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ec2/CamelAws2ec2SinkConnectorConfig.java
@@ -39,6 +39,9 @@ public class CamelAws2ec2SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_OPERATION_DOC = "The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorIns [...]
     public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2EC2_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2EC2_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -60,6 +63,9 @@ public class CamelAws2ec2SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2EC2_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2EC2_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws2-ec2.accessKey";
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -75,6 +81,9 @@ public class CamelAws2ec2SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_OPERATION_CONF = "camel.component.aws2-ec2.operation";
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_OPERATION_DOC = "The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorIn [...]
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2EC2_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-ec2.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2EC2_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2EC2_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-ec2.pojoRequest";
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2EC2_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -96,6 +105,9 @@ public class CamelAws2ec2SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-ec2.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2EC2_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2EC2_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-ec2.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2EC2_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2EC2_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-ec2.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2EC2_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
     public static final Boolean CAMEL_SINK_AWS2EC2_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -117,6 +129,7 @@ public class CamelAws2ec2SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_AMAZON_EC_2CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_ENDPOINT_AMAZON_EC_2CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_AMAZON_EC_2CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EC2_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2EC2_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EC2_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EC2_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_PROXY_PORT_DOC);
@@ -124,11 +137,13 @@ public class CamelAws2ec2SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EC2_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EC2_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2EC2_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EC2_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_AMAZON_EC_2CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_COMPONENT_AMAZON_EC_2CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_AMAZON_EC_2CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EC2_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2EC2_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EC2_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EC2_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_PROXY_PORT_DOC);
@@ -136,6 +151,7 @@ public class CamelAws2ec2SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EC2_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EC2_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EC2_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2EC2_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EC2_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EC2_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
diff --git a/connectors/camel-aws2-ecs-kafka-connector/src/generated/resources/camel-aws2-ecs-sink.json b/connectors/camel-aws2-ecs-kafka-connector/src/generated/resources/camel-aws2-ecs-sink.json
index 60749a6..7003584 100644
--- a/connectors/camel-aws2-ecs-kafka-connector/src/generated/resources/camel-aws2-ecs-sink.json
+++ b/connectors/camel-aws2-ecs-kafka-connector/src/generated/resources/camel-aws2-ecs-sink.json
@@ -40,6 +40,13 @@
 				"deleteCluster"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -83,6 +90,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -126,6 +139,13 @@
 				"deleteCluster"
 			]
 		},
+		"camel.component.aws2-ecs.overrideEndpoint": {
+			"name": "camel.component.aws2-ecs.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ecs.pojoRequest": {
 			"name": "camel.component.aws2-ecs.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -169,6 +189,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ecs.uriEndpointOverride": {
+			"name": "camel.component.aws2-ecs.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ecs.autowiredEnabled": {
 			"name": "camel.component.aws2-ecs.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-ecs-kafka-connector/src/main/docs/camel-aws2-ecs-kafka-sink-connector.adoc b/connectors/camel-aws2-ecs-kafka-connector/src/main/docs/camel-aws2-ecs-kafka-sink-connector.adoc
index 092f7f7..ba4361a 100644
--- a/connectors/camel-aws2-ecs-kafka-connector/src/main/docs/camel-aws2-ecs-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-ecs-kafka-connector/src/main/docs/camel-aws2-ecs-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ecs.CamelAws2ecsSinkConnecto
 ----
 
 
-The camel-aws2-ecs sink connector supports 25 options, which are listed below.
+The camel-aws2-ecs sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-ecs sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.ecsClient* | To use a existing configured AWS ECS as client | 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.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the ECS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the ECS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the ECS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which ECS 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-ecs.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-ecs.ecsClient* | To use a existing configured AWS ECS as client | null | false | MEDIUM
 | *camel.component.aws2-ecs.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-ecs.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
+| *camel.component.aws2-ecs.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ecs.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-ecs.proxyHost* | To define a proxy host when instantiating the ECS client | null | false | MEDIUM
 | *camel.component.aws2-ecs.proxyPort* | To define a proxy port when instantiating the ECS client | null | false | MEDIUM
 | *camel.component.aws2-ecs.proxyProtocol* | To define a proxy protocol when instantiating the ECS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-ecs.region* | The region in which ECS 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-ecs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-ecs.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-ecs.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-ecs.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-ecs.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ecs/CamelAws2ecsSinkConnectorConfig.java b/connectors/camel-aws2-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ecs/CamelAws2ecsSinkConnectorConfig.java
index b42a42f..9d05e17 100644
--- a/connectors/camel-aws2-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ecs/CamelAws2ecsSinkConnectorConfig.java
+++ b/connectors/camel-aws2-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ecs/CamelAws2ecsSinkConnectorConfig.java
@@ -36,6 +36,9 @@ public class CamelAws2ecsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]";
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2ECS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2ECS_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -54,6 +57,9 @@ public class CamelAws2ecsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2ECS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2ECS_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -72,6 +78,9 @@ public class CamelAws2ecsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2ECS_COMPONENT_OPERATION_CONF = "camel.component.aws2-ecs.operation";
     public static final String CAMEL_SINK_AWS2ECS_COMPONENT_OPERATION_DOC = "The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]";
     public static final String CAMEL_SINK_AWS2ECS_COMPONENT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2ECS_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-ecs.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2ECS_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2ECS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2ECS_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-ecs.pojoRequest";
     public static final String CAMEL_SINK_AWS2ECS_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2ECS_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -90,6 +99,9 @@ public class CamelAws2ecsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2ECS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-ecs.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2ECS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2ECS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2ECS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-ecs.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2ECS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2ECS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2ECS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-ecs.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2ECS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
     public static final Boolean CAMEL_SINK_AWS2ECS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -116,24 +128,28 @@ public class CamelAws2ecsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_ECS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_ENDPOINT_ECS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_ECS_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ECS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2ECS_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ECS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ECS_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ECS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2ECS_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2ECS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_ECS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_COMPONENT_ECS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_ECS_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ECS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2ECS_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ECS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ECS_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ECS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ECS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ECS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2ECS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2ECS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2ECS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ECS_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-eks-kafka-connector/src/generated/resources/camel-aws2-eks-sink.json b/connectors/camel-aws2-eks-kafka-connector/src/generated/resources/camel-aws2-eks-sink.json
index 903214c..6815882 100644
--- a/connectors/camel-aws2-eks-kafka-connector/src/generated/resources/camel-aws2-eks-sink.json
+++ b/connectors/camel-aws2-eks-kafka-connector/src/generated/resources/camel-aws2-eks-sink.json
@@ -40,6 +40,13 @@
 				"deleteCluster"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -83,6 +90,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -126,6 +139,13 @@
 				"deleteCluster"
 			]
 		},
+		"camel.component.aws2-eks.overrideEndpoint": {
+			"name": "camel.component.aws2-eks.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-eks.pojoRequest": {
 			"name": "camel.component.aws2-eks.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -169,6 +189,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-eks.uriEndpointOverride": {
+			"name": "camel.component.aws2-eks.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-eks.autowiredEnabled": {
 			"name": "camel.component.aws2-eks.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-eks-kafka-connector/src/main/docs/camel-aws2-eks-kafka-sink-connector.adoc b/connectors/camel-aws2-eks-kafka-connector/src/main/docs/camel-aws2-eks-kafka-sink-connector.adoc
index d20c169..e83fbaa 100644
--- a/connectors/camel-aws2-eks-kafka-connector/src/main/docs/camel-aws2-eks-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-eks-kafka-connector/src/main/docs/camel-aws2-eks-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2eks.CamelAws2eksSinkConnecto
 ----
 
 
-The camel-aws2-eks sink connector supports 25 options, which are listed below.
+The camel-aws2-eks sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-eks sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.eksClient* | To use a existing configured AWS EKS as client | 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.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the EKS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the EKS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the EKS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which EKS 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-eks.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-eks.eksClient* | To use a existing configured AWS EKS as client | null | false | MEDIUM
 | *camel.component.aws2-eks.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-eks.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
+| *camel.component.aws2-eks.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-eks.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-eks.proxyHost* | To define a proxy host when instantiating the EKS client | null | false | MEDIUM
 | *camel.component.aws2-eks.proxyPort* | To define a proxy port when instantiating the EKS client | null | false | MEDIUM
 | *camel.component.aws2-eks.proxyProtocol* | To define a proxy protocol when instantiating the EKS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-eks.region* | The region in which EKS 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-eks.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-eks.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-eks.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-eks.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-eks.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2eks/CamelAws2eksSinkConnectorConfig.java b/connectors/camel-aws2-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2eks/CamelAws2eksSinkConnectorConfig.java
index b14fb6d..5fa9fd4 100644
--- a/connectors/camel-aws2-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2eks/CamelAws2eksSinkConnectorConfig.java
+++ b/connectors/camel-aws2-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2eks/CamelAws2eksSinkConnectorConfig.java
@@ -36,6 +36,9 @@ public class CamelAws2eksSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]";
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2EKS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2EKS_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -54,6 +57,9 @@ public class CamelAws2eksSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2EKS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2EKS_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -72,6 +78,9 @@ public class CamelAws2eksSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2EKS_COMPONENT_OPERATION_CONF = "camel.component.aws2-eks.operation";
     public static final String CAMEL_SINK_AWS2EKS_COMPONENT_OPERATION_DOC = "The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster]";
     public static final String CAMEL_SINK_AWS2EKS_COMPONENT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2EKS_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-eks.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2EKS_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2EKS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2EKS_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-eks.pojoRequest";
     public static final String CAMEL_SINK_AWS2EKS_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2EKS_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -90,6 +99,9 @@ public class CamelAws2eksSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2EKS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-eks.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2EKS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2EKS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2EKS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-eks.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2EKS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2EKS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2EKS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-eks.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2EKS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
     public static final Boolean CAMEL_SINK_AWS2EKS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -116,24 +128,28 @@ public class CamelAws2eksSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_EKS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_ENDPOINT_EKS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_EKS_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EKS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2EKS_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EKS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EKS_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EKS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EKS_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EKS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_EKS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_COMPONENT_EKS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_EKS_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EKS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2EKS_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EKS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EKS_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EKS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EKS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EKS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EKS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2EKS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EKS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EKS_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-eventbridge-kafka-connector/src/generated/resources/camel-aws2-eventbridge-sink.json b/connectors/camel-aws2-eventbridge-kafka-connector/src/generated/resources/camel-aws2-eventbridge-sink.json
index dbe8f00..31dc703 100644
--- a/connectors/camel-aws2-eventbridge-kafka-connector/src/generated/resources/camel-aws2-eventbridge-sink.json
+++ b/connectors/camel-aws2-eventbridge-kafka-connector/src/generated/resources/camel-aws2-eventbridge-sink.json
@@ -53,6 +53,13 @@
 				"listRuleNamesByTarget"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -96,6 +103,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -152,6 +165,13 @@
 				"listRuleNamesByTarget"
 			]
 		},
+		"camel.component.aws2-eventbridge.overrideEndpoint": {
+			"name": "camel.component.aws2-eventbridge.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-eventbridge.pojoRequest": {
 			"name": "camel.component.aws2-eventbridge.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -195,6 +215,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-eventbridge.uriEndpointOverride": {
+			"name": "camel.component.aws2-eventbridge.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-eventbridge.autowiredEnabled": {
 			"name": "camel.component.aws2-eventbridge.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-eventbridge-kafka-connector/src/main/docs/camel-aws2-eventbridge-kafka-sink-connector.adoc b/connectors/camel-aws2-eventbridge-kafka-connector/src/main/docs/camel-aws2-eventbridge-kafka-sink-connector.adoc
index bf448fd..95f58f0 100644
--- a/connectors/camel-aws2-eventbridge-kafka-connector/src/main/docs/camel-aws2-eventbridge-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-eventbridge-kafka-connector/src/main/docs/camel-aws2-eventbridge-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2eventbridge.CamelAws2eventbr
 ----
 
 
-The camel-aws2-eventbridge sink connector supports 27 options, which are listed below.
+The camel-aws2-eventbridge sink connector supports 31 options, which are listed below.
 
 
 
@@ -36,12 +36,14 @@ The camel-aws2-eventbridge sink connector supports 27 options, which are listed
 | *camel.sink.endpoint.eventPatternFile* | EventPattern File | 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.operation* | The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [describeRule] [listRules] [listTargetsByRule] [listRuleNamesByTarget] | "putRule" | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the Eventbridge client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the Eventbridge client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the Eventbridge client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which Eventbridge 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.configuration* | Component configuration | null | false | MEDIUM
@@ -49,12 +51,14 @@ The camel-aws2-eventbridge sink connector supports 27 options, which are listed
 | *camel.component.aws2-eventbridge.eventPatternFile* | EventPattern File | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.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 proce [...]
 | *camel.component.aws2-eventbridge.operation* | The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [describeRule] [listRules] [listTargetsByRule] [listRuleNamesByTarget] | "putRule" | true | HIGH
+| *camel.component.aws2-eventbridge.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-eventbridge.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-eventbridge.proxyHost* | To define a proxy host when instantiating the Eventbridge client | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.proxyPort* | To define a proxy port when instantiating the Eventbridge client | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.proxyProtocol* | To define a proxy protocol when instantiating the Eventbridge client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-eventbridge.region* | The region in which Eventbridge 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-eventbridge.trustAll Certificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-eventbridge.uriEndpoint Override* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-eventbridge.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-eventbridge-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2eventbridge/CamelAws2eventbridgeSinkConnectorConfig.java b/connectors/camel-aws2-eventbridge-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2eventbridge/CamelAws2eventbridgeSinkConnectorConfig.java
index 407029e..edac021 100644
--- a/connectors/camel-aws2-eventbridge-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2eventbridge/CamelAws2eventbridgeSinkConnectorConfig.java
+++ b/connectors/camel-aws2-eventbridge-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2eventbridge/CamelAws2eventbridgeSinkConnectorConfig.java
@@ -41,6 +41,9 @@ public class CamelAws2eventbridgeSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [describeRule] [listRules] [listTargetsByRule] [listRuleNamesByTarget]";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OPERATION_DEFAULT = "putRule";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -59,6 +62,9 @@ public class CamelAws2eventbridgeSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -80,6 +86,9 @@ public class CamelAws2eventbridgeSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OPERATION_CONF = "camel.component.aws2-eventbridge.operation";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OPERATION_DOC = "The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [describeRule] [listRules] [listTargetsByRule] [listRuleNamesByTarget]";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OPERATION_DEFAULT = "putRule";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-eventbridge.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-eventbridge.pojoRequest";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -98,6 +107,9 @@ public class CamelAws2eventbridgeSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-eventbridge.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-eventbridge.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-eventbridge.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
     public static final Boolean CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -126,12 +138,14 @@ public class CamelAws2eventbridgeSinkConnectorConfig
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENT_PATTERN_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENT_PATTERN_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_EVENT_PATTERN_FILE_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_CONFIGURATION_DOC);
@@ -139,12 +153,14 @@ public class CamelAws2eventbridgeSinkConnectorConfig
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENT_PATTERN_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENT_PATTERN_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_EVENT_PATTERN_FILE_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2EVENTBRIDGE_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-iam-kafka-connector/src/generated/resources/camel-aws2-iam-sink.json b/connectors/camel-aws2-iam-kafka-connector/src/generated/resources/camel-aws2-iam-sink.json
index bf4a377..ef28770 100644
--- a/connectors/camel-aws2-iam-kafka-connector/src/generated/resources/camel-aws2-iam-sink.json
+++ b/connectors/camel-aws2-iam-kafka-connector/src/generated/resources/camel-aws2-iam-sink.json
@@ -49,6 +49,13 @@
 				"removeUserFromGroup"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -93,6 +100,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -145,6 +158,13 @@
 				"removeUserFromGroup"
 			]
 		},
+		"camel.component.aws2-iam.overrideEndpoint": {
+			"name": "camel.component.aws2-iam.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-iam.pojoRequest": {
 			"name": "camel.component.aws2-iam.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -189,6 +209,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-iam.uriEndpointOverride": {
+			"name": "camel.component.aws2-iam.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-iam.autowiredEnabled": {
 			"name": "camel.component.aws2-iam.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-iam-kafka-connector/src/main/docs/camel-aws2-iam-kafka-sink-connector.adoc b/connectors/camel-aws2-iam-kafka-connector/src/main/docs/camel-aws2-iam-kafka-sink-connector.adoc
index d78702a..aa83541 100644
--- a/connectors/camel-aws2-iam-kafka-connector/src/main/docs/camel-aws2-iam-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-iam-kafka-connector/src/main/docs/camel-aws2-iam-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2iam.CamelAws2iamSinkConnecto
 ----
 
 
-The camel-aws2-iam sink connector supports 25 options, which are listed below.
+The camel-aws2-iam sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-iam sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.iamClient* | To use a existing configured AWS IAM as client | 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.operation* | The operation to perform. You can configure a default operation on the component level, or the operation as part of the endpoint, or via a message header with the key CamelAwsIAMOperation. One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup] | null | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the IAM client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the IAM client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the IAM client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which IAM 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() | "aws-global" | 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-iam.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-iam.iamClient* | To use a existing configured AWS IAM as client | null | false | MEDIUM
 | *camel.component.aws2-iam.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-iam.operation* | The operation to perform. You can configure a default operation on the component level, or the operation as part of the endpoint, or via a message header with the key CamelAwsIAMOperation. One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup] | null | false | MEDIUM
+| *camel.component.aws2-iam.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-iam.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-iam.proxyHost* | To define a proxy host when instantiating the IAM client | null | false | MEDIUM
 | *camel.component.aws2-iam.proxyPort* | To define a proxy port when instantiating the IAM client | null | false | MEDIUM
 | *camel.component.aws2-iam.proxyProtocol* | To define a proxy protocol when instantiating the IAM client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-iam.region* | The region in which IAM 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() | "aws-global" | false | MEDIUM
 | *camel.component.aws2-iam.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-iam.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-iam.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-iam.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-iam.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2iam/CamelAws2iamSinkConnectorConfig.java b/connectors/camel-aws2-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2iam/CamelAws2iamSinkConnectorConfig.java
index 2aa05ee..659762a 100644
--- a/connectors/camel-aws2-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2iam/CamelAws2iamSinkConnectorConfig.java
+++ b/connectors/camel-aws2-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2iam/CamelAws2iamSinkConnectorConfig.java
@@ -36,6 +36,9 @@ public class CamelAws2iamSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_OPERATION_DOC = "The operation to perform. You can configure a default operation on the component level, or the operation as part of the endpoint, or via a message header with the key CamelAwsIAMOperation. One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup]";
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2IAM_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2IAM_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -54,6 +57,9 @@ public class CamelAws2iamSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2IAM_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2IAM_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -72,6 +78,9 @@ public class CamelAws2iamSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2IAM_COMPONENT_OPERATION_CONF = "camel.component.aws2-iam.operation";
     public static final String CAMEL_SINK_AWS2IAM_COMPONENT_OPERATION_DOC = "The operation to perform. You can configure a default operation on the component level, or the operation as part of the endpoint, or via a message header with the key CamelAwsIAMOperation. One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup]";
     public static final String CAMEL_SINK_AWS2IAM_COMPONENT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2IAM_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-iam.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2IAM_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2IAM_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2IAM_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-iam.pojoRequest";
     public static final String CAMEL_SINK_AWS2IAM_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2IAM_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -90,6 +99,9 @@ public class CamelAws2iamSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2IAM_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-iam.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2IAM_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2IAM_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2IAM_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-iam.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2IAM_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2IAM_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2IAM_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-iam.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2IAM_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
     public static final Boolean CAMEL_SINK_AWS2IAM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -116,24 +128,28 @@ public class CamelAws2iamSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_IAM_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_ENDPOINT_IAM_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_IAM_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2IAM_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2IAM_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2IAM_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2IAM_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2IAM_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2IAM_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_IAM_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_COMPONENT_IAM_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_IAM_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2IAM_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2IAM_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2IAM_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2IAM_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2IAM_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2IAM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2IAM_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2IAM_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2IAM_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2IAM_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-kms-kafka-connector/src/generated/resources/camel-aws2-kms-sink.json b/connectors/camel-aws2-kms-kafka-connector/src/generated/resources/camel-aws2-kms-sink.json
index 6bda133..972405c 100644
--- a/connectors/camel-aws2-kms-kafka-connector/src/generated/resources/camel-aws2-kms-sink.json
+++ b/connectors/camel-aws2-kms-kafka-connector/src/generated/resources/camel-aws2-kms-sink.json
@@ -42,6 +42,13 @@
 				"enableKey"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -85,6 +92,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -130,6 +143,13 @@
 				"enableKey"
 			]
 		},
+		"camel.component.aws2-kms.overrideEndpoint": {
+			"name": "camel.component.aws2-kms.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-kms.pojoRequest": {
 			"name": "camel.component.aws2-kms.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -173,6 +193,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-kms.uriEndpointOverride": {
+			"name": "camel.component.aws2-kms.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-kms.autowiredEnabled": {
 			"name": "camel.component.aws2-kms.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-kms-kafka-connector/src/main/docs/camel-aws2-kms-kafka-sink-connector.adoc b/connectors/camel-aws2-kms-kafka-connector/src/main/docs/camel-aws2-kms-kafka-sink-connector.adoc
index 1460f0b..7ecc13d 100644
--- a/connectors/camel-aws2-kms-kafka-connector/src/main/docs/camel-aws2-kms-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-kms-kafka-connector/src/main/docs/camel-aws2-kms-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2kms.CamelAws2kmsSinkConnecto
 ----
 
 
-The camel-aws2-kms sink connector supports 25 options, which are listed below.
+The camel-aws2-kms sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-kms sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.kmsClient* | To use a existing configured AWS KMS as client | 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.operation* | The operation to perform One of: [listKeys] [createKey] [disableKey] [scheduleKeyDeletion] [describeKey] [enableKey] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the KMS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the KMS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the KMS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which EKS 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-kms.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-kms.kmsClient* | To use a existing configured AWS KMS as client | null | false | MEDIUM
 | *camel.component.aws2-kms.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-kms.operation* | The operation to perform One of: [listKeys] [createKey] [disableKey] [scheduleKeyDeletion] [describeKey] [enableKey] | null | true | HIGH
+| *camel.component.aws2-kms.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-kms.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-kms.proxyHost* | To define a proxy host when instantiating the KMS client | null | false | MEDIUM
 | *camel.component.aws2-kms.proxyPort* | To define a proxy port when instantiating the KMS client | null | false | MEDIUM
 | *camel.component.aws2-kms.proxyProtocol* | To define a proxy protocol when instantiating the KMS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-kms.region* | The region in which EKS 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-kms.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-kms.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-kms.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-kms.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-kms.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2kms/CamelAws2kmsSinkConnectorConfig.java b/connectors/camel-aws2-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2kms/CamelAws2kmsSinkConnectorConfig.java
index f63295d..613f380 100644
--- a/connectors/camel-aws2-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2kms/CamelAws2kmsSinkConnectorConfig.java
+++ b/connectors/camel-aws2-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2kms/CamelAws2kmsSinkConnectorConfig.java
@@ -36,6 +36,9 @@ public class CamelAws2kmsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [listKeys] [createKey] [disableKey] [scheduleKeyDeletion] [describeKey] [enableKey]";
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2KMS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2KMS_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -54,6 +57,9 @@ public class CamelAws2kmsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2KMS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2KMS_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -72,6 +78,9 @@ public class CamelAws2kmsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2KMS_COMPONENT_OPERATION_CONF = "camel.component.aws2-kms.operation";
     public static final String CAMEL_SINK_AWS2KMS_COMPONENT_OPERATION_DOC = "The operation to perform One of: [listKeys] [createKey] [disableKey] [scheduleKeyDeletion] [describeKey] [enableKey]";
     public static final String CAMEL_SINK_AWS2KMS_COMPONENT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2KMS_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-kms.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2KMS_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2KMS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2KMS_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-kms.pojoRequest";
     public static final String CAMEL_SINK_AWS2KMS_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2KMS_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -90,6 +99,9 @@ public class CamelAws2kmsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2KMS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-kms.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2KMS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2KMS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2KMS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-kms.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2KMS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2KMS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2KMS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-kms.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2KMS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
     public static final Boolean CAMEL_SINK_AWS2KMS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -116,24 +128,28 @@ public class CamelAws2kmsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_KMS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_ENDPOINT_KMS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_KMS_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2KMS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2KMS_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2KMS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2KMS_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2KMS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2KMS_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2KMS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_KMS_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_COMPONENT_KMS_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_KMS_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2KMS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2KMS_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2KMS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2KMS_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2KMS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2KMS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2KMS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2KMS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2KMS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2KMS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2KMS_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-lambda-kafka-connector/src/generated/resources/camel-aws2-lambda-sink.json b/connectors/camel-aws2-lambda-kafka-connector/src/generated/resources/camel-aws2-lambda-sink.json
index 40b5cac..9f3f3b0 100644
--- a/connectors/camel-aws2-lambda-kafka-connector/src/generated/resources/camel-aws2-lambda-sink.json
+++ b/connectors/camel-aws2-lambda-kafka-connector/src/generated/resources/camel-aws2-lambda-sink.json
@@ -49,6 +49,13 @@
 				"listVersions"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -69,6 +76,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.awsLambdaClient": {
 			"name": "camel.sink.endpoint.awsLambdaClient",
 			"description": "To use a existing configured AwsLambdaClient as client",
@@ -150,6 +163,13 @@
 				"listVersions"
 			]
 		},
+		"camel.component.aws2-lambda.overrideEndpoint": {
+			"name": "camel.component.aws2-lambda.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-lambda.pojoRequest": {
 			"name": "camel.component.aws2-lambda.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -170,6 +190,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-lambda.uriEndpointOverride": {
+			"name": "camel.component.aws2-lambda.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-lambda.autowiredEnabled": {
 			"name": "camel.component.aws2-lambda.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-lambda-kafka-connector/src/main/docs/camel-aws2-lambda-kafka-sink-connector.adoc b/connectors/camel-aws2-lambda-kafka-connector/src/main/docs/camel-aws2-lambda-kafka-sink-connector.adoc
index a6bdc39..703ff97 100644
--- a/connectors/camel-aws2-lambda-kafka-connector/src/main/docs/camel-aws2-lambda-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-lambda-kafka-connector/src/main/docs/camel-aws2-lambda-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2lambda.CamelAws2lambdaSinkCo
 ----
 
 
-The camel-aws2-lambda sink connector supports 25 options, which are listed below.
+The camel-aws2-lambda sink connector supports 29 options, which are listed below.
 
 
 
@@ -34,9 +34,11 @@ The camel-aws2-lambda sink connector supports 25 options, which are listed below
 | *camel.sink.path.function* | Name of the Lambda function. | null | true | HIGH
 | *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 perform. It can be listFunctions, getFunction, createFunction, deleteFunction or invokeFunction One of: [listFunctions] [getFunction] [createAlias] [deleteAlias] [getAlias] [listAliases] [createFunction] [deleteFunction] [invokeFunction] [updateFunction] [createEventSourceMapping] [deleteEventSourceMapping] [listEventSourceMapping] [listTags] [tagResource] [untagResource] [publishVersion] [listVersions] | "invokeFunction" | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which ECS 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.awsLambdaClient* | To use a existing configured AwsLambdaClient as client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the Lambda client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the Lambda client | null | false | MEDIUM
@@ -46,9 +48,11 @@ The camel-aws2-lambda sink connector supports 25 options, which are listed below
 | *camel.component.aws2-lambda.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-lambda.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  [...]
 | *camel.component.aws2-lambda.operation* | The operation to perform. It can be listFunctions, getFunction, createFunction, deleteFunction or invokeFunction One of: [listFunctions] [getFunction] [createAlias] [deleteAlias] [getAlias] [listAliases] [createFunction] [deleteFunction] [invokeFunction] [updateFunction] [createEventSourceMapping] [deleteEventSourceMapping] [listEventSourceMapping] [listTags] [tagResource] [untagResource] [publishVersion] [listVersions] | "invokeFunction" | fal [...]
+| *camel.component.aws2-lambda.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-lambda.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-lambda.region* | The region in which ECS 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-lambda.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-lambda.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-lambda.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-lambda.awsLambdaClient* | To use a existing configured AwsLambdaClient as client | null | false | MEDIUM
 | *camel.component.aws2-lambda.proxyHost* | To define a proxy host when instantiating the Lambda client | null | false | MEDIUM
diff --git a/connectors/camel-aws2-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2lambda/CamelAws2lambdaSinkConnectorConfig.java b/connectors/camel-aws2-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2lambda/CamelAws2lambdaSinkConnectorConfig.java
index a380a7a..1e29d1a 100644
--- a/connectors/camel-aws2-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2lambda/CamelAws2lambdaSinkConnectorConfig.java
+++ b/connectors/camel-aws2-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2lambda/CamelAws2lambdaSinkConnectorConfig.java
@@ -35,6 +35,9 @@ public class CamelAws2lambdaSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OPERATION_DOC = "The operation to perform. It can be listFunctions, getFunction, createFunction, deleteFunction or invokeFunction One of: [listFunctions] [getFunction] [createAlias] [deleteAlias] [getAlias] [listAliases] [createFunction] [deleteFunction] [invokeFunction] [updateFunction] [createEventSourceMapping] [deleteEventSourceMapping] [listEventSourceMapping] [listTags] [tagResource] [untagResource] [publishVersion] [lis [...]
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OPERATION_DEFAULT = "invokeFunction";
+    public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2LAMBDA_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -44,6 +47,9 @@ public class CamelAws2lambdaSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2LAMBDA_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_CONF = "camel.sink.endpoint.awsLambdaClient";
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_DOC = "To use a existing configured AwsLambdaClient as client";
     public static final String CAMEL_SINK_AWS2LAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_DEFAULT = null;
@@ -71,6 +77,9 @@ public class CamelAws2lambdaSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_OPERATION_CONF = "camel.component.aws2-lambda.operation";
     public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_OPERATION_DOC = "The operation to perform. It can be listFunctions, getFunction, createFunction, deleteFunction or invokeFunction One of: [listFunctions] [getFunction] [createAlias] [deleteAlias] [getAlias] [listAliases] [createFunction] [deleteFunction] [invokeFunction] [updateFunction] [createEventSourceMapping] [deleteEventSourceMapping] [listEventSourceMapping] [listTags] [tagResource] [untagResource] [publishVersion] [li [...]
     public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_OPERATION_DEFAULT = "invokeFunction";
+    public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-lambda.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2LAMBDA_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-lambda.pojoRequest";
     public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2LAMBDA_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -80,6 +89,9 @@ public class CamelAws2lambdaSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-lambda.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2LAMBDA_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-lambda.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-lambda.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2LAMBDA_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
     public static final Boolean CAMEL_SINK_AWS2LAMBDA_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -117,9 +129,11 @@ public class CamelAws2lambdaSinkConnectorConfig
         conf.define(CAMEL_SINK_AWS2LAMBDA_PATH_FUNCTION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_PATH_FUNCTION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2LAMBDA_PATH_FUNCTION_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_ENDPOINT_PROXY_PORT_DOC);
@@ -129,9 +143,11 @@ public class CamelAws2lambdaSinkConnectorConfig
         conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2LAMBDA_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2LAMBDA_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2LAMBDA_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2LAMBDA_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2LAMBDA_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_AWS_LAMBDA_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_COMPONENT_AWS_LAMBDA_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_AWS_LAMBDA_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2LAMBDA_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2LAMBDA_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2LAMBDA_COMPONENT_PROXY_HOST_DOC);
diff --git a/connectors/camel-aws2-mq-kafka-connector/src/generated/resources/camel-aws2-mq-sink.json b/connectors/camel-aws2-mq-kafka-connector/src/generated/resources/camel-aws2-mq-sink.json
index c4a0c68..b3726e5 100644
--- a/connectors/camel-aws2-mq-kafka-connector/src/generated/resources/camel-aws2-mq-sink.json
+++ b/connectors/camel-aws2-mq-kafka-connector/src/generated/resources/camel-aws2-mq-sink.json
@@ -42,6 +42,13 @@
 				"describeBroker"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -85,6 +92,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -130,6 +143,13 @@
 				"describeBroker"
 			]
 		},
+		"camel.component.aws2-mq.overrideEndpoint": {
+			"name": "camel.component.aws2-mq.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-mq.pojoRequest": {
 			"name": "camel.component.aws2-mq.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -173,6 +193,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-mq.uriEndpointOverride": {
+			"name": "camel.component.aws2-mq.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-mq.autowiredEnabled": {
 			"name": "camel.component.aws2-mq.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-mq-kafka-connector/src/main/docs/camel-aws2-mq-kafka-sink-connector.adoc b/connectors/camel-aws2-mq-kafka-connector/src/main/docs/camel-aws2-mq-kafka-sink-connector.adoc
index e565b89..62e1ef9 100644
--- a/connectors/camel-aws2-mq-kafka-connector/src/main/docs/camel-aws2-mq-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-mq-kafka-connector/src/main/docs/camel-aws2-mq-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2mq.CamelAws2mqSinkConnector
 ----
 
 
-The camel-aws2-mq sink connector supports 25 options, which are listed below.
+The camel-aws2-mq sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-mq sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.amazonMqClient* | To use a existing configured AmazonMQClient as client | 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.operation* | The operation to perform. It can be listBrokers,createBroker,deleteBroker One of: [listBrokers] [createBroker] [deleteBroker] [rebootBroker] [updateBroker] [describeBroker] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the MQ client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the MQ client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the MQ client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which MQ 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-mq.amazonMqClient* | To use a existing configured AmazonMQClient as client | null | false | MEDIUM
 | *camel.component.aws2-mq.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-mq.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 [...]
 | *camel.component.aws2-mq.operation* | The operation to perform. It can be listBrokers,createBroker,deleteBroker One of: [listBrokers] [createBroker] [deleteBroker] [rebootBroker] [updateBroker] [describeBroker] | null | true | HIGH
+| *camel.component.aws2-mq.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-mq.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-mq.proxyHost* | To define a proxy host when instantiating the MQ client | null | false | MEDIUM
 | *camel.component.aws2-mq.proxyPort* | To define a proxy port when instantiating the MQ client | null | false | MEDIUM
 | *camel.component.aws2-mq.proxyProtocol* | To define a proxy protocol when instantiating the MQ client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-mq.region* | The region in which MQ 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-mq.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-mq.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-mq.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-mq.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-mq.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2mq/CamelAws2mqSinkConnectorConfig.java b/connectors/camel-aws2-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2mq/CamelAws2mqSinkConnectorConfig.java
index 2da17a1..7e58623 100644
--- a/connectors/camel-aws2-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2mq/CamelAws2mqSinkConnectorConfig.java
+++ b/connectors/camel-aws2-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2mq/CamelAws2mqSinkConnectorConfig.java
@@ -36,6 +36,9 @@ public class CamelAws2mqSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_OPERATION_DOC = "The operation to perform. It can be listBrokers,createBroker,deleteBroker One of: [listBrokers] [createBroker] [deleteBroker] [rebootBroker] [updateBroker] [describeBroker]";
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2MQ_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2MQ_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -54,6 +57,9 @@ public class CamelAws2mqSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2MQ_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2MQ_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -72,6 +78,9 @@ public class CamelAws2mqSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2MQ_COMPONENT_OPERATION_CONF = "camel.component.aws2-mq.operation";
     public static final String CAMEL_SINK_AWS2MQ_COMPONENT_OPERATION_DOC = "The operation to perform. It can be listBrokers,createBroker,deleteBroker One of: [listBrokers] [createBroker] [deleteBroker] [rebootBroker] [updateBroker] [describeBroker]";
     public static final String CAMEL_SINK_AWS2MQ_COMPONENT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2MQ_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-mq.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2MQ_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2MQ_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2MQ_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-mq.pojoRequest";
     public static final String CAMEL_SINK_AWS2MQ_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2MQ_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -90,6 +99,9 @@ public class CamelAws2mqSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2MQ_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-mq.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2MQ_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2MQ_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2MQ_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-mq.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2MQ_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2MQ_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2MQ_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-mq.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2MQ_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
     public static final Boolean CAMEL_SINK_AWS2MQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -116,24 +128,28 @@ public class CamelAws2mqSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_AMAZON_MQ_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_ENDPOINT_AMAZON_MQ_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_AMAZON_MQ_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MQ_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2MQ_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MQ_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MQ_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MQ_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2MQ_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2MQ_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_AMAZON_MQ_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_COMPONENT_AMAZON_MQ_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_AMAZON_MQ_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MQ_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2MQ_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MQ_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MQ_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MQ_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MQ_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2MQ_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2MQ_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2MQ_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MQ_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-msk-kafka-connector/src/generated/resources/camel-aws2-msk-sink.json b/connectors/camel-aws2-msk-kafka-connector/src/generated/resources/camel-aws2-msk-sink.json
index b12150a..8ea8509 100644
--- a/connectors/camel-aws2-msk-kafka-connector/src/generated/resources/camel-aws2-msk-sink.json
+++ b/connectors/camel-aws2-msk-kafka-connector/src/generated/resources/camel-aws2-msk-sink.json
@@ -40,6 +40,13 @@
 				"describeCluster"
 			]
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.pojoRequest": {
 			"name": "camel.sink.endpoint.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -83,6 +90,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -126,6 +139,13 @@
 				"describeCluster"
 			]
 		},
+		"camel.component.aws2-msk.overrideEndpoint": {
+			"name": "camel.component.aws2-msk.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-msk.pojoRequest": {
 			"name": "camel.component.aws2-msk.pojoRequest",
 			"description": "If we want to use a POJO request as body or not",
@@ -169,6 +189,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-msk.uriEndpointOverride": {
+			"name": "camel.component.aws2-msk.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-msk.autowiredEnabled": {
 			"name": "camel.component.aws2-msk.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-msk-kafka-connector/src/main/docs/camel-aws2-msk-kafka-sink-connector.adoc b/connectors/camel-aws2-msk-kafka-connector/src/main/docs/camel-aws2-msk-kafka-sink-connector.adoc
index f993f6b..b17dc71 100644
--- a/connectors/camel-aws2-msk-kafka-connector/src/main/docs/camel-aws2-msk-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-msk-kafka-connector/src/main/docs/camel-aws2-msk-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2msk.CamelAws2mskSinkConnecto
 ----
 
 
-The camel-aws2-msk sink connector supports 25 options, which are listed below.
+The camel-aws2-msk sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-msk sink connector supports 25 options, which are listed below.
 | *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.mskClient* | To use a existing configured AWS MSK as client | null | false | MEDIUM
 | *camel.sink.endpoint.operation* | The operation to perform One of: [listClusters] [createCluster] [deleteCluster] [describeCluster] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the MSK client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the MSK client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the MSK client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which MSK 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-msk.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-msk.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-msk.mskClient* | To use a existing configured AWS MSK as client | null | false | MEDIUM
 | *camel.component.aws2-msk.operation* | The operation to perform One of: [listClusters] [createCluster] [deleteCluster] [describeCluster] | null | true | HIGH
+| *camel.component.aws2-msk.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-msk.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-msk.proxyHost* | To define a proxy host when instantiating the MSK client | null | false | MEDIUM
 | *camel.component.aws2-msk.proxyPort* | To define a proxy port when instantiating the MSK client | null | false | MEDIUM
 | *camel.component.aws2-msk.proxyProtocol* | To define a proxy protocol when instantiating the MSK client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-msk.region* | The region in which MSK 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-msk.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-msk.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-msk.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-msk.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-msk.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2msk/CamelAws2mskSinkConnectorConfig.java b/connectors/camel-aws2-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2msk/CamelAws2mskSinkConnectorConfig.java
index 12c8863..53bd543 100644
--- a/connectors/camel-aws2-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2msk/CamelAws2mskSinkConnectorConfig.java
+++ b/connectors/camel-aws2-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2msk/CamelAws2mskSinkConnectorConfig.java
@@ -36,6 +36,9 @@ public class CamelAws2mskSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_OPERATION_DOC = "The operation to perform One of: [listClusters] [createCluster] [deleteCluster] [describeCluster]";
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2MSK_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_POJO_REQUEST_CONF = "camel.sink.endpoint.pojoRequest";
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2MSK_ENDPOINT_POJO_REQUEST_DEFAULT = false;
@@ -54,6 +57,9 @@ public class CamelAws2mskSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2MSK_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2MSK_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -72,6 +78,9 @@ public class CamelAws2mskSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2MSK_COMPONENT_OPERATION_CONF = "camel.component.aws2-msk.operation";
     public static final String CAMEL_SINK_AWS2MSK_COMPONENT_OPERATION_DOC = "The operation to perform One of: [listClusters] [createCluster] [deleteCluster] [describeCluster]";
     public static final String CAMEL_SINK_AWS2MSK_COMPONENT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2MSK_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-msk.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2MSK_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2MSK_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2MSK_COMPONENT_POJO_REQUEST_CONF = "camel.component.aws2-msk.pojoRequest";
     public static final String CAMEL_SINK_AWS2MSK_COMPONENT_POJO_REQUEST_DOC = "If we want to use a POJO request as body or not";
     public static final Boolean CAMEL_SINK_AWS2MSK_COMPONENT_POJO_REQUEST_DEFAULT = false;
@@ -90,6 +99,9 @@ public class CamelAws2mskSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2MSK_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-msk.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2MSK_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2MSK_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2MSK_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-msk.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2MSK_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2MSK_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2MSK_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-msk.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2MSK_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
     public static final Boolean CAMEL_SINK_AWS2MSK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -116,24 +128,28 @@ public class CamelAws2mskSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MSK_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_MSK_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_ENDPOINT_MSK_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_MSK_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2MSK_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MSK_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MSK_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MSK_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2MSK_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2MSK_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MSK_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_MSK_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_COMPONENT_MSK_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_MSK_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2MSK_COMPONENT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MSK_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MSK_COMPONENT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_POJO_REQUEST_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MSK_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2MSK_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2MSK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2MSK_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2MSK_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2MSK_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2MSK_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-ses-kafka-connector/src/generated/resources/camel-aws2-ses-sink.json b/connectors/camel-aws2-ses-kafka-connector/src/generated/resources/camel-aws2-ses-sink.json
index e213542..cf18cf1 100644
--- a/connectors/camel-aws2-ses-kafka-connector/src/generated/resources/camel-aws2-ses-sink.json
+++ b/connectors/camel-aws2-ses-kafka-connector/src/generated/resources/camel-aws2-ses-sink.json
@@ -28,6 +28,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.proxyHost": {
 			"name": "camel.sink.endpoint.proxyHost",
 			"description": "To define a proxy host when instantiating the SES client",
@@ -88,6 +95,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -119,6 +132,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ses.overrideEndpoint": {
+			"name": "camel.component.aws2-ses.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ses.proxyHost": {
 			"name": "camel.component.aws2-ses.proxyHost",
 			"description": "To define a proxy host when instantiating the SES client",
@@ -179,6 +199,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-ses.uriEndpointOverride": {
+			"name": "camel.component.aws2-ses.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-ses.autowiredEnabled": {
 			"name": "camel.component.aws2-ses.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
diff --git a/connectors/camel-aws2-ses-kafka-connector/src/main/docs/camel-aws2-ses-kafka-sink-connector.adoc b/connectors/camel-aws2-ses-kafka-connector/src/main/docs/camel-aws2-ses-kafka-sink-connector.adoc
index 2ccc490..434ab72 100644
--- a/connectors/camel-aws2-ses-kafka-connector/src/main/docs/camel-aws2-ses-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-ses-kafka-connector/src/main/docs/camel-aws2-ses-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ses.CamelAws2sesSinkConnecto
 ----
 
 
-The camel-aws2-ses sink connector supports 29 options, which are listed below.
+The camel-aws2-ses sink connector supports 33 options, which are listed below.
 
 
 
@@ -34,6 +34,7 @@ The camel-aws2-ses sink connector supports 29 options, which are listed below.
 | *camel.sink.path.from* | The sender's email address. | null | true | HIGH
 | *camel.sink.endpoint.amazonSESClient* | To use the AmazonSimpleEmailService as the client | 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.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the SES client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the SES client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the SES client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -43,11 +44,13 @@ The camel-aws2-ses sink connector supports 29 options, which are listed below.
 | *camel.sink.endpoint.subject* | The subject which is used if the message header 'CamelAwsSesSubject' is not present. | null | false | MEDIUM
 | *camel.sink.endpoint.to* | List of destination email address. Can be overriden with 'CamelAwsSesTo' header. | 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-ses.amazonSESClient* | To use the AmazonSimpleEmailService as the client | null | false | MEDIUM
 | *camel.component.aws2-ses.configuration* | component configuration | null | false | MEDIUM
 | *camel.component.aws2-ses.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-ses.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ses.proxyHost* | To define a proxy host when instantiating the SES client | null | false | MEDIUM
 | *camel.component.aws2-ses.proxyPort* | To define a proxy port when instantiating the SES client | null | false | MEDIUM
 | *camel.component.aws2-ses.proxyProtocol* | To define a proxy protocol when instantiating the SES client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -57,6 +60,7 @@ The camel-aws2-ses sink connector supports 29 options, which are listed below.
 | *camel.component.aws2-ses.subject* | The subject which is used if the message header 'CamelAwsSesSubject' is not present. | null | false | MEDIUM
 | *camel.component.aws2-ses.to* | List of destination email address. Can be overriden with 'CamelAwsSesTo' header. | null | false | MEDIUM
 | *camel.component.aws2-ses.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-ses.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-ses.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-ses.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-ses.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ses/CamelAws2sesSinkConnectorConfig.java b/connectors/camel-aws2-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ses/CamelAws2sesSinkConnectorConfig.java
index 2720596..6db8397 100644
--- a/connectors/camel-aws2-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ses/CamelAws2sesSinkConnectorConfig.java
+++ b/connectors/camel-aws2-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ses/CamelAws2sesSinkConnectorConfig.java
@@ -33,6 +33,9 @@ public class CamelAws2sesSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SES_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_AWS2SES_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 wh [...]
     public static final Boolean CAMEL_SINK_AWS2SES_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SES_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2SES_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2SES_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_HOST_CONF = "camel.sink.endpoint.proxyHost";
     public static final String CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_HOST_DOC = "To define a proxy host when instantiating the SES client";
     public static final String CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_HOST_DEFAULT = null;
@@ -60,6 +63,9 @@ public class CamelAws2sesSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SES_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2SES_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2SES_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SES_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2SES_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2SES_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2SES_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2SES_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2SES_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -75,6 +81,9 @@ public class CamelAws2sesSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SES_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.aws2-ses.lazyStartProducer";
     public static final String CAMEL_SINK_AWS2SES_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 w [...]
     public static final Boolean CAMEL_SINK_AWS2SES_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SES_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-ses.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2SES_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2SES_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SES_COMPONENT_PROXY_HOST_CONF = "camel.component.aws2-ses.proxyHost";
     public static final String CAMEL_SINK_AWS2SES_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the SES client";
     public static final String CAMEL_SINK_AWS2SES_COMPONENT_PROXY_HOST_DEFAULT = null;
@@ -102,6 +111,9 @@ public class CamelAws2sesSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SES_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-ses.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2SES_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2SES_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SES_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-ses.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2SES_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2SES_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2SES_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-ses.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2SES_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
     public static final Boolean CAMEL_SINK_AWS2SES_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -127,6 +139,7 @@ public class CamelAws2sesSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SES_PATH_FROM_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_PATH_FROM_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2SES_PATH_FROM_DOC);
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_AMAZON_SESCLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_ENDPOINT_AMAZON_SESCLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_AMAZON_SESCLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SES_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SES_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_PROXY_PROTOCOL_DOC);
@@ -136,11 +149,13 @@ public class CamelAws2sesSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_SUBJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_ENDPOINT_SUBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_SUBJECT_DOC);
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_TO_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_ENDPOINT_TO_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_TO_DOC);
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SES_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2SES_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2SES_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2SES_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_AMAZON_SESCLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_COMPONENT_AMAZON_SESCLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_AMAZON_SESCLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SES_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_AWS2SES_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SES_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_PROXY_PROTOCOL_DOC);
@@ -150,6 +165,7 @@ public class CamelAws2sesSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_SUBJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_COMPONENT_SUBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_SUBJECT_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_TO_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_COMPONENT_TO_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_TO_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SES_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2SES_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SES_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SES_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2SES_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2SES_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2SES_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SES_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-sns-kafka-connector/src/generated/resources/camel-aws2-sns-sink.json b/connectors/camel-aws2-sns-kafka-connector/src/generated/resources/camel-aws2-sns-sink.json
index 123aec7..7b059d4 100644
--- a/connectors/camel-aws2-sns-kafka-connector/src/generated/resources/camel-aws2-sns-sink.json
+++ b/connectors/camel-aws2-sns-kafka-connector/src/generated/resources/camel-aws2-sns-sink.json
@@ -75,6 +75,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.policy": {
 			"name": "camel.sink.endpoint.policy",
 			"description": "The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
@@ -143,6 +150,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.useDefaultCredentialsProvider": {
 			"name": "camel.sink.endpoint.useDefaultCredentialsProvider",
 			"description": "Set whether the SNS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
@@ -222,6 +235,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sns.overrideEndpoint": {
+			"name": "camel.component.aws2-sns.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sns.policy": {
 			"name": "camel.component.aws2-sns.policy",
 			"description": "The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
@@ -290,6 +310,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sns.uriEndpointOverride": {
+			"name": "camel.component.aws2-sns.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sns.useDefaultCredentialsProvider": {
 			"name": "camel.component.aws2-sns.useDefaultCredentialsProvider",
 			"description": "Set whether the SNS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
diff --git a/connectors/camel-aws2-sns-kafka-connector/src/main/docs/camel-aws2-sns-kafka-sink-connector.adoc b/connectors/camel-aws2-sns-kafka-connector/src/main/docs/camel-aws2-sns-kafka-sink-connector.adoc
index 6d99dd6..df40bba 100644
--- a/connectors/camel-aws2-sns-kafka-connector/src/main/docs/camel-aws2-sns-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-sns-kafka-connector/src/main/docs/camel-aws2-sns-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sns.CamelAws2snsSinkConnecto
 ----
 
 
-The camel-aws2-sns sink connector supports 44 options, which are listed below.
+The camel-aws2-sns sink connector supports 48 options, which are listed below.
 
 
 
@@ -40,6 +40,7 @@ The camel-aws2-sns sink connector supports 44 options, which are listed below.
 | *camel.sink.endpoint.messageDeduplicationIdStrategy* | Only for FIFO Topic. 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
 | *camel.sink.endpoint.messageGroupIdStrategy* | Only for FIFO Topic. Strategy for setting the messageGroupId on the message. Can be one of the following options: useConstant, useExchangeId, usePropertyValue. For the usePropertyValue option, the value of property CamelAwsMessageGroupId will be used. One of: [useConstant] [useExchangeId] [usePropertyValue] | null | false | MEDIUM
 | *camel.sink.endpoint.messageStructure* | The message structure to use such as json | null | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.policy* | The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the SNS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the SNS client | null | false | MEDIUM
@@ -50,6 +51,7 @@ The camel-aws2-sns sink connector supports 44 options, which are listed below.
 | *camel.sink.endpoint.subject* | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | null | false | MEDIUM
 | *camel.sink.endpoint.subscribeSNStoSQS* | Define if the subscription between SNS Topic and SQS must be done or not | false | 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.useDefaultCredentialsProvider* | Set whether the SNS 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.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -61,6 +63,7 @@ The camel-aws2-sns sink connector supports 44 options, which are listed below.
 | *camel.component.aws2-sns.messageDeduplicationId Strategy* | Only for FIFO Topic. 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
 | *camel.component.aws2-sns.messageGroupIdStrategy* | Only for FIFO Topic. Strategy for setting the messageGroupId on the message. Can be one of the following options: useConstant, useExchangeId, usePropertyValue. For the usePropertyValue option, the value of property CamelAwsMessageGroupId will be used. One of: [useConstant] [useExchangeId] [usePropertyValue] | null | false | MEDIUM
 | *camel.component.aws2-sns.messageStructure* | The message structure to use such as json | null | false | MEDIUM
+| *camel.component.aws2-sns.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-sns.policy* | The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.component.aws2-sns.proxyHost* | To define a proxy host when instantiating the SNS client | null | false | MEDIUM
 | *camel.component.aws2-sns.proxyPort* | To define a proxy port when instantiating the SNS client | null | false | MEDIUM
@@ -71,6 +74,7 @@ The camel-aws2-sns sink connector supports 44 options, which are listed below.
 | *camel.component.aws2-sns.subject* | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | null | false | MEDIUM
 | *camel.component.aws2-sns.subscribeSNStoSQS* | Define if the subscription between SNS Topic and SQS must be done or not | false | false | MEDIUM
 | *camel.component.aws2-sns.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-sns.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-sns.useDefaultCredentials Provider* | Set whether the SNS 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-sns.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-sns.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sns/CamelAws2snsSinkConnectorConfig.java b/connectors/camel-aws2-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sns/CamelAws2snsSinkConnectorConfig.java
index 5c3b68b..c816c82 100644
--- a/connectors/camel-aws2-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sns/CamelAws2snsSinkConnectorConfig.java
+++ b/connectors/camel-aws2-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sns/CamelAws2snsSinkConnectorConfig.java
@@ -51,6 +51,9 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_STRUCTURE_CONF = "camel.sink.endpoint.messageStructure";
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_STRUCTURE_DOC = "The message structure to use such as json";
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_STRUCTURE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2SNS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_POLICY_CONF = "camel.sink.endpoint.policy";
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_POLICY_DOC = "The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.";
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_POLICY_DEFAULT = null;
@@ -81,6 +84,9 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2SNS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.sink.endpoint.useDefaultCredentialsProvider";
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SNS 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_AWS2SNS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
@@ -114,6 +120,9 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_STRUCTURE_CONF = "camel.component.aws2-sns.messageStructure";
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_STRUCTURE_DOC = "The message structure to use such as json";
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_STRUCTURE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2SNS_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-sns.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2SNS_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2SNS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_POLICY_CONF = "camel.component.aws2-sns.policy";
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_POLICY_DOC = "The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.";
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_POLICY_DEFAULT = null;
@@ -144,6 +153,9 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-sns.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2SNS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SNS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-sns.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2SNS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2SNS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.component.aws2-sns.useDefaultCredentialsProvider";
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SNS 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_AWS2SNS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
@@ -178,6 +190,7 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_GROUP_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_GROUP_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_GROUP_ID_STRATEGY_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_STRUCTURE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_STRUCTURE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_MESSAGE_STRUCTURE_DOC);
+        conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_POLICY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_POLICY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_POLICY_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_PROXY_PORT_DOC);
@@ -188,6 +201,7 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_SUBJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_SUBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_SUBJECT_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSCONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSDEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSDOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2SNS_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2SNS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_SECRET_KEY_DOC);
@@ -199,6 +213,7 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_GROUP_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_GROUP_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_GROUP_ID_STRATEGY_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_STRUCTURE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_STRUCTURE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_MESSAGE_STRUCTURE_DOC);
+        conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_POLICY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_POLICY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_POLICY_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_PROXY_PORT_DOC);
@@ -209,6 +224,7 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_SUBJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_SUBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_SUBJECT_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_SUBSCRIBE_SNSTO_SQSCONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_COMPONENT_SUBSCRIBE_SNSTO_SQSDEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_SUBSCRIBE_SNSTO_SQSDOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWS2SNS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_ACCESS_KEY_DOC);
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 37fa656..33feaa7 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
@@ -41,6 +41,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.overrideEndpoint": {
+			"name": "camel.sink.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.protocol": {
 			"name": "camel.sink.endpoint.protocol",
 			"description": "The underlying protocol used to communicate with SQS",
@@ -78,6 +85,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.uriEndpointOverride": {
+			"name": "camel.sink.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.useDefaultCredentialsProvider": {
 			"name": "camel.sink.endpoint.useDefaultCredentialsProvider",
 			"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.",
@@ -232,6 +245,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.overrideEndpoint": {
+			"name": "camel.component.aws2-sqs.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.protocol": {
 			"name": "camel.component.aws2-sqs.protocol",
 			"description": "The underlying protocol used to communicate with SQS",
@@ -269,6 +289,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.uriEndpointOverride": {
+			"name": "camel.component.aws2-sqs.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.useDefaultCredentialsProvider": {
 			"name": "camel.component.aws2-sqs.useDefaultCredentialsProvider",
 			"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.",
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 5f56d2f..22ad918 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
@@ -41,6 +41,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.overrideEndpoint": {
+			"name": "camel.source.endpoint.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.protocol": {
 			"name": "camel.source.endpoint.protocol",
 			"description": "The underlying protocol used to communicate with SQS",
@@ -78,6 +85,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.uriEndpointOverride": {
+			"name": "camel.source.endpoint.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.useDefaultCredentialsProvider": {
 			"name": "camel.source.endpoint.useDefaultCredentialsProvider",
 			"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.",
@@ -408,6 +421,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.overrideEndpoint": {
+			"name": "camel.component.aws2-sqs.overrideEndpoint",
+			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.protocol": {
 			"name": "camel.component.aws2-sqs.protocol",
 			"description": "The underlying protocol used to communicate with SQS",
@@ -445,6 +465,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.uriEndpointOverride": {
+			"name": "camel.component.aws2-sqs.uriEndpointOverride",
+			"description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.useDefaultCredentialsProvider": {
 			"name": "camel.component.aws2-sqs.useDefaultCredentialsProvider",
 			"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.",
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 1b7d196..9f58eef 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
@@ -24,7 +24,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 60 options, which are listed below.
 
 
 
@@ -36,11 +36,13 @@ The camel-aws2-sqs sink connector supports 56 options, which are listed below.
 | *camel.sink.endpoint.amazonSQSClient* | To use the AmazonSQS as client | null | false | MEDIUM
 | *camel.sink.endpoint.autoCreateQueue* | Setting the autocreation of the queue | true | false | MEDIUM
 | *camel.sink.endpoint.headerFilterStrategy* | To use a custom HeaderFilterStrategy to map headers to/from Camel. | null | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.protocol* | The underlying protocol used to communicate with SQS | "https" | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the SQS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.useDefaultCredentialsProvider* | 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.batchSeparator* | Set the separator when passing a String to send batch message operation | "," | false | MEDIUM
 | *camel.sink.endpoint.delaySeconds* | Delay sending messages for a number of seconds. | null | false | MEDIUM
@@ -63,11 +65,13 @@ The camel-aws2-sqs sink connector supports 56 options, which are listed below.
 | *camel.component.aws2-sqs.amazonSQSClient* | To use the AmazonSQS as client | null | false | MEDIUM
 | *camel.component.aws2-sqs.autoCreateQueue* | Setting the autocreation of the queue | true | false | MEDIUM
 | *camel.component.aws2-sqs.configuration* | The AWS SQS default configuration | null | false | MEDIUM
+| *camel.component.aws2-sqs.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-sqs.protocol* | The underlying protocol used to communicate with SQS | "https" | false | MEDIUM
 | *camel.component.aws2-sqs.proxyProtocol* | To define a proxy protocol when instantiating the SQS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-sqs.useDefaultCredentials Provider* | 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.batchSeparator* | Set the separator when passing a String to send batch message operation | "," | false | MEDIUM
 | *camel.component.aws2-sqs.delaySeconds* | Delay sending messages for a number of seconds. | null | 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 4b3169a..ba1b605 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
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sqs.CamelAws2sqsSourceConnec
 ----
 
 
-The camel-aws2-sqs source connector supports 89 options, which are listed below.
+The camel-aws2-sqs source connector supports 93 options, which are listed below.
 
 
 
@@ -36,11 +36,13 @@ The camel-aws2-sqs source connector supports 89 options, which are listed below.
 | *camel.source.endpoint.amazonSQSClient* | To use the AmazonSQS as client | null | false | MEDIUM
 | *camel.source.endpoint.autoCreateQueue* | Setting the autocreation of the queue | true | false | MEDIUM
 | *camel.source.endpoint.headerFilterStrategy* | To use a custom HeaderFilterStrategy to map headers to/from Camel. | null | false | MEDIUM
+| *camel.source.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.source.endpoint.protocol* | The underlying protocol used to communicate with SQS | "https" | false | MEDIUM
 | *camel.source.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the SQS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.source.endpoint.useDefaultCredentials Provider* | 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
@@ -89,11 +91,13 @@ The camel-aws2-sqs source connector supports 89 options, which are listed below.
 | *camel.component.aws2-sqs.amazonSQSClient* | To use the AmazonSQS as client | null | false | MEDIUM
 | *camel.component.aws2-sqs.autoCreateQueue* | Setting the autocreation of the queue | true | false | MEDIUM
 | *camel.component.aws2-sqs.configuration* | The AWS SQS default configuration | null | false | MEDIUM
+| *camel.component.aws2-sqs.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-sqs.protocol* | The underlying protocol used to communicate with SQS | "https" | false | MEDIUM
 | *camel.component.aws2-sqs.proxyProtocol* | To define a proxy protocol when instantiating the SQS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-sqs.useDefaultCredentials Provider* | 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
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 a1f50a0..5a373ed 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
@@ -39,6 +39,9 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_CONF = "camel.sink.endpoint.headerFilterStrategy";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_DOC = "To use a custom HeaderFilterStrategy to map headers to/from Camel.";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.sink.endpoint.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_PROTOCOL_CONF = "camel.sink.endpoint.protocol";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_PROTOCOL_DOC = "The underlying protocol used to communicate with SQS";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_PROTOCOL_DEFAULT = "https";
@@ -54,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_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.sink.endpoint.useDefaultCredentialsProvider";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_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_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
@@ -120,6 +126,9 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_CONFIGURATION_CONF = "camel.component.aws2-sqs.configuration";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_CONFIGURATION_DOC = "The AWS SQS default configuration";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_CONFIGURATION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-sqs.overrideEndpoint";
+    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SINK_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_PROTOCOL_CONF = "camel.component.aws2-sqs.protocol";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_PROTOCOL_DOC = "The underlying protocol used to communicate with SQS";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_PROTOCOL_DEFAULT = "https";
@@ -135,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_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-sqs.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.component.aws2-sqs.useDefaultCredentialsProvider";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_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_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
@@ -210,11 +222,13 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_AMAZON_SQSCLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_AMAZON_SQSCLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_AMAZON_SQSCLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_DOC);
+        conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.PASSWORD, 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_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_BATCH_SEPARATOR_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_BATCH_SEPARATOR_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_BATCH_SEPARATOR_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);
@@ -237,11 +251,13 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_AMAZON_SQSCLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_AMAZON_SQSCLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_AMAZON_SQSCLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_CONFIGURATION_DOC);
+        conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.PASSWORD, 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_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_BATCH_SEPARATOR_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_BATCH_SEPARATOR_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_BATCH_SEPARATOR_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);
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 e47cca1..e23696c 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
@@ -41,6 +41,9 @@ public class CamelAws2sqsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_CONF = "camel.source.endpoint.headerFilterStrategy";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_DOC = "To use a custom HeaderFilterStrategy to map headers to/from Camel.";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_CONF = "camel.source.endpoint.overrideEndpoint";
+    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SOURCE_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_PROTOCOL_CONF = "camel.source.endpoint.protocol";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_PROTOCOL_DOC = "The underlying protocol used to communicate with SQS";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_PROTOCOL_DEFAULT = "https";
@@ -56,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_URI_ENDPOINT_OVERRIDE_CONF = "camel.source.endpoint.uriEndpointOverride";
+    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.source.endpoint.useDefaultCredentialsProvider";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_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_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
@@ -200,6 +206,9 @@ public class CamelAws2sqsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_CONFIGURATION_CONF = "camel.component.aws2-sqs.configuration";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_CONFIGURATION_DOC = "The AWS SQS default configuration";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_CONFIGURATION_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_CONF = "camel.component.aws2-sqs.overrideEndpoint";
+    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_DOC = "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option";
+    public static final Boolean CAMEL_SOURCE_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_PROTOCOL_CONF = "camel.component.aws2-sqs.protocol";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_PROTOCOL_DOC = "The underlying protocol used to communicate with SQS";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_PROTOCOL_DEFAULT = "https";
@@ -215,6 +224,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_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-sqs.uriEndpointOverride";
+    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
+    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.component.aws2-sqs.useDefaultCredentialsProvider";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_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_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
@@ -311,11 +323,13 @@ public class CamelAws2sqsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_AMAZON_SQSCLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_AMAZON_SQSCLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_AMAZON_SQSCLIENT_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_AUTO_CREATE_QUEUE_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_HEADER_FILTER_STRATEGY_DOC);
+        conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.PASSWORD, 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_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_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);
@@ -364,11 +378,13 @@ public class CamelAws2sqsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_AMAZON_SQSCLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_AMAZON_SQSCLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_AMAZON_SQSCLIENT_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_AUTO_CREATE_QUEUE_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_CONFIGURATION_DOC);
+        conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.PASSWORD, 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_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_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);
diff --git a/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-sink.json b/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-sink.json
index 70c7307..1a847d0 100644
--- a/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-sink.json
+++ b/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-sink.json
@@ -35,7 +35,7 @@
 		},
 		"camel.sink.endpoint.appendChars": {
 			"name": "camel.sink.endpoint.appendChars",
-			"description": "Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending to existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n.",
+			"description": "Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending new files or existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/connectors/camel-file-kafka-connector/src/main/docs/camel-file-kafka-sink-connector.adoc b/connectors/camel-file-kafka-connector/src/main/docs/camel-file-kafka-sink-connector.adoc
index c0eafd7..c20fd0b 100644
--- a/connectors/camel-file-kafka-connector/src/main/docs/camel-file-kafka-sink-connector.adoc
+++ b/connectors/camel-file-kafka-connector/src/main/docs/camel-file-kafka-sink-connector.adoc
@@ -35,7 +35,7 @@ The camel-file sink connector supports 26 options, which are listed below.
 | *camel.sink.endpoint.charset* | This option is used to specify the encoding of the file. You can use this on the consumer, to specify the encodings of the files, which allow Camel to know the charset it should load the file content in case the file content is being accessed. Likewise when writing a file, you can use this option to specify which charset to write the file as well. Do mind that when writing the file Camel may have to read the message content into memory to be able to conv [...]
 | *camel.sink.endpoint.doneFileName* | Producer: If provided, then Camel will write a 2nd done file when the original file has been written. The done file will be empty. This option configures what file name to use. Either you can specify a fixed name. Or you can use dynamic placeholders. The done file will always be written in the same folder as the original file. Consumer: If provided, Camel will only consume files if a done file exists. This option configures what file name to use. Ei [...]
 | *camel.sink.endpoint.fileName* | Use Expression such as File Language to dynamically set the filename. For consumers, it's used as a filename filter. For producers, it's used to evaluate the filename to write. If an expression is set, it take precedence over the CamelFileName header. (Note: The header itself can also be an Expression). The expression options support both String and Expression types. If the expression is a String type, it is always evaluated using the File Language. If  [...]
-| *camel.sink.endpoint.appendChars* | Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending to existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n. | null | false | MEDIUM
+| *camel.sink.endpoint.appendChars* | Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending new files or existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n. | null | false | MEDIUM
 | *camel.sink.endpoint.fileExist* | What to do if a file already exists with the same name. Override, which is the default, replaces the existing file. - Append - adds content to the existing file. - Fail - throws a GenericFileOperationException, indicating that there is already an existing file. - Ignore - silently ignores the problem and does not override the existing file, but assumes everything is okay. - Move - option requires to use the moveExisting option to be configured as well. [...]
 | *camel.sink.endpoint.flatten* | Flatten is used to flatten the file name path to strip any leading paths, so it's just the file name. This allows you to consume recursively into sub-directories, but when you eg write the files to another directory they will be written in a single directory. Setting this to true on the producer enforces that any file name in CamelFileName header will be stripped for any leading paths. | false | false | MEDIUM
 | *camel.sink.endpoint.jailStartingDirectory* | Used for jailing (restricting) writing files to the starting directory (and sub) only. This is enabled by default to not allow Camel to write files to outside directories (to be more secured out of the box). You can turn this off to allow writing files to directories outside the starting directory, such as parent or root folders. | true | false | MEDIUM
diff --git a/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSinkConnectorConfig.java b/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSinkConnectorConfig.java
index e391441..d489980 100644
--- a/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSinkConnectorConfig.java
+++ b/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSinkConnectorConfig.java
@@ -37,7 +37,7 @@ public class CamelFileSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_FILE_ENDPOINT_FILE_NAME_DOC = "Use Expression such as File Language to dynamically set the filename. For consumers, it's used as a filename filter. For producers, it's used to evaluate the filename to write. If an expression is set, it take precedence over the CamelFileName header. (Note: The header itself can also be an Expression). The expression options support both String and Expression types. If the expression is a String type, it is always  [...]
     public static final String CAMEL_SINK_FILE_ENDPOINT_FILE_NAME_DEFAULT = null;
     public static final String CAMEL_SINK_FILE_ENDPOINT_APPEND_CHARS_CONF = "camel.sink.endpoint.appendChars";
-    public static final String CAMEL_SINK_FILE_ENDPOINT_APPEND_CHARS_DOC = "Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending to existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n.";
+    public static final String CAMEL_SINK_FILE_ENDPOINT_APPEND_CHARS_DOC = "Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending new files or existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n.";
     public static final String CAMEL_SINK_FILE_ENDPOINT_APPEND_CHARS_DEFAULT = null;
     public static final String CAMEL_SINK_FILE_ENDPOINT_FILE_EXIST_CONF = "camel.sink.endpoint.fileExist";
     public static final String CAMEL_SINK_FILE_ENDPOINT_FILE_EXIST_DOC = "What to do if a file already exists with the same name. Override, which is the default, replaces the existing file. - Append - adds content to the existing file. - Fail - throws a GenericFileOperationException, indicating that there is already an existing file. - Ignore - silently ignores the problem and does not override the existing file, but assumes everything is okay. - Move - option requires to use the moveExi [...]
diff --git a/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-sink.json b/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-sink.json
index e932581..a269fbd 100644
--- a/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-sink.json
+++ b/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-sink.json
@@ -52,6 +52,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.serviceAccountKey": {
+			"name": "camel.sink.endpoint.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the PubSub publisher\/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.synchronousPull": {
 			"name": "camel.sink.endpoint.synchronousPull",
 			"description": "Synchronously pull batches of messages",
diff --git a/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-source.json b/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-source.json
index 5f7616a..203e05a 100644
--- a/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-source.json
+++ b/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-source.json
@@ -52,6 +52,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.serviceAccountKey": {
+			"name": "camel.source.endpoint.serviceAccountKey",
+			"description": "The Service account key that can be used as credentials for the PubSub publisher\/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.synchronousPull": {
 			"name": "camel.source.endpoint.synchronousPull",
 			"description": "Synchronously pull batches of messages",
diff --git a/connectors/camel-google-pubsub-kafka-connector/src/main/docs/camel-google-pubsub-kafka-sink-connector.adoc b/connectors/camel-google-pubsub-kafka-connector/src/main/docs/camel-google-pubsub-kafka-sink-connector.adoc
index 292449e..5a44594 100644
--- a/connectors/camel-google-pubsub-kafka-connector/src/main/docs/camel-google-pubsub-kafka-sink-connector.adoc
+++ b/connectors/camel-google-pubsub-kafka-connector/src/main/docs/camel-google-pubsub-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.googlepubsub.CamelGooglepubsubSi
 ----
 
 
-The camel-google-pubsub sink connector supports 17 options, which are listed below.
+The camel-google-pubsub sink connector supports 18 options, which are listed below.
 
 
 
@@ -37,6 +37,7 @@ The camel-google-pubsub sink connector supports 17 options, which are listed bel
 | *camel.sink.endpoint.concurrentConsumers* | The number of parallel streams consuming from the subscription | "1" | false | MEDIUM
 | *camel.sink.endpoint.loggerId* | Logger ID to use when a match to the parent route required | null | false | MEDIUM
 | *camel.sink.endpoint.maxMessagesPerPoll* | The max number of messages to receive from the server in a single API call | "1" | false | MEDIUM
+| *camel.sink.endpoint.serviceAccountKey* | The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.sink.endpoint.synchronousPull* | Synchronously pull batches of messages | 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.messageOrderingEnabled* | Should message ordering be enabled | false | false | MEDIUM
diff --git a/connectors/camel-google-pubsub-kafka-connector/src/main/docs/camel-google-pubsub-kafka-source-connector.adoc b/connectors/camel-google-pubsub-kafka-connector/src/main/docs/camel-google-pubsub-kafka-source-connector.adoc
index 316316c..0f1018c 100644
--- a/connectors/camel-google-pubsub-kafka-connector/src/main/docs/camel-google-pubsub-kafka-source-connector.adoc
+++ b/connectors/camel-google-pubsub-kafka-connector/src/main/docs/camel-google-pubsub-kafka-source-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.googlepubsub.CamelGooglepubsubSo
 ----
 
 
-The camel-google-pubsub source connector supports 14 options, which are listed below.
+The camel-google-pubsub source connector supports 15 options, which are listed below.
 
 
 
@@ -37,6 +37,7 @@ The camel-google-pubsub source connector supports 14 options, which are listed b
 | *camel.source.endpoint.concurrentConsumers* | The number of parallel streams consuming from the subscription | "1" | false | MEDIUM
 | *camel.source.endpoint.loggerId* | Logger ID to use when a match to the parent route required | null | false | MEDIUM
 | *camel.source.endpoint.maxMessagesPerPoll* | The max number of messages to receive from the server in a single API call | "1" | false | MEDIUM
+| *camel.source.endpoint.serviceAccountKey* | The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.source.endpoint.synchronousPull* | Synchronously pull batches of messages | false | 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.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-google-pubsub-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsub/CamelGooglepubsubSinkConnectorConfig.java b/connectors/camel-google-pubsub-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsub/CamelGooglepubsubSinkConnectorConfig.java
index e1a12a7..0a34930 100644
--- a/connectors/camel-google-pubsub-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsub/CamelGooglepubsubSinkConnectorConfig.java
+++ b/connectors/camel-google-pubsub-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsub/CamelGooglepubsubSinkConnectorConfig.java
@@ -44,6 +44,9 @@ public class CamelGooglepubsubSinkConnectorConfig
     public static final String CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_CONF = "camel.sink.endpoint.maxMessagesPerPoll";
     public static final String CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_DOC = "The max number of messages to receive from the server in a single API call";
     public static final String CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_DEFAULT = "1";
+    public static final String CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_CONF = "camel.sink.endpoint.serviceAccountKey";
+    public static final String CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_DOC = "The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.";
+    public static final String CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_DEFAULT = null;
     public static final String CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_CONF = "camel.sink.endpoint.synchronousPull";
     public static final String CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_DOC = "Synchronously pull batches of messages";
     public static final Boolean CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_DEFAULT = false;
@@ -96,6 +99,7 @@ public class CamelGooglepubsubSinkConnectorConfig
         conf.define(CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_CONCURRENT_CONSUMERS_DOC);
         conf.define(CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_LOGGER_ID_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_LOGGER_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_LOGGER_ID_DOC);
         conf.define(CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_DOC);
+        conf.define(CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_DOC);
         conf.define(CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_DOC);
         conf.define(CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_MESSAGE_ORDERING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_MESSAGE_ORDERING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GOOGLEPUBSUB_ENDPOINT_MESSAGE_ORDERING_ENABLED_DOC);
diff --git a/connectors/camel-google-pubsub-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsub/CamelGooglepubsubSourceConnectorConfig.java b/connectors/camel-google-pubsub-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsub/CamelGooglepubsubSourceConnectorConfig.java
index 960e8db..c68694b 100644
--- a/connectors/camel-google-pubsub-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsub/CamelGooglepubsubSourceConnectorConfig.java
+++ b/connectors/camel-google-pubsub-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsub/CamelGooglepubsubSourceConnectorConfig.java
@@ -44,6 +44,9 @@ public class CamelGooglepubsubSourceConnectorConfig
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_CONF = "camel.source.endpoint.maxMessagesPerPoll";
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_DOC = "The max number of messages to receive from the server in a single API call";
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_DEFAULT = "1";
+    public static final String CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_CONF = "camel.source.endpoint.serviceAccountKey";
+    public static final String CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_DOC = "The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.";
+    public static final String CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_DEFAULT = null;
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_CONF = "camel.source.endpoint.synchronousPull";
     public static final String CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_DOC = "Synchronously pull batches of messages";
     public static final Boolean CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_DEFAULT = false;
@@ -88,6 +91,7 @@ public class CamelGooglepubsubSourceConnectorConfig
         conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_CONCURRENT_CONSUMERS_DOC);
         conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_LOGGER_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_LOGGER_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_LOGGER_ID_DOC);
         conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_MAX_MESSAGES_PER_POLL_DOC);
+        conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SERVICE_ACCOUNT_KEY_DOC);
         conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_SYNCHRONOUS_PULL_DOC);
         conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GOOGLEPUBSUB_ENDPOINT_EXCEPTION_HANDLER_DOC);
diff --git a/connectors/camel-google-storage-kafka-connector/src/generated/resources/camel-google-storage-sink.json b/connectors/camel-google-storage-kafka-connector/src/generated/resources/camel-google-storage-sink.json
index fdecc64..a07f363 100644
--- a/connectors/camel-google-storage-kafka-connector/src/generated/resources/camel-google-storage-sink.json
+++ b/connectors/camel-google-storage-kafka-connector/src/generated/resources/camel-google-storage-sink.json
@@ -24,7 +24,7 @@
 		},
 		"camel.sink.endpoint.serviceAccountKey": {
 			"name": "camel.sink.endpoint.serviceAccountKey",
-			"description": "Service account key to authenticate an application as a service account",
+			"description": "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -91,7 +91,7 @@
 		},
 		"camel.component.google-storage.serviceAccountKey": {
 			"name": "camel.component.google-storage.serviceAccountKey",
-			"description": "Service account key to authenticate an application as a service account",
+			"description": "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -151,4 +151,4 @@
 			"required": "false"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-google-storage-kafka-connector/src/generated/resources/camel-google-storage-source.json b/connectors/camel-google-storage-kafka-connector/src/generated/resources/camel-google-storage-source.json
index 4fa2f06..cc1c02c 100644
--- a/connectors/camel-google-storage-kafka-connector/src/generated/resources/camel-google-storage-source.json
+++ b/connectors/camel-google-storage-kafka-connector/src/generated/resources/camel-google-storage-source.json
@@ -24,7 +24,7 @@
 		},
 		"camel.source.endpoint.serviceAccountKey": {
 			"name": "camel.source.endpoint.serviceAccountKey",
-			"description": "Service account key to authenticate an application as a service account",
+			"description": "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -244,7 +244,7 @@
 		},
 		"camel.component.google-storage.serviceAccountKey": {
 			"name": "camel.component.google-storage.serviceAccountKey",
-			"description": "Service account key to authenticate an application as a service account",
+			"description": "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -317,4 +317,4 @@
 			"required": "false"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-google-storage-kafka-connector/src/main/docs/camel-google-storage-kafka-sink-connector.adoc b/connectors/camel-google-storage-kafka-connector/src/main/docs/camel-google-storage-kafka-sink-connector.adoc
index a79b9b2..1065606 100644
--- a/connectors/camel-google-storage-kafka-connector/src/main/docs/camel-google-storage-kafka-sink-connector.adoc
+++ b/connectors/camel-google-storage-kafka-connector/src/main/docs/camel-google-storage-kafka-sink-connector.adoc
@@ -33,7 +33,7 @@ The camel-google-storage sink connector supports 19 options, which are listed be
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.bucketName* | Bucket name or ARN | null | true | HIGH
 | *camel.sink.endpoint.autoCreateBucket* | Setting the autocreation of the bucket bucketName. | true | false | MEDIUM
-| *camel.sink.endpoint.serviceAccountKey* | Service account key to authenticate an application as a service account | null | false | MEDIUM
+| *camel.sink.endpoint.serviceAccountKey* | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.sink.endpoint.storageClass* | The Cloud Storage class to use when creating the new buckets | "STANDARD" | false | MEDIUM
 | *camel.sink.endpoint.storageClient* | The storage client | null | false | MEDIUM
 | *camel.sink.endpoint.storageLocation* | The Cloud Storage location to use when creating the new buckets | "US-EAST1" | false | MEDIUM
@@ -42,7 +42,7 @@ The camel-google-storage sink connector supports 19 options, which are listed be
 | *camel.sink.endpoint.operation* | Set the operation for the producer One of: [copyObject] [listObjects] [deleteObject] [deleteBucket] [listBuckets] [getObject] [createDownloadLink] | null | false | MEDIUM
 | *camel.component.google-storage.autoCreateBucket* | Setting the autocreation of the bucket bucketName. | true | false | MEDIUM
 | *camel.component.google-storage.configuration* | The component configuration | null | false | MEDIUM
-| *camel.component.google-storage.serviceAccountKey* | Service account key to authenticate an application as a service account | null | false | MEDIUM
+| *camel.component.google-storage.serviceAccountKey* | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.component.google-storage.storageClass* | The Cloud Storage class to use when creating the new buckets | "STANDARD" | false | MEDIUM
 | *camel.component.google-storage.storageClient* | The storage client | null | false | MEDIUM
 | *camel.component.google-storage.storageLocation* | The Cloud Storage location to use when creating the new buckets | "US-EAST1" | false | MEDIUM
@@ -67,8 +67,4 @@ The camel-google-storage sink connector has no transforms out of the box.
 
 
 The camel-google-storage sink connector has no aggregation strategies out of the box.
-
-
-
-
 // kafka-connector options: END
diff --git a/connectors/camel-google-storage-kafka-connector/src/main/docs/camel-google-storage-kafka-source-connector.adoc b/connectors/camel-google-storage-kafka-connector/src/main/docs/camel-google-storage-kafka-source-connector.adoc
index 7fe6544..a4cb769 100644
--- a/connectors/camel-google-storage-kafka-connector/src/main/docs/camel-google-storage-kafka-source-connector.adoc
+++ b/connectors/camel-google-storage-kafka-connector/src/main/docs/camel-google-storage-kafka-source-connector.adoc
@@ -33,7 +33,7 @@ The camel-google-storage source connector supports 43 options, which are listed
 | Name | Description | Default | Required | Priority
 | *camel.source.path.bucketName* | Bucket name or ARN | null | true | HIGH
 | *camel.source.endpoint.autoCreateBucket* | Setting the autocreation of the bucket bucketName. | true | false | MEDIUM
-| *camel.source.endpoint.serviceAccountKey* | Service account key to authenticate an application as a service account | null | false | MEDIUM
+| *camel.source.endpoint.serviceAccountKey* | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.source.endpoint.storageClass* | The Cloud Storage class to use when creating the new buckets | "STANDARD" | false | MEDIUM
 | *camel.source.endpoint.storageClient* | The storage client | null | false | MEDIUM
 | *camel.source.endpoint.storageLocation* | The Cloud Storage location to use when creating the new buckets | "US-EAST1" | false | MEDIUM
@@ -63,7 +63,7 @@ The camel-google-storage source connector supports 43 options, which are listed
 | *camel.source.endpoint.useFixedDelay* | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | false | MEDIUM
 | *camel.component.google-storage.autoCreateBucket* | Setting the autocreation of the bucket bucketName. | true | false | MEDIUM
 | *camel.component.google-storage.configuration* | The component configuration | null | false | MEDIUM
-| *camel.component.google-storage.serviceAccountKey* | Service account key to authenticate an application as a service account | null | false | MEDIUM
+| *camel.component.google-storage.serviceAccountKey* | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.component.google-storage.storageClass* | The Cloud Storage class to use when creating the new buckets | "STANDARD" | false | MEDIUM
 | *camel.component.google-storage.storageClient* | The storage client | null | false | MEDIUM
 | *camel.component.google-storage.storageLocation* | The Cloud Storage location to use when creating the new buckets | "US-EAST1" | false | MEDIUM
@@ -91,8 +91,4 @@ The camel-google-storage source connector has no transforms out of the box.
 
 
 The camel-google-storage source connector has no aggregation strategies out of the box.
-
-
-
-
 // kafka-connector options: END
diff --git a/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSinkConnectorConfig.java b/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSinkConnectorConfig.java
index 5677367..107ba08 100644
--- a/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSinkConnectorConfig.java
+++ b/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSinkConnectorConfig.java
@@ -33,7 +33,7 @@ public class CamelGooglestorageSinkConnectorConfig
     public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_AUTO_CREATE_BUCKET_DOC = "Setting the autocreation of the bucket bucketName.";
     public static final Boolean CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_AUTO_CREATE_BUCKET_DEFAULT = true;
     public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_CONF = "camel.sink.endpoint.serviceAccountKey";
-    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_DOC = "Service account key to authenticate an application as a service account";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_DOC = "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.";
     public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_DEFAULT = null;
     public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_CLASS_CONF = "camel.sink.endpoint.storageClass";
     public static final String CAMEL_SINK_GOOGLESTORAGE_ENDPOINT_STORAGE_CLASS_DOC = "The Cloud Storage class to use when creating the new buckets";
@@ -60,7 +60,7 @@ public class CamelGooglestorageSinkConnectorConfig
     public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_CONFIGURATION_DOC = "The component configuration";
     public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_CONFIGURATION_DEFAULT = null;
     public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_CONF = "camel.component.google-storage.serviceAccountKey";
-    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_DOC = "Service account key to authenticate an application as a service account";
+    public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_DOC = "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.";
     public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_DEFAULT = null;
     public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_CLASS_CONF = "camel.component.google-storage.storageClass";
     public static final String CAMEL_SINK_GOOGLESTORAGE_COMPONENT_STORAGE_CLASS_DOC = "The Cloud Storage class to use when creating the new buckets";
diff --git a/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSourceConnectorConfig.java b/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSourceConnectorConfig.java
index 92de247..16d6d8d 100644
--- a/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSourceConnectorConfig.java
+++ b/connectors/camel-google-storage-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorage/CamelGooglestorageSourceConnectorConfig.java
@@ -33,7 +33,7 @@ public class CamelGooglestorageSourceConnectorConfig
     public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_AUTO_CREATE_BUCKET_DOC = "Setting the autocreation of the bucket bucketName.";
     public static final Boolean CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_AUTO_CREATE_BUCKET_DEFAULT = true;
     public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_CONF = "camel.source.endpoint.serviceAccountKey";
-    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_DOC = "Service account key to authenticate an application as a service account";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_DOC = "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.";
     public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_SERVICE_ACCOUNT_KEY_DEFAULT = null;
     public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_CLASS_CONF = "camel.source.endpoint.storageClass";
     public static final String CAMEL_SOURCE_GOOGLESTORAGE_ENDPOINT_STORAGE_CLASS_DOC = "The Cloud Storage class to use when creating the new buckets";
@@ -123,7 +123,7 @@ public class CamelGooglestorageSourceConnectorConfig
     public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_CONFIGURATION_DOC = "The component configuration";
     public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_CONFIGURATION_DEFAULT = null;
     public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_CONF = "camel.component.google-storage.serviceAccountKey";
-    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_DOC = "Service account key to authenticate an application as a service account";
+    public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_DOC = "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.";
     public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_SERVICE_ACCOUNT_KEY_DEFAULT = null;
     public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_CLASS_CONF = "camel.component.google-storage.storageClass";
     public static final String CAMEL_SOURCE_GOOGLESTORAGE_COMPONENT_STORAGE_CLASS_DOC = "The Cloud Storage class to use when creating the new buckets";
diff --git a/connectors/camel-http-kafka-connector/src/generated/resources/camel-http-sink.json b/connectors/camel-http-kafka-connector/src/generated/resources/camel-http-sink.json
index 5ea269c..7ab2e41 100644
--- a/connectors/camel-http-kafka-connector/src/generated/resources/camel-http-sink.json
+++ b/connectors/camel-http-kafka-connector/src/generated/resources/camel-http-sink.json
@@ -50,7 +50,7 @@
 		},
 		"camel.sink.endpoint.clearExpiredCookies": {
 			"name": "camel.sink.endpoint.clearExpiredCookies",
-			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired.",
+			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -159,6 +159,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.skipRequestHeaders": {
+			"name": "camel.sink.endpoint.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.skipResponseHeaders": {
+			"name": "camel.sink.endpoint.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.clientBuilder": {
 			"name": "camel.sink.endpoint.clientBuilder",
 			"description": "Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint.",
@@ -351,6 +365,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.copyHeaders": {
+			"name": "camel.component.http.copyHeaders",
+			"description": "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers).",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.lazyStartProducer": {
 			"name": "camel.component.http.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 [...]
@@ -365,6 +386,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.skipRequestHeaders": {
+			"name": "camel.component.http.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.http.skipResponseHeaders": {
+			"name": "camel.component.http.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.allowJavaSerializedObject": {
 			"name": "camel.component.http.allowJavaSerializedObject",
 			"description": "Whether to allow java serialization when a request uses context-type=application\/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.",
@@ -372,6 +407,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.authCachingDisabled": {
+			"name": "camel.component.http.authCachingDisabled",
+			"description": "Disables authentication scheme caching",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.http.automaticRetriesDisabled": {
+			"name": "camel.component.http.automaticRetriesDisabled",
+			"description": "Disables automatic request recovery and re-execution",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.autowiredEnabled": {
 			"name": "camel.component.http.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
@@ -392,12 +441,40 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.connectionStateDisabled": {
+			"name": "camel.component.http.connectionStateDisabled",
+			"description": "Disables connection state tracking",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.connectionTimeToLive": {
 			"name": "camel.component.http.connectionTimeToLive",
 			"description": "The time for connection to live, the time unit is millisecond, the default value is always keep alive.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.contentCompressionDisabled": {
+			"name": "camel.component.http.contentCompressionDisabled",
+			"description": "Disables automatic content decompression",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.http.cookieManagementDisabled": {
+			"name": "camel.component.http.cookieManagementDisabled",
+			"description": "Disables state (cookie) management",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.http.defaultUserAgentDisabled": {
+			"name": "camel.component.http.defaultUserAgentDisabled",
+			"description": "Disables the default user agent set by this builder if none has been provided by the user",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.httpBinding": {
 			"name": "camel.component.http.httpBinding",
 			"description": "To use a custom HttpBinding to control the mapping between Camel message and HttpClient.",
@@ -429,6 +506,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.http.redirectHandlingDisabled": {
+			"name": "camel.component.http.redirectHandlingDisabled",
+			"description": "Disables automatic redirect handling",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.http.headerFilterStrategy": {
 			"name": "camel.component.http.headerFilterStrategy",
 			"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.",
diff --git a/connectors/camel-http-kafka-connector/src/main/docs/camel-http-kafka-sink-connector.adoc b/connectors/camel-http-kafka-connector/src/main/docs/camel-http-kafka-sink-connector.adoc
index 88eecea..231508a 100644
--- a/connectors/camel-http-kafka-connector/src/main/docs/camel-http-kafka-sink-connector.adoc
+++ b/connectors/camel-http-kafka-connector/src/main/docs/camel-http-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.http.CamelHttpSinkConnector
 ----
 
 
-The camel-http sink connector supports 76 options, which are listed below.
+The camel-http sink connector supports 88 options, which are listed below.
 
 
 
@@ -37,7 +37,7 @@ The camel-http sink connector supports 76 options, which are listed below.
 | *camel.sink.endpoint.httpBinding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | null | false | MEDIUM
 | *camel.sink.endpoint.bridgeEndpoint* | If the option is true, HttpProducer will ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back. | false | false | MEDIUM
 | *camel.sink.endpoint.chunked* | If this option is false the Servlet will disable the HTTP streaming and set the content-length header on the response | true | false | MEDIUM
-| *camel.sink.endpoint.clearExpiredCookies* | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. | true | false | MEDIUM
+| *camel.sink.endpoint.clearExpiredCookies* | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too. | true | false | MEDIUM
 | *camel.sink.endpoint.connectionClose* | Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false. | false | false | MEDIUM
 | *camel.sink.endpoint.copyHeaders* | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers). | true | false | MEDIUM
 | *camel.sink.endpoint.customHostHeader* | To use custom host header for producer. When not set in query will be ignored. When set will override host header derived from url. | null | false | MEDIUM
@@ -52,6 +52,8 @@ The camel-http sink connector supports 76 options, which are listed below.
 | *camel.sink.endpoint.deleteWithBody* | Whether the HTTP DELETE should include the message body or not. By default HTTP DELETE do not include any HTTP body. However in some rare cases users may need to be able to include the message body. | false | false | MEDIUM
 | *camel.sink.endpoint.getWithBody* | Whether the HTTP GET should include the message body or not. By default HTTP GET do not include any HTTP body. However in some rare cases users may need to be able to include the message body. | false | false | MEDIUM
 | *camel.sink.endpoint.okStatusCodeRange* | The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included. | "200-299" | false | MEDIUM
+| *camel.sink.endpoint.skipRequestHeaders* | Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
+| *camel.sink.endpoint.skipResponseHeaders* | Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
 | *camel.sink.endpoint.clientBuilder* | Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint. | null | false | MEDIUM
 | *camel.sink.endpoint.clientConnectionManager* | To use a custom HttpClientConnectionManager to manage connections | null | false | MEDIUM
 | *camel.sink.endpoint.connectionsPerRoute* | The maximum number of connections per route. | 20 | false | MEDIUM
@@ -81,18 +83,28 @@ The camel-http sink connector supports 76 options, which are listed below.
 | *camel.sink.endpoint.sslContextParameters* | To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need. | null | false | MEDIUM
 | *camel.sink.endpoint.x509HostnameVerifier* | To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier | null | false | MEDIUM
 | *camel.component.http.cookieStore* | To use a custom org.apache.http.client.CookieStore. By default the org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to be a noop cookie store as cookie shouldn't be stored as we are just bridging (eg acting as a proxy). | null | false | MEDIUM
+| *camel.component.http.copyHeaders* | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers). | true | false | MEDIUM
 | *camel.component.http.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 cr [...]
 | *camel.component.http.responsePayloadStreaming Threshold* | This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode. | 8192 | false | MEDIUM
+| *camel.component.http.skipRequestHeaders* | Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
+| *camel.component.http.skipResponseHeaders* | Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
 | *camel.component.http.allowJavaSerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
+| *camel.component.http.authCachingDisabled* | Disables authentication scheme caching | false | false | MEDIUM
+| *camel.component.http.automaticRetriesDisabled* | Disables automatic request recovery and re-execution | false | false | MEDIUM
 | *camel.component.http.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.http.clientConnectionManager* | To use a custom and shared HttpClientConnectionManager to manage connections. If this has been configured then this is always used for all endpoints created by this component. | null | false | MEDIUM
 | *camel.component.http.connectionsPerRoute* | The maximum number of connections per route. | 20 | false | MEDIUM
+| *camel.component.http.connectionStateDisabled* | Disables connection state tracking | false | false | MEDIUM
 | *camel.component.http.connectionTimeToLive* | The time for connection to live, the time unit is millisecond, the default value is always keep alive. | null | false | MEDIUM
+| *camel.component.http.contentCompressionDisabled* | Disables automatic content decompression | false | false | MEDIUM
+| *camel.component.http.cookieManagementDisabled* | Disables state (cookie) management | false | false | MEDIUM
+| *camel.component.http.defaultUserAgentDisabled* | Disables the default user agent set by this builder if none has been provided by the user | false | false | MEDIUM
 | *camel.component.http.httpBinding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | null | false | MEDIUM
 | *camel.component.http.httpClientConfigurer* | To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used. | null | false | MEDIUM
 | *camel.component.http.httpConfiguration* | To use the shared HttpConfiguration as base configuration. | null | false | MEDIUM
 | *camel.component.http.httpContext* | To use a custom org.apache.http.protocol.HttpContext when executing requests. | null | false | MEDIUM
 | *camel.component.http.maxTotalConnections* | The maximum number of connections. | 200 | false | MEDIUM
+| *camel.component.http.redirectHandlingDisabled* | Disables automatic redirect handling | false | false | MEDIUM
 | *camel.component.http.headerFilterStrategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | null | false | MEDIUM
 | *camel.component.http.proxyAuthDomain* | Proxy authentication domain to use | null | false | MEDIUM
 | *camel.component.http.proxyAuthHost* | Proxy authentication host | null | false | MEDIUM
diff --git a/connectors/camel-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/http/CamelHttpSinkConnectorConfig.java b/connectors/camel-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/http/CamelHttpSinkConnectorConfig.java
index ac9a3bc..bea2493 100644
--- a/connectors/camel-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/http/CamelHttpSinkConnectorConfig.java
+++ b/connectors/camel-http-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/http/CamelHttpSinkConnectorConfig.java
@@ -43,7 +43,7 @@ public class CamelHttpSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTP_ENDPOINT_CHUNKED_DOC = "If this option is false the Servlet will disable the HTTP streaming and set the content-length header on the response";
     public static final Boolean CAMEL_SINK_HTTP_ENDPOINT_CHUNKED_DEFAULT = true;
     public static final String CAMEL_SINK_HTTP_ENDPOINT_CLEAR_EXPIRED_COOKIES_CONF = "camel.sink.endpoint.clearExpiredCookies";
-    public static final String CAMEL_SINK_HTTP_ENDPOINT_CLEAR_EXPIRED_COOKIES_DOC = "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired.";
+    public static final String CAMEL_SINK_HTTP_ENDPOINT_CLEAR_EXPIRED_COOKIES_DOC = "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too.";
     public static final Boolean CAMEL_SINK_HTTP_ENDPOINT_CLEAR_EXPIRED_COOKIES_DEFAULT = true;
     public static final String CAMEL_SINK_HTTP_ENDPOINT_CONNECTION_CLOSE_CONF = "camel.sink.endpoint.connectionClose";
     public static final String CAMEL_SINK_HTTP_ENDPOINT_CONNECTION_CLOSE_DOC = "Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false.";
@@ -87,6 +87,12 @@ public class CamelHttpSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTP_ENDPOINT_OK_STATUS_CODE_RANGE_CONF = "camel.sink.endpoint.okStatusCodeRange";
     public static final String CAMEL_SINK_HTTP_ENDPOINT_OK_STATUS_CODE_RANGE_DOC = "The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included.";
     public static final String CAMEL_SINK_HTTP_ENDPOINT_OK_STATUS_CODE_RANGE_DEFAULT = "200-299";
+    public static final String CAMEL_SINK_HTTP_ENDPOINT_SKIP_REQUEST_HEADERS_CONF = "camel.sink.endpoint.skipRequestHeaders";
+    public static final String CAMEL_SINK_HTTP_ENDPOINT_SKIP_REQUEST_HEADERS_DOC = "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_HTTP_ENDPOINT_SKIP_REQUEST_HEADERS_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTP_ENDPOINT_SKIP_RESPONSE_HEADERS_CONF = "camel.sink.endpoint.skipResponseHeaders";
+    public static final String CAMEL_SINK_HTTP_ENDPOINT_SKIP_RESPONSE_HEADERS_DOC = "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_HTTP_ENDPOINT_SKIP_RESPONSE_HEADERS_DEFAULT = false;
     public static final String CAMEL_SINK_HTTP_ENDPOINT_CLIENT_BUILDER_CONF = "camel.sink.endpoint.clientBuilder";
     public static final String CAMEL_SINK_HTTP_ENDPOINT_CLIENT_BUILDER_DOC = "Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint.";
     public static final String CAMEL_SINK_HTTP_ENDPOINT_CLIENT_BUILDER_DEFAULT = null;
@@ -174,15 +180,30 @@ public class CamelHttpSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTP_COMPONENT_COOKIE_STORE_CONF = "camel.component.http.cookieStore";
     public static final String CAMEL_SINK_HTTP_COMPONENT_COOKIE_STORE_DOC = "To use a custom org.apache.http.client.CookieStore. By default the org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to be a noop cookie store as cookie shouldn't be stored as we are just bridging (eg acting as a proxy).";
     public static final String CAMEL_SINK_HTTP_COMPONENT_COOKIE_STORE_DEFAULT = null;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_COPY_HEADERS_CONF = "camel.component.http.copyHeaders";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_COPY_HEADERS_DOC = "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers).";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_COPY_HEADERS_DEFAULT = true;
     public static final String CAMEL_SINK_HTTP_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.http.lazyStartProducer";
     public static final String CAMEL_SINK_HTTP_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 when [...]
     public static final Boolean CAMEL_SINK_HTTP_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
     public static final String CAMEL_SINK_HTTP_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_CONF = "camel.component.http.responsePayloadStreamingThreshold";
     public static final String CAMEL_SINK_HTTP_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DOC = "This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode.";
     public static final Integer CAMEL_SINK_HTTP_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DEFAULT = 8192;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_SKIP_REQUEST_HEADERS_CONF = "camel.component.http.skipRequestHeaders";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_SKIP_REQUEST_HEADERS_DOC = "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_SKIP_REQUEST_HEADERS_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_SKIP_RESPONSE_HEADERS_CONF = "camel.component.http.skipResponseHeaders";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_SKIP_RESPONSE_HEADERS_DOC = "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_SKIP_RESPONSE_HEADERS_DEFAULT = false;
     public static final String CAMEL_SINK_HTTP_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.http.allowJavaSerializedObject";
     public static final String CAMEL_SINK_HTTP_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SINK_HTTP_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_AUTH_CACHING_DISABLED_CONF = "camel.component.http.authCachingDisabled";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_AUTH_CACHING_DISABLED_DOC = "Disables authentication scheme caching";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_AUTH_CACHING_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_AUTOMATIC_RETRIES_DISABLED_CONF = "camel.component.http.automaticRetriesDisabled";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DOC = "Disables automatic request recovery and re-execution";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_HTTP_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.http.autowiredEnabled";
     public static final String CAMEL_SINK_HTTP_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
     public static final Boolean CAMEL_SINK_HTTP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -192,9 +213,21 @@ public class CamelHttpSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTP_COMPONENT_CONNECTIONS_PER_ROUTE_CONF = "camel.component.http.connectionsPerRoute";
     public static final String CAMEL_SINK_HTTP_COMPONENT_CONNECTIONS_PER_ROUTE_DOC = "The maximum number of connections per route.";
     public static final Integer CAMEL_SINK_HTTP_COMPONENT_CONNECTIONS_PER_ROUTE_DEFAULT = 20;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_CONNECTION_STATE_DISABLED_CONF = "camel.component.http.connectionStateDisabled";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_CONNECTION_STATE_DISABLED_DOC = "Disables connection state tracking";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_CONNECTION_STATE_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_HTTP_COMPONENT_CONNECTION_TIME_TO_LIVE_CONF = "camel.component.http.connectionTimeToLive";
     public static final String CAMEL_SINK_HTTP_COMPONENT_CONNECTION_TIME_TO_LIVE_DOC = "The time for connection to live, the time unit is millisecond, the default value is always keep alive.";
     public static final Long CAMEL_SINK_HTTP_COMPONENT_CONNECTION_TIME_TO_LIVE_DEFAULT = null;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_CONTENT_COMPRESSION_DISABLED_CONF = "camel.component.http.contentCompressionDisabled";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_CONTENT_COMPRESSION_DISABLED_DOC = "Disables automatic content decompression";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_CONTENT_COMPRESSION_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_COOKIE_MANAGEMENT_DISABLED_CONF = "camel.component.http.cookieManagementDisabled";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DOC = "Disables state (cookie) management";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_DEFAULT_USER_AGENT_DISABLED_CONF = "camel.component.http.defaultUserAgentDisabled";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DOC = "Disables the default user agent set by this builder if none has been provided by the user";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_HTTP_COMPONENT_HTTP_BINDING_CONF = "camel.component.http.httpBinding";
     public static final String CAMEL_SINK_HTTP_COMPONENT_HTTP_BINDING_DOC = "To use a custom HttpBinding to control the mapping between Camel message and HttpClient.";
     public static final String CAMEL_SINK_HTTP_COMPONENT_HTTP_BINDING_DEFAULT = null;
@@ -210,6 +243,9 @@ public class CamelHttpSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTP_COMPONENT_MAX_TOTAL_CONNECTIONS_CONF = "camel.component.http.maxTotalConnections";
     public static final String CAMEL_SINK_HTTP_COMPONENT_MAX_TOTAL_CONNECTIONS_DOC = "The maximum number of connections.";
     public static final Integer CAMEL_SINK_HTTP_COMPONENT_MAX_TOTAL_CONNECTIONS_DEFAULT = 200;
+    public static final String CAMEL_SINK_HTTP_COMPONENT_REDIRECT_HANDLING_DISABLED_CONF = "camel.component.http.redirectHandlingDisabled";
+    public static final String CAMEL_SINK_HTTP_COMPONENT_REDIRECT_HANDLING_DISABLED_DOC = "Disables automatic redirect handling";
+    public static final Boolean CAMEL_SINK_HTTP_COMPONENT_REDIRECT_HANDLING_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_HTTP_COMPONENT_HEADER_FILTER_STRATEGY_CONF = "camel.component.http.headerFilterStrategy";
     public static final String CAMEL_SINK_HTTP_COMPONENT_HEADER_FILTER_STRATEGY_DOC = "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.";
     public static final String CAMEL_SINK_HTTP_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT = null;
@@ -286,6 +322,8 @@ public class CamelHttpSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_DELETE_WITH_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_ENDPOINT_DELETE_WITH_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_DELETE_WITH_BODY_DOC);
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_GET_WITH_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_ENDPOINT_GET_WITH_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_GET_WITH_BODY_DOC);
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_OK_STATUS_CODE_RANGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_ENDPOINT_OK_STATUS_CODE_RANGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_OK_STATUS_CODE_RANGE_DOC);
+        conf.define(CAMEL_SINK_HTTP_ENDPOINT_SKIP_REQUEST_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_ENDPOINT_SKIP_REQUEST_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_SKIP_REQUEST_HEADERS_DOC);
+        conf.define(CAMEL_SINK_HTTP_ENDPOINT_SKIP_RESPONSE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_ENDPOINT_SKIP_RESPONSE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_SKIP_RESPONSE_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_CLIENT_BUILDER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_ENDPOINT_CLIENT_BUILDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_CLIENT_BUILDER_DOC);
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_CLIENT_CONNECTION_MANAGER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_ENDPOINT_CLIENT_CONNECTION_MANAGER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_CLIENT_CONNECTION_MANAGER_DOC);
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_CONNECTIONS_PER_ROUTE_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTP_ENDPOINT_CONNECTIONS_PER_ROUTE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_CONNECTIONS_PER_ROUTE_DOC);
@@ -315,18 +353,28 @@ public class CamelHttpSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_SSL_CONTEXT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_ENDPOINT_SSL_CONTEXT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_SSL_CONTEXT_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_HTTP_ENDPOINT_X509HOSTNAME_VERIFIER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_ENDPOINT_X509HOSTNAME_VERIFIER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_ENDPOINT_X509HOSTNAME_VERIFIER_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_COOKIE_STORE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_COMPONENT_COOKIE_STORE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_COOKIE_STORE_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_COPY_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_COPY_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_COPY_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTP_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_SKIP_REQUEST_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_SKIP_REQUEST_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_SKIP_REQUEST_HEADERS_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_SKIP_RESPONSE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_SKIP_RESPONSE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_SKIP_RESPONSE_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_AUTH_CACHING_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_AUTH_CACHING_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_AUTH_CACHING_DISABLED_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_AUTOMATIC_RETRIES_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_CLIENT_CONNECTION_MANAGER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_COMPONENT_CLIENT_CONNECTION_MANAGER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_CLIENT_CONNECTION_MANAGER_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_CONNECTIONS_PER_ROUTE_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTP_COMPONENT_CONNECTIONS_PER_ROUTE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_CONNECTIONS_PER_ROUTE_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_CONNECTION_STATE_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_CONNECTION_STATE_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_CONNECTION_STATE_DISABLED_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_CONNECTION_TIME_TO_LIVE_CONF, ConfigDef.Type.LONG, CAMEL_SINK_HTTP_COMPONENT_CONNECTION_TIME_TO_LIVE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_CONNECTION_TIME_TO_LIVE_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_CONTENT_COMPRESSION_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_CONTENT_COMPRESSION_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_CONTENT_COMPRESSION_DISABLED_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_COOKIE_MANAGEMENT_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_DEFAULT_USER_AGENT_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_HTTP_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_COMPONENT_HTTP_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_HTTP_BINDING_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_HTTP_CLIENT_CONFIGURER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_COMPONENT_HTTP_CLIENT_CONFIGURER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_HTTP_CLIENT_CONFIGURER_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_HTTP_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_COMPONENT_HTTP_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_HTTP_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_HTTP_CONTEXT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_COMPONENT_HTTP_CONTEXT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_HTTP_CONTEXT_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_MAX_TOTAL_CONNECTIONS_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTP_COMPONENT_MAX_TOTAL_CONNECTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_MAX_TOTAL_CONNECTIONS_DOC);
+        conf.define(CAMEL_SINK_HTTP_COMPONENT_REDIRECT_HANDLING_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTP_COMPONENT_REDIRECT_HANDLING_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_REDIRECT_HANDLING_DISABLED_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_HEADER_FILTER_STRATEGY_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_PROXY_AUTH_DOMAIN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_COMPONENT_PROXY_AUTH_DOMAIN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_PROXY_AUTH_DOMAIN_DOC);
         conf.define(CAMEL_SINK_HTTP_COMPONENT_PROXY_AUTH_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTP_COMPONENT_PROXY_AUTH_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTP_COMPONENT_PROXY_AUTH_HOST_DOC);
diff --git a/connectors/camel-https-kafka-connector/src/generated/resources/camel-https-sink.json b/connectors/camel-https-kafka-connector/src/generated/resources/camel-https-sink.json
index a858f83..9cf955c 100644
--- a/connectors/camel-https-kafka-connector/src/generated/resources/camel-https-sink.json
+++ b/connectors/camel-https-kafka-connector/src/generated/resources/camel-https-sink.json
@@ -50,7 +50,7 @@
 		},
 		"camel.sink.endpoint.clearExpiredCookies": {
 			"name": "camel.sink.endpoint.clearExpiredCookies",
-			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired.",
+			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -159,6 +159,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.skipRequestHeaders": {
+			"name": "camel.sink.endpoint.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.skipResponseHeaders": {
+			"name": "camel.sink.endpoint.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.clientBuilder": {
 			"name": "camel.sink.endpoint.clientBuilder",
 			"description": "Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint.",
@@ -351,6 +365,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.copyHeaders": {
+			"name": "camel.component.https.copyHeaders",
+			"description": "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers).",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.lazyStartProducer": {
 			"name": "camel.component.https.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 [...]
@@ -365,6 +386,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.skipRequestHeaders": {
+			"name": "camel.component.https.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.https.skipResponseHeaders": {
+			"name": "camel.component.https.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.allowJavaSerializedObject": {
 			"name": "camel.component.https.allowJavaSerializedObject",
 			"description": "Whether to allow java serialization when a request uses context-type=application\/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.",
@@ -372,6 +407,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.authCachingDisabled": {
+			"name": "camel.component.https.authCachingDisabled",
+			"description": "Disables authentication scheme caching",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.https.automaticRetriesDisabled": {
+			"name": "camel.component.https.automaticRetriesDisabled",
+			"description": "Disables automatic request recovery and re-execution",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.autowiredEnabled": {
 			"name": "camel.component.https.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
@@ -392,12 +441,40 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.connectionStateDisabled": {
+			"name": "camel.component.https.connectionStateDisabled",
+			"description": "Disables connection state tracking",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.connectionTimeToLive": {
 			"name": "camel.component.https.connectionTimeToLive",
 			"description": "The time for connection to live, the time unit is millisecond, the default value is always keep alive.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.contentCompressionDisabled": {
+			"name": "camel.component.https.contentCompressionDisabled",
+			"description": "Disables automatic content decompression",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.https.cookieManagementDisabled": {
+			"name": "camel.component.https.cookieManagementDisabled",
+			"description": "Disables state (cookie) management",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.https.defaultUserAgentDisabled": {
+			"name": "camel.component.https.defaultUserAgentDisabled",
+			"description": "Disables the default user agent set by this builder if none has been provided by the user",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.httpBinding": {
 			"name": "camel.component.https.httpBinding",
 			"description": "To use a custom HttpBinding to control the mapping between Camel message and HttpClient.",
@@ -429,6 +506,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.https.redirectHandlingDisabled": {
+			"name": "camel.component.https.redirectHandlingDisabled",
+			"description": "Disables automatic redirect handling",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.https.headerFilterStrategy": {
 			"name": "camel.component.https.headerFilterStrategy",
 			"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.",
diff --git a/connectors/camel-https-kafka-connector/src/main/docs/camel-https-kafka-sink-connector.adoc b/connectors/camel-https-kafka-connector/src/main/docs/camel-https-kafka-sink-connector.adoc
index 672be73..5c19060 100644
--- a/connectors/camel-https-kafka-connector/src/main/docs/camel-https-kafka-sink-connector.adoc
+++ b/connectors/camel-https-kafka-connector/src/main/docs/camel-https-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.https.CamelHttpsSinkConnector
 ----
 
 
-The camel-https sink connector supports 76 options, which are listed below.
+The camel-https sink connector supports 88 options, which are listed below.
 
 
 
@@ -37,7 +37,7 @@ The camel-https sink connector supports 76 options, which are listed below.
 | *camel.sink.endpoint.httpBinding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | null | false | MEDIUM
 | *camel.sink.endpoint.bridgeEndpoint* | If the option is true, HttpProducer will ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back. | false | false | MEDIUM
 | *camel.sink.endpoint.chunked* | If this option is false the Servlet will disable the HTTP streaming and set the content-length header on the response | true | false | MEDIUM
-| *camel.sink.endpoint.clearExpiredCookies* | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. | true | false | MEDIUM
+| *camel.sink.endpoint.clearExpiredCookies* | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too. | true | false | MEDIUM
 | *camel.sink.endpoint.connectionClose* | Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false. | false | false | MEDIUM
 | *camel.sink.endpoint.copyHeaders* | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers). | true | false | MEDIUM
 | *camel.sink.endpoint.customHostHeader* | To use custom host header for producer. When not set in query will be ignored. When set will override host header derived from url. | null | false | MEDIUM
@@ -52,6 +52,8 @@ The camel-https sink connector supports 76 options, which are listed below.
 | *camel.sink.endpoint.deleteWithBody* | Whether the HTTP DELETE should include the message body or not. By default HTTP DELETE do not include any HTTP body. However in some rare cases users may need to be able to include the message body. | false | false | MEDIUM
 | *camel.sink.endpoint.getWithBody* | Whether the HTTP GET should include the message body or not. By default HTTP GET do not include any HTTP body. However in some rare cases users may need to be able to include the message body. | false | false | MEDIUM
 | *camel.sink.endpoint.okStatusCodeRange* | The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included. | "200-299" | false | MEDIUM
+| *camel.sink.endpoint.skipRequestHeaders* | Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
+| *camel.sink.endpoint.skipResponseHeaders* | Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
 | *camel.sink.endpoint.clientBuilder* | Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint. | null | false | MEDIUM
 | *camel.sink.endpoint.clientConnectionManager* | To use a custom HttpClientConnectionManager to manage connections | null | false | MEDIUM
 | *camel.sink.endpoint.connectionsPerRoute* | The maximum number of connections per route. | 20 | false | MEDIUM
@@ -81,18 +83,28 @@ The camel-https sink connector supports 76 options, which are listed below.
 | *camel.sink.endpoint.sslContextParameters* | To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need. | null | false | MEDIUM
 | *camel.sink.endpoint.x509HostnameVerifier* | To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier | null | false | MEDIUM
 | *camel.component.https.cookieStore* | To use a custom org.apache.http.client.CookieStore. By default the org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to be a noop cookie store as cookie shouldn't be stored as we are just bridging (eg acting as a proxy). | null | false | MEDIUM
+| *camel.component.https.copyHeaders* | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers). | true | false | MEDIUM
 | *camel.component.https.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.https.responsePayloadStreaming Threshold* | This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode. | 8192 | false | MEDIUM
+| *camel.component.https.skipRequestHeaders* | Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
+| *camel.component.https.skipResponseHeaders* | Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
 | *camel.component.https.allowJavaSerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
+| *camel.component.https.authCachingDisabled* | Disables authentication scheme caching | false | false | MEDIUM
+| *camel.component.https.automaticRetriesDisabled* | Disables automatic request recovery and re-execution | false | false | MEDIUM
 | *camel.component.https.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.https.clientConnectionManager* | To use a custom and shared HttpClientConnectionManager to manage connections. If this has been configured then this is always used for all endpoints created by this component. | null | false | MEDIUM
 | *camel.component.https.connectionsPerRoute* | The maximum number of connections per route. | 20 | false | MEDIUM
+| *camel.component.https.connectionStateDisabled* | Disables connection state tracking | false | false | MEDIUM
 | *camel.component.https.connectionTimeToLive* | The time for connection to live, the time unit is millisecond, the default value is always keep alive. | null | false | MEDIUM
+| *camel.component.https.contentCompressionDisabled* | Disables automatic content decompression | false | false | MEDIUM
+| *camel.component.https.cookieManagementDisabled* | Disables state (cookie) management | false | false | MEDIUM
+| *camel.component.https.defaultUserAgentDisabled* | Disables the default user agent set by this builder if none has been provided by the user | false | false | MEDIUM
 | *camel.component.https.httpBinding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | null | false | MEDIUM
 | *camel.component.https.httpClientConfigurer* | To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used. | null | false | MEDIUM
 | *camel.component.https.httpConfiguration* | To use the shared HttpConfiguration as base configuration. | null | false | MEDIUM
 | *camel.component.https.httpContext* | To use a custom org.apache.http.protocol.HttpContext when executing requests. | null | false | MEDIUM
 | *camel.component.https.maxTotalConnections* | The maximum number of connections. | 200 | false | MEDIUM
+| *camel.component.https.redirectHandlingDisabled* | Disables automatic redirect handling | false | false | MEDIUM
 | *camel.component.https.headerFilterStrategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | null | false | MEDIUM
 | *camel.component.https.proxyAuthDomain* | Proxy authentication domain to use | null | false | MEDIUM
 | *camel.component.https.proxyAuthHost* | Proxy authentication host | null | false | MEDIUM
diff --git a/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkConnectorConfig.java b/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkConnectorConfig.java
index 1a3c5f7..7ef7e93 100644
--- a/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkConnectorConfig.java
+++ b/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkConnectorConfig.java
@@ -43,7 +43,7 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_CHUNKED_DOC = "If this option is false the Servlet will disable the HTTP streaming and set the content-length header on the response";
     public static final Boolean CAMEL_SINK_HTTPS_ENDPOINT_CHUNKED_DEFAULT = true;
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_CLEAR_EXPIRED_COOKIES_CONF = "camel.sink.endpoint.clearExpiredCookies";
-    public static final String CAMEL_SINK_HTTPS_ENDPOINT_CLEAR_EXPIRED_COOKIES_DOC = "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired.";
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_CLEAR_EXPIRED_COOKIES_DOC = "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too.";
     public static final Boolean CAMEL_SINK_HTTPS_ENDPOINT_CLEAR_EXPIRED_COOKIES_DEFAULT = true;
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_CONNECTION_CLOSE_CONF = "camel.sink.endpoint.connectionClose";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_CONNECTION_CLOSE_DOC = "Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false.";
@@ -87,6 +87,12 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_OK_STATUS_CODE_RANGE_CONF = "camel.sink.endpoint.okStatusCodeRange";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_OK_STATUS_CODE_RANGE_DOC = "The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included.";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_OK_STATUS_CODE_RANGE_DEFAULT = "200-299";
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_SKIP_REQUEST_HEADERS_CONF = "camel.sink.endpoint.skipRequestHeaders";
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_SKIP_REQUEST_HEADERS_DOC = "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_HTTPS_ENDPOINT_SKIP_REQUEST_HEADERS_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_SKIP_RESPONSE_HEADERS_CONF = "camel.sink.endpoint.skipResponseHeaders";
+    public static final String CAMEL_SINK_HTTPS_ENDPOINT_SKIP_RESPONSE_HEADERS_DOC = "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_HTTPS_ENDPOINT_SKIP_RESPONSE_HEADERS_DEFAULT = false;
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_CLIENT_BUILDER_CONF = "camel.sink.endpoint.clientBuilder";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_CLIENT_BUILDER_DOC = "Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint.";
     public static final String CAMEL_SINK_HTTPS_ENDPOINT_CLIENT_BUILDER_DEFAULT = null;
@@ -174,15 +180,30 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTPS_COMPONENT_COOKIE_STORE_CONF = "camel.component.https.cookieStore";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_COOKIE_STORE_DOC = "To use a custom org.apache.http.client.CookieStore. By default the org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to be a noop cookie store as cookie shouldn't be stored as we are just bridging (eg acting as a proxy).";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_COOKIE_STORE_DEFAULT = null;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_COPY_HEADERS_CONF = "camel.component.https.copyHeaders";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_COPY_HEADERS_DOC = "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers).";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_COPY_HEADERS_DEFAULT = true;
     public static final String CAMEL_SINK_HTTPS_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.https.lazyStartProducer";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that whe [...]
     public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
     public static final String CAMEL_SINK_HTTPS_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_CONF = "camel.component.https.responsePayloadStreamingThreshold";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DOC = "This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode.";
     public static final Integer CAMEL_SINK_HTTPS_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DEFAULT = 8192;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_SKIP_REQUEST_HEADERS_CONF = "camel.component.https.skipRequestHeaders";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_SKIP_REQUEST_HEADERS_DOC = "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_SKIP_REQUEST_HEADERS_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_SKIP_RESPONSE_HEADERS_CONF = "camel.component.https.skipResponseHeaders";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_SKIP_RESPONSE_HEADERS_DOC = "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_SKIP_RESPONSE_HEADERS_DEFAULT = false;
     public static final String CAMEL_SINK_HTTPS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.https.allowJavaSerializedObject";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_AUTH_CACHING_DISABLED_CONF = "camel.component.https.authCachingDisabled";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_AUTH_CACHING_DISABLED_DOC = "Disables authentication scheme caching";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_AUTH_CACHING_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_AUTOMATIC_RETRIES_DISABLED_CONF = "camel.component.https.automaticRetriesDisabled";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DOC = "Disables automatic request recovery and re-execution";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_HTTPS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.https.autowiredEnabled";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
     public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -192,9 +213,21 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTPS_COMPONENT_CONNECTIONS_PER_ROUTE_CONF = "camel.component.https.connectionsPerRoute";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_CONNECTIONS_PER_ROUTE_DOC = "The maximum number of connections per route.";
     public static final Integer CAMEL_SINK_HTTPS_COMPONENT_CONNECTIONS_PER_ROUTE_DEFAULT = 20;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_STATE_DISABLED_CONF = "camel.component.https.connectionStateDisabled";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_STATE_DISABLED_DOC = "Disables connection state tracking";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_STATE_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_TIME_TO_LIVE_CONF = "camel.component.https.connectionTimeToLive";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_TIME_TO_LIVE_DOC = "The time for connection to live, the time unit is millisecond, the default value is always keep alive.";
     public static final Long CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_TIME_TO_LIVE_DEFAULT = null;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_CONTENT_COMPRESSION_DISABLED_CONF = "camel.component.https.contentCompressionDisabled";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_CONTENT_COMPRESSION_DISABLED_DOC = "Disables automatic content decompression";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_CONTENT_COMPRESSION_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_COOKIE_MANAGEMENT_DISABLED_CONF = "camel.component.https.cookieManagementDisabled";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DOC = "Disables state (cookie) management";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_DEFAULT_USER_AGENT_DISABLED_CONF = "camel.component.https.defaultUserAgentDisabled";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DOC = "Disables the default user agent set by this builder if none has been provided by the user";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_HTTPS_COMPONENT_HTTP_BINDING_CONF = "camel.component.https.httpBinding";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_HTTP_BINDING_DOC = "To use a custom HttpBinding to control the mapping between Camel message and HttpClient.";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_HTTP_BINDING_DEFAULT = null;
@@ -210,6 +243,9 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_HTTPS_COMPONENT_MAX_TOTAL_CONNECTIONS_CONF = "camel.component.https.maxTotalConnections";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_MAX_TOTAL_CONNECTIONS_DOC = "The maximum number of connections.";
     public static final Integer CAMEL_SINK_HTTPS_COMPONENT_MAX_TOTAL_CONNECTIONS_DEFAULT = 200;
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_REDIRECT_HANDLING_DISABLED_CONF = "camel.component.https.redirectHandlingDisabled";
+    public static final String CAMEL_SINK_HTTPS_COMPONENT_REDIRECT_HANDLING_DISABLED_DOC = "Disables automatic redirect handling";
+    public static final Boolean CAMEL_SINK_HTTPS_COMPONENT_REDIRECT_HANDLING_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_HTTPS_COMPONENT_HEADER_FILTER_STRATEGY_CONF = "camel.component.https.headerFilterStrategy";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_HEADER_FILTER_STRATEGY_DOC = "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.";
     public static final String CAMEL_SINK_HTTPS_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT = null;
@@ -286,6 +322,8 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_DELETE_WITH_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_DELETE_WITH_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_DELETE_WITH_BODY_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_GET_WITH_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_GET_WITH_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_GET_WITH_BODY_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_OK_STATUS_CODE_RANGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_OK_STATUS_CODE_RANGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_OK_STATUS_CODE_RANGE_DOC);
+        conf.define(CAMEL_SINK_HTTPS_ENDPOINT_SKIP_REQUEST_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_SKIP_REQUEST_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_SKIP_REQUEST_HEADERS_DOC);
+        conf.define(CAMEL_SINK_HTTPS_ENDPOINT_SKIP_RESPONSE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_ENDPOINT_SKIP_RESPONSE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_SKIP_RESPONSE_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_CLIENT_BUILDER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_CLIENT_BUILDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_CLIENT_BUILDER_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_CLIENT_CONNECTION_MANAGER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_CLIENT_CONNECTION_MANAGER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_CLIENT_CONNECTION_MANAGER_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_CONNECTIONS_PER_ROUTE_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTPS_ENDPOINT_CONNECTIONS_PER_ROUTE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_CONNECTIONS_PER_ROUTE_DOC);
@@ -315,18 +353,28 @@ public class CamelHttpsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_SSL_CONTEXT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_HTTPS_ENDPOINT_X509HOSTNAME_VERIFIER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_ENDPOINT_X509HOSTNAME_VERIFIER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_ENDPOINT_X509HOSTNAME_VERIFIER_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_COOKIE_STORE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_COOKIE_STORE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_COOKIE_STORE_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_COPY_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_COPY_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_COPY_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTPS_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_SKIP_REQUEST_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_SKIP_REQUEST_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_SKIP_REQUEST_HEADERS_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_SKIP_RESPONSE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_SKIP_RESPONSE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_SKIP_RESPONSE_HEADERS_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_AUTH_CACHING_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_AUTH_CACHING_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_AUTH_CACHING_DISABLED_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_AUTOMATIC_RETRIES_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_CLIENT_CONNECTION_MANAGER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_CLIENT_CONNECTION_MANAGER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_CLIENT_CONNECTION_MANAGER_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_CONNECTIONS_PER_ROUTE_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTPS_COMPONENT_CONNECTIONS_PER_ROUTE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_CONNECTIONS_PER_ROUTE_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_STATE_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_STATE_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_STATE_DISABLED_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_TIME_TO_LIVE_CONF, ConfigDef.Type.LONG, CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_TIME_TO_LIVE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_CONNECTION_TIME_TO_LIVE_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_CONTENT_COMPRESSION_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_CONTENT_COMPRESSION_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_CONTENT_COMPRESSION_DISABLED_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_COOKIE_MANAGEMENT_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_DEFAULT_USER_AGENT_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_HTTP_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_HTTP_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_HTTP_BINDING_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_HTTP_CLIENT_CONFIGURER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_HTTP_CLIENT_CONFIGURER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_HTTP_CLIENT_CONFIGURER_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_HTTP_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_HTTP_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_HTTP_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_HTTP_CONTEXT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_HTTP_CONTEXT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_HTTP_CONTEXT_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_MAX_TOTAL_CONNECTIONS_CONF, ConfigDef.Type.INT, CAMEL_SINK_HTTPS_COMPONENT_MAX_TOTAL_CONNECTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_MAX_TOTAL_CONNECTIONS_DOC);
+        conf.define(CAMEL_SINK_HTTPS_COMPONENT_REDIRECT_HANDLING_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HTTPS_COMPONENT_REDIRECT_HANDLING_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_REDIRECT_HANDLING_DISABLED_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_HEADER_FILTER_STRATEGY_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_PROXY_AUTH_DOMAIN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_PROXY_AUTH_DOMAIN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_PROXY_AUTH_DOMAIN_DOC);
         conf.define(CAMEL_SINK_HTTPS_COMPONENT_PROXY_AUTH_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HTTPS_COMPONENT_PROXY_AUTH_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HTTPS_COMPONENT_PROXY_AUTH_HOST_DOC);
diff --git a/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-sink.json b/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-sink.json
index 3a6b57f..86ec319 100644
--- a/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-sink.json
+++ b/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-sink.json
@@ -58,7 +58,7 @@
 		},
 		"camel.sink.endpoint.clearExpiredCookies": {
 			"name": "camel.sink.endpoint.clearExpiredCookies",
-			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired.",
+			"description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -154,6 +154,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.skipRequestHeaders": {
+			"name": "camel.sink.endpoint.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.skipResponseHeaders": {
+			"name": "camel.sink.endpoint.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.headerFilterStrategy": {
 			"name": "camel.sink.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -197,6 +211,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.copyHeaders": {
+			"name": "camel.component.resteasy.copyHeaders",
+			"description": "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers).",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.lazyStartProducer": {
 			"name": "camel.component.resteasy.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 [...]
@@ -211,6 +232,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.skipRequestHeaders": {
+			"name": "camel.component.resteasy.skipRequestHeaders",
+			"description": "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.skipResponseHeaders": {
+			"name": "camel.component.resteasy.skipResponseHeaders",
+			"description": "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.allowJavaSerializedObject": {
 			"name": "camel.component.resteasy.allowJavaSerializedObject",
 			"description": "Whether to allow java serialization when a request uses context-type=application\/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.",
@@ -218,6 +253,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.authCachingDisabled": {
+			"name": "camel.component.resteasy.authCachingDisabled",
+			"description": "Disables authentication scheme caching",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.automaticRetriesDisabled": {
+			"name": "camel.component.resteasy.automaticRetriesDisabled",
+			"description": "Disables automatic request recovery and re-execution",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.autowiredEnabled": {
 			"name": "camel.component.resteasy.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
@@ -225,6 +274,41 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.connectionStateDisabled": {
+			"name": "camel.component.resteasy.connectionStateDisabled",
+			"description": "Disables connection state tracking",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.contentCompressionDisabled": {
+			"name": "camel.component.resteasy.contentCompressionDisabled",
+			"description": "Disables automatic content decompression",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.cookieManagementDisabled": {
+			"name": "camel.component.resteasy.cookieManagementDisabled",
+			"description": "Disables state (cookie) management",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.defaultUserAgentDisabled": {
+			"name": "camel.component.resteasy.defaultUserAgentDisabled",
+			"description": "Disables the default user agent set by this builder if none has been provided by the user",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.redirectHandlingDisabled": {
+			"name": "camel.component.resteasy.redirectHandlingDisabled",
+			"description": "Disables automatic redirect handling",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.headerFilterStrategy": {
 			"name": "camel.component.resteasy.headerFilterStrategy",
 			"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.",
diff --git a/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-source.json b/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-source.json
index 264c925..a7d40dc 100644
--- a/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-source.json
+++ b/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-source.json
@@ -211,6 +211,20 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.authCachingDisabled": {
+			"name": "camel.component.resteasy.authCachingDisabled",
+			"description": "Disables authentication scheme caching",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.automaticRetriesDisabled": {
+			"name": "camel.component.resteasy.automaticRetriesDisabled",
+			"description": "Disables automatic request recovery and re-execution",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.autowiredEnabled": {
 			"name": "camel.component.resteasy.autowiredEnabled",
 			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
@@ -218,6 +232,41 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.resteasy.connectionStateDisabled": {
+			"name": "camel.component.resteasy.connectionStateDisabled",
+			"description": "Disables connection state tracking",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.contentCompressionDisabled": {
+			"name": "camel.component.resteasy.contentCompressionDisabled",
+			"description": "Disables automatic content decompression",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.cookieManagementDisabled": {
+			"name": "camel.component.resteasy.cookieManagementDisabled",
+			"description": "Disables state (cookie) management",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.defaultUserAgentDisabled": {
+			"name": "camel.component.resteasy.defaultUserAgentDisabled",
+			"description": "Disables the default user agent set by this builder if none has been provided by the user",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.resteasy.redirectHandlingDisabled": {
+			"name": "camel.component.resteasy.redirectHandlingDisabled",
+			"description": "Disables automatic redirect handling",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.resteasy.headerFilterStrategy": {
 			"name": "camel.component.resteasy.headerFilterStrategy",
 			"description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.",
diff --git a/connectors/camel-resteasy-kafka-connector/src/main/docs/camel-resteasy-kafka-sink-connector.adoc b/connectors/camel-resteasy-kafka-connector/src/main/docs/camel-resteasy-kafka-sink-connector.adoc
index fb827a3..47ca60f 100644
--- a/connectors/camel-resteasy-kafka-connector/src/main/docs/camel-resteasy-kafka-sink-connector.adoc
+++ b/connectors/camel-resteasy-kafka-connector/src/main/docs/camel-resteasy-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.resteasy.CamelResteasySinkConnec
 ----
 
 
-The camel-resteasy sink connector supports 32 options, which are listed below.
+The camel-resteasy sink connector supports 44 options, which are listed below.
 
 
 
@@ -38,7 +38,7 @@ The camel-resteasy sink connector supports 32 options, which are listed below.
 | *camel.sink.endpoint.servletName* | Sets the servlet name | null | false | MEDIUM
 | *camel.sink.endpoint.transferException* | If enabled and an Exchange failed processing on the consumer side, and if the caused Exception was send back serialized in the response as a application/x-java-serialized-object content type. On the producer side the exception will be deserialized and thrown as is, instead of the HttpOperationFailedException. The caused exception is required to be serialized. This is by default turned off. If you enable this then be aware that Java will deseria [...]
 | *camel.sink.endpoint.bridgeEndpoint* | If the option is true, HttpProducer will ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back. | false | false | MEDIUM
-| *camel.sink.endpoint.clearExpiredCookies* | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. | true | false | MEDIUM
+| *camel.sink.endpoint.clearExpiredCookies* | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too. | true | false | MEDIUM
 | *camel.sink.endpoint.connectionClose* | Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false. | false | false | MEDIUM
 | *camel.sink.endpoint.copyHeaders* | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers). | true | false | MEDIUM
 | *camel.sink.endpoint.customHostHeader* | To use custom host header for producer. When not set in query will be ignored. When set will override host header derived from url. | null | false | MEDIUM
@@ -51,6 +51,8 @@ The camel-resteasy sink connector supports 32 options, which are listed below.
 | *camel.sink.endpoint.deleteWithBody* | Whether the HTTP DELETE should include the message body or not. By default HTTP DELETE do not include any HTTP body. However in some rare cases users may need to be able to include the message body. | false | false | MEDIUM
 | *camel.sink.endpoint.getWithBody* | Whether the HTTP GET should include the message body or not. By default HTTP GET do not include any HTTP body. However in some rare cases users may need to be able to include the message body. | false | false | MEDIUM
 | *camel.sink.endpoint.okStatusCodeRange* | The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included. | "200-299" | false | MEDIUM
+| *camel.sink.endpoint.skipRequestHeaders* | Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
+| *camel.sink.endpoint.skipResponseHeaders* | Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
 | *camel.sink.endpoint.headerFilterStrategy* | To use a custom HeaderFilterStrategy to filter header to and from Camel message. | null | false | MEDIUM
 | *camel.sink.endpoint.setHttpResponseDuring Processing* | Sets the flag to use the endpoint where you can either populate camel exchange from servlet response or use request itself which may be thought as if it is a proxy. | null | false | MEDIUM
 | *camel.sink.endpoint.skipServletProcessing* | Sets the flag to use skip servlet processing and let camel take over processing | null | false | MEDIUM
@@ -58,10 +60,20 @@ The camel-resteasy sink connector supports 32 options, which are listed below.
 | *camel.sink.endpoint.proxyClientClass* | Sets the resteasy proxyClientClass | null | false | MEDIUM
 | *camel.sink.endpoint.password* | Sets the password | null | false | MEDIUM
 | *camel.sink.endpoint.username* | Sets the username | null | false | MEDIUM
+| *camel.component.resteasy.copyHeaders* | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers). | true | false | MEDIUM
 | *camel.component.resteasy.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.resteasy.responsePayloadStreaming Threshold* | This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode. | 8192 | false | MEDIUM
+| *camel.component.resteasy.skipRequestHeaders* | Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
+| *camel.component.resteasy.skipResponseHeaders* | Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
 | *camel.component.resteasy.allowJavaSerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
+| *camel.component.resteasy.authCachingDisabled* | Disables authentication scheme caching | false | false | MEDIUM
+| *camel.component.resteasy.automaticRetriesDisabled* | Disables automatic request recovery and re-execution | false | false | MEDIUM
 | *camel.component.resteasy.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
+| *camel.component.resteasy.connectionStateDisabled* | Disables connection state tracking | false | false | MEDIUM
+| *camel.component.resteasy.contentCompression Disabled* | Disables automatic content decompression | false | false | MEDIUM
+| *camel.component.resteasy.cookieManagementDisabled* | Disables state (cookie) management | false | false | MEDIUM
+| *camel.component.resteasy.defaultUserAgentDisabled* | Disables the default user agent set by this builder if none has been provided by the user | false | false | MEDIUM
+| *camel.component.resteasy.redirectHandlingDisabled* | Disables automatic redirect handling | false | false | MEDIUM
 | *camel.component.resteasy.headerFilterStrategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | null | false | MEDIUM
 |===
 
diff --git a/connectors/camel-resteasy-kafka-connector/src/main/docs/camel-resteasy-kafka-source-connector.adoc b/connectors/camel-resteasy-kafka-connector/src/main/docs/camel-resteasy-kafka-source-connector.adoc
index b66efe8..5e30a30 100644
--- a/connectors/camel-resteasy-kafka-connector/src/main/docs/camel-resteasy-kafka-source-connector.adoc
+++ b/connectors/camel-resteasy-kafka-connector/src/main/docs/camel-resteasy-kafka-source-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.resteasy.CamelResteasySourceConn
 ----
 
 
-The camel-resteasy source connector supports 32 options, which are listed below.
+The camel-resteasy source connector supports 39 options, which are listed below.
 
 
 
@@ -61,7 +61,14 @@ The camel-resteasy source connector supports 32 options, which are listed below.
 | *camel.component.resteasy.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.resteasy.proxyConsumersClasses* | Proxy classes for consumer endpoints. Multiple classes can be separated by comma. | null | false | MEDIUM
 | *camel.component.resteasy.allowJavaSerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
+| *camel.component.resteasy.authCachingDisabled* | Disables authentication scheme caching | false | false | MEDIUM
+| *camel.component.resteasy.automaticRetriesDisabled* | Disables automatic request recovery and re-execution | false | false | MEDIUM
 | *camel.component.resteasy.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
+| *camel.component.resteasy.connectionStateDisabled* | Disables connection state tracking | false | false | MEDIUM
+| *camel.component.resteasy.contentCompression Disabled* | Disables automatic content decompression | false | false | MEDIUM
+| *camel.component.resteasy.cookieManagementDisabled* | Disables state (cookie) management | false | false | MEDIUM
+| *camel.component.resteasy.defaultUserAgentDisabled* | Disables the default user agent set by this builder if none has been provided by the user | false | false | MEDIUM
+| *camel.component.resteasy.redirectHandlingDisabled* | Disables automatic redirect handling | false | false | MEDIUM
 | *camel.component.resteasy.headerFilterStrategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | null | false | MEDIUM
 |===
 
diff --git a/connectors/camel-resteasy-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/resteasy/CamelResteasySinkConnectorConfig.java b/connectors/camel-resteasy-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/resteasy/CamelResteasySinkConnectorConfig.java
index 6fa121e..a6c2536 100644
--- a/connectors/camel-resteasy-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/resteasy/CamelResteasySinkConnectorConfig.java
+++ b/connectors/camel-resteasy-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/resteasy/CamelResteasySinkConnectorConfig.java
@@ -48,7 +48,7 @@ public class CamelResteasySinkConnectorConfig
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_BRIDGE_ENDPOINT_DOC = "If the option is true, HttpProducer will ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back.";
     public static final Boolean CAMEL_SINK_RESTEASY_ENDPOINT_BRIDGE_ENDPOINT_DEFAULT = false;
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_CLEAR_EXPIRED_COOKIES_CONF = "camel.sink.endpoint.clearExpiredCookies";
-    public static final String CAMEL_SINK_RESTEASY_ENDPOINT_CLEAR_EXPIRED_COOKIES_DOC = "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired.";
+    public static final String CAMEL_SINK_RESTEASY_ENDPOINT_CLEAR_EXPIRED_COOKIES_DOC = "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too.";
     public static final Boolean CAMEL_SINK_RESTEASY_ENDPOINT_CLEAR_EXPIRED_COOKIES_DEFAULT = true;
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_CONNECTION_CLOSE_CONF = "camel.sink.endpoint.connectionClose";
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_CONNECTION_CLOSE_DOC = "Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false.";
@@ -86,6 +86,12 @@ public class CamelResteasySinkConnectorConfig
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_OK_STATUS_CODE_RANGE_CONF = "camel.sink.endpoint.okStatusCodeRange";
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_OK_STATUS_CODE_RANGE_DOC = "The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included.";
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_OK_STATUS_CODE_RANGE_DEFAULT = "200-299";
+    public static final String CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_REQUEST_HEADERS_CONF = "camel.sink.endpoint.skipRequestHeaders";
+    public static final String CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_REQUEST_HEADERS_DOC = "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_REQUEST_HEADERS_DEFAULT = false;
+    public static final String CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_RESPONSE_HEADERS_CONF = "camel.sink.endpoint.skipResponseHeaders";
+    public static final String CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_RESPONSE_HEADERS_DOC = "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_RESPONSE_HEADERS_DEFAULT = false;
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_CONF = "camel.sink.endpoint.headerFilterStrategy";
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_DOC = "To use a custom HeaderFilterStrategy to filter header to and from Camel message.";
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_DEFAULT = null;
@@ -107,18 +113,48 @@ public class CamelResteasySinkConnectorConfig
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_USERNAME_CONF = "camel.sink.endpoint.username";
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_USERNAME_DOC = "Sets the username";
     public static final String CAMEL_SINK_RESTEASY_ENDPOINT_USERNAME_DEFAULT = null;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_COPY_HEADERS_CONF = "camel.component.resteasy.copyHeaders";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_COPY_HEADERS_DOC = "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers).";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_COPY_HEADERS_DEFAULT = true;
     public static final String CAMEL_SINK_RESTEASY_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.resteasy.lazyStartProducer";
     public static final String CAMEL_SINK_RESTEASY_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_RESTEASY_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
     public static final String CAMEL_SINK_RESTEASY_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_CONF = "camel.component.resteasy.responsePayloadStreamingThreshold";
     public static final String CAMEL_SINK_RESTEASY_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DOC = "This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode.";
     public static final Integer CAMEL_SINK_RESTEASY_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DEFAULT = 8192;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_SKIP_REQUEST_HEADERS_CONF = "camel.component.resteasy.skipRequestHeaders";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_SKIP_REQUEST_HEADERS_DOC = "Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_SKIP_REQUEST_HEADERS_DEFAULT = false;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_SKIP_RESPONSE_HEADERS_CONF = "camel.component.resteasy.skipResponseHeaders";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_SKIP_RESPONSE_HEADERS_DOC = "Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector.";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_SKIP_RESPONSE_HEADERS_DEFAULT = false;
     public static final String CAMEL_SINK_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.resteasy.allowJavaSerializedObject";
     public static final String CAMEL_SINK_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_CONF = "camel.component.resteasy.authCachingDisabled";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_DOC = "Disables authentication scheme caching";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_CONF = "camel.component.resteasy.automaticRetriesDisabled";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DOC = "Disables automatic request recovery and re-execution";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.resteasy.autowiredEnabled";
     public static final String CAMEL_SINK_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
     public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_CONF = "camel.component.resteasy.connectionStateDisabled";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_DOC = "Disables connection state tracking";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_CONF = "camel.component.resteasy.contentCompressionDisabled";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_DOC = "Disables automatic content decompression";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_CONF = "camel.component.resteasy.cookieManagementDisabled";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DOC = "Disables state (cookie) management";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_CONF = "camel.component.resteasy.defaultUserAgentDisabled";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DOC = "Disables the default user agent set by this builder if none has been provided by the user";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_CONF = "camel.component.resteasy.redirectHandlingDisabled";
+    public static final String CAMEL_SINK_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_DOC = "Disables automatic redirect handling";
+    public static final Boolean CAMEL_SINK_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_DEFAULT = false;
     public static final String CAMEL_SINK_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_CONF = "camel.component.resteasy.headerFilterStrategy";
     public static final String CAMEL_SINK_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_DOC = "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.";
     public static final String CAMEL_SINK_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT = null;
@@ -155,6 +191,8 @@ public class CamelResteasySinkConnectorConfig
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_DELETE_WITH_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_ENDPOINT_DELETE_WITH_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_DELETE_WITH_BODY_DOC);
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_GET_WITH_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_ENDPOINT_GET_WITH_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_GET_WITH_BODY_DOC);
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_OK_STATUS_CODE_RANGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_RESTEASY_ENDPOINT_OK_STATUS_CODE_RANGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_OK_STATUS_CODE_RANGE_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_REQUEST_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_REQUEST_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_REQUEST_HEADERS_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_RESPONSE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_RESPONSE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_RESPONSE_HEADERS_DOC);
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_HEADER_FILTER_STRATEGY_DOC);
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_SET_HTTP_RESPONSE_DURING_PROCESSING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_RESTEASY_ENDPOINT_SET_HTTP_RESPONSE_DURING_PROCESSING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_SET_HTTP_RESPONSE_DURING_PROCESSING_DOC);
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_SERVLET_PROCESSING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_SERVLET_PROCESSING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_SKIP_SERVLET_PROCESSING_DOC);
@@ -162,10 +200,20 @@ public class CamelResteasySinkConnectorConfig
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_PROXY_CLIENT_CLASS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_RESTEASY_ENDPOINT_PROXY_CLIENT_CLASS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_PROXY_CLIENT_CLASS_DOC);
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_PASSWORD_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_RESTEASY_ENDPOINT_PASSWORD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_PASSWORD_DOC);
         conf.define(CAMEL_SINK_RESTEASY_ENDPOINT_USERNAME_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_RESTEASY_ENDPOINT_USERNAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_ENDPOINT_USERNAME_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_COPY_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_COPY_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_COPY_HEADERS_DOC);
         conf.define(CAMEL_SINK_RESTEASY_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_RESTEASY_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SINK_RESTEASY_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_RESPONSE_PAYLOAD_STREAMING_THRESHOLD_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_SKIP_REQUEST_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_SKIP_REQUEST_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_SKIP_REQUEST_HEADERS_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_SKIP_RESPONSE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_SKIP_RESPONSE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_SKIP_RESPONSE_HEADERS_DOC);
         conf.define(CAMEL_SINK_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DOC);
         conf.define(CAMEL_SINK_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DOC);
+        conf.define(CAMEL_SINK_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_DOC);
         conf.define(CAMEL_SINK_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_DOC);
         return conf;
     }
diff --git a/connectors/camel-resteasy-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/resteasy/CamelResteasySourceConnectorConfig.java b/connectors/camel-resteasy-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/resteasy/CamelResteasySourceConnectorConfig.java
index 43889dc..a4a15f8 100644
--- a/connectors/camel-resteasy-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/resteasy/CamelResteasySourceConnectorConfig.java
+++ b/connectors/camel-resteasy-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/resteasy/CamelResteasySourceConnectorConfig.java
@@ -116,9 +116,30 @@ public class CamelResteasySourceConnectorConfig
     public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.resteasy.allowJavaSerializedObject";
     public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SOURCE_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_CONF = "camel.component.resteasy.authCachingDisabled";
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_DOC = "Disables authentication scheme caching";
+    public static final Boolean CAMEL_SOURCE_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_CONF = "camel.component.resteasy.automaticRetriesDisabled";
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DOC = "Disables automatic request recovery and re-execution";
+    public static final Boolean CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DEFAULT = false;
     public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.resteasy.autowiredEnabled";
     public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
     public static final Boolean CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_CONF = "camel.component.resteasy.connectionStateDisabled";
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_DOC = "Disables connection state tracking";
+    public static final Boolean CAMEL_SOURCE_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_CONF = "camel.component.resteasy.contentCompressionDisabled";
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_DOC = "Disables automatic content decompression";
+    public static final Boolean CAMEL_SOURCE_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_CONF = "camel.component.resteasy.cookieManagementDisabled";
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DOC = "Disables state (cookie) management";
+    public static final Boolean CAMEL_SOURCE_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_CONF = "camel.component.resteasy.defaultUserAgentDisabled";
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DOC = "Disables the default user agent set by this builder if none has been provided by the user";
+    public static final Boolean CAMEL_SOURCE_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DEFAULT = false;
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_CONF = "camel.component.resteasy.redirectHandlingDisabled";
+    public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_DOC = "Disables automatic redirect handling";
+    public static final Boolean CAMEL_SOURCE_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_DEFAULT = false;
     public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_CONF = "camel.component.resteasy.headerFilterStrategy";
     public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_DOC = "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.";
     public static final String CAMEL_SOURCE_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT = null;
@@ -165,7 +186,14 @@ public class CamelResteasySourceConnectorConfig
         conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_PROXY_CONSUMERS_CLASSES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_RESTEASY_COMPONENT_PROXY_CONSUMERS_CLASSES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_PROXY_CONSUMERS_CLASSES_DOC);
         conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
+        conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_AUTH_CACHING_DISABLED_DOC);
+        conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOMATIC_RETRIES_DISABLED_DOC);
         conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_AUTOWIRED_ENABLED_DOC);
+        conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_CONNECTION_STATE_DISABLED_DOC);
+        conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_CONTENT_COMPRESSION_DISABLED_DOC);
+        conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_COOKIE_MANAGEMENT_DISABLED_DOC);
+        conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_DEFAULT_USER_AGENT_DISABLED_DOC);
+        conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_REDIRECT_HANDLING_DISABLED_DOC);
         conf.define(CAMEL_SOURCE_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_RESTEASY_COMPONENT_HEADER_FILTER_STRATEGY_DOC);
         return conf;
     }
diff --git a/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-sink.json b/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-sink.json
index c1a9e38..7f21500 100644
--- a/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-sink.json
+++ b/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-sink.json
@@ -15,6 +15,12 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.sink.endpoint.token": {
+			"name": "camel.sink.endpoint.token",
+			"description": "The token to use",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.iconEmoji": {
 			"name": "camel.sink.endpoint.iconEmoji",
 			"description": "Use a Slack emoji as an avatar",
@@ -60,6 +66,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.slack.token": {
+			"name": "camel.component.slack.token",
+			"description": "The token to use",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.slack.webhookUrl": {
 			"name": "camel.component.slack.webhookUrl",
 			"description": "The incoming webhook URL",
diff --git a/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-source.json b/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-source.json
index 4edf1c0..592bcec 100644
--- a/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-source.json
+++ b/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-source.json
@@ -15,6 +15,12 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.source.endpoint.token": {
+			"name": "camel.source.endpoint.token",
+			"description": "The token to use",
+			"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.",
@@ -22,6 +28,19 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.conversationType": {
+			"name": "camel.source.endpoint.conversationType",
+			"description": "Type of conversation One of: [PUBLIC_CHANNEL] [PRIVATE_CHANNEL] [MPIM] [IM]",
+			"defaultValue": "\"PUBLIC_CHANNEL\"",
+			"priority": "MEDIUM",
+			"required": "false",
+			"enum": [
+				"PUBLIC_CHANNEL",
+				"PRIVATE_CHANNEL",
+				"MPIM",
+				"IM"
+			]
+		},
 		"camel.source.endpoint.maxResults": {
 			"name": "camel.source.endpoint.maxResults",
 			"description": "The Max Result for the poll",
@@ -29,6 +48,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.naturalOrder": {
+			"name": "camel.source.endpoint.naturalOrder",
+			"description": "Create exchanges in natural order (oldest to newest) or not",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.sendEmptyMessageWhenIdle": {
 			"name": "camel.source.endpoint.sendEmptyMessageWhenIdle",
 			"description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.",
@@ -43,12 +69,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.token": {
-			"name": "camel.source.endpoint.token",
-			"description": "The token to use",
-			"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.",
@@ -196,6 +216,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.slack.token": {
+			"name": "camel.component.slack.token",
+			"description": "The token to use",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.slack.webhookUrl": {
 			"name": "camel.component.slack.webhookUrl",
 			"description": "The incoming webhook URL",
diff --git a/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-sink-connector.adoc b/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-sink-connector.adoc
index fe364f0..e23c945 100644
--- a/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-sink-connector.adoc
+++ b/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.slack.CamelSlackSinkConnector
 ----
 
 
-The camel-slack sink connector supports 9 options, which are listed below.
+The camel-slack sink connector supports 11 options, which are listed below.
 
 
 
@@ -32,6 +32,7 @@ The camel-slack sink connector supports 9 options, which are listed below.
 |===
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.channel* | The channel name (syntax #name) or slackuser (syntax userName) to send a message directly to an user. | null | true | HIGH
+| *camel.sink.endpoint.token* | The token to use | null | false | MEDIUM
 | *camel.sink.endpoint.iconEmoji* | Use a Slack emoji as an avatar | null | false | LOW
 | *camel.sink.endpoint.iconUrl* | The avatar that the component will use when sending message to a channel or user. | null | false | LOW
 | *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 [...]
@@ -39,6 +40,7 @@ The camel-slack sink connector supports 9 options, which are listed below.
 | *camel.sink.endpoint.webhookUrl* | The incoming webhook URL | null | false | MEDIUM
 | *camel.component.slack.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.slack.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
+| *camel.component.slack.token* | The token to use | null | false | MEDIUM
 | *camel.component.slack.webhookUrl* | The incoming webhook URL | null | false | MEDIUM
 |===
 
diff --git a/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-source-connector.adoc b/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-source-connector.adoc
index c3501d7..3d842c7 100644
--- a/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-source-connector.adoc
+++ b/connectors/camel-slack-kafka-connector/src/main/docs/camel-slack-kafka-source-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.slack.CamelSlackSourceConnector
 ----
 
 
-The camel-slack source connector supports 26 options, which are listed below.
+The camel-slack source connector supports 29 options, which are listed below.
 
 
 
@@ -32,11 +32,13 @@ The camel-slack source connector supports 26 options, which are listed below.
 |===
 | Name | Description | Default | Required | Priority
 | *camel.source.path.channel* | The channel name (syntax #name) or slackuser (syntax userName) to send a message directly to an user. | null | true | HIGH
+| *camel.source.endpoint.token* | The token to use | 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.conversationType* | Type of conversation One of: [PUBLIC_CHANNEL] [PRIVATE_CHANNEL] [MPIM] [IM] | "PUBLIC_CHANNEL" | false | MEDIUM
 | *camel.source.endpoint.maxResults* | The Max Result for the poll | "10" | false | MEDIUM
+| *camel.source.endpoint.naturalOrder* | Create exchanges in natural order (oldest to newest) or not | false | false | MEDIUM
 | *camel.source.endpoint.sendEmptyMessageWhenIdle* | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | false | MEDIUM
 | *camel.source.endpoint.serverUrl* | The Server URL of the Slack instance | "https://slack.com" | false | MEDIUM
-| *camel.source.endpoint.token* | The token to use | 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
 | *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.pollStrategy* | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | null | false | MEDIUM
@@ -56,6 +58,7 @@ The camel-slack source connector supports 26 options, which are listed below.
 | *camel.source.endpoint.useFixedDelay* | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | false | MEDIUM
 | *camel.component.slack.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.slack.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
+| *camel.component.slack.token* | The token to use | null | false | MEDIUM
 | *camel.component.slack.webhookUrl* | The incoming webhook URL | null | false | MEDIUM
 |===
 
diff --git a/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/CamelSlackSinkConnectorConfig.java b/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/CamelSlackSinkConnectorConfig.java
index 574bc71..d46d666 100644
--- a/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/CamelSlackSinkConnectorConfig.java
+++ b/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/CamelSlackSinkConnectorConfig.java
@@ -27,6 +27,9 @@ public class CamelSlackSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_SLACK_PATH_CHANNEL_CONF = "camel.sink.path.channel";
     public static final String CAMEL_SINK_SLACK_PATH_CHANNEL_DOC = "The channel name (syntax #name) or slackuser (syntax userName) to send a message directly to an user.";
     public static final String CAMEL_SINK_SLACK_PATH_CHANNEL_DEFAULT = null;
+    public static final String CAMEL_SINK_SLACK_ENDPOINT_TOKEN_CONF = "camel.sink.endpoint.token";
+    public static final String CAMEL_SINK_SLACK_ENDPOINT_TOKEN_DOC = "The token to use";
+    public static final String CAMEL_SINK_SLACK_ENDPOINT_TOKEN_DEFAULT = null;
     public static final String CAMEL_SINK_SLACK_ENDPOINT_ICON_EMOJI_CONF = "camel.sink.endpoint.iconEmoji";
     public static final String CAMEL_SINK_SLACK_ENDPOINT_ICON_EMOJI_DOC = "Use a Slack emoji as an avatar";
     public static final String CAMEL_SINK_SLACK_ENDPOINT_ICON_EMOJI_DEFAULT = null;
@@ -48,6 +51,9 @@ public class CamelSlackSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_SLACK_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.slack.autowiredEnabled";
     public static final String CAMEL_SINK_SLACK_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
     public static final Boolean CAMEL_SINK_SLACK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
+    public static final String CAMEL_SINK_SLACK_COMPONENT_TOKEN_CONF = "camel.component.slack.token";
+    public static final String CAMEL_SINK_SLACK_COMPONENT_TOKEN_DOC = "The token to use";
+    public static final String CAMEL_SINK_SLACK_COMPONENT_TOKEN_DEFAULT = null;
     public static final String CAMEL_SINK_SLACK_COMPONENT_WEBHOOK_URL_CONF = "camel.component.slack.webhookUrl";
     public static final String CAMEL_SINK_SLACK_COMPONENT_WEBHOOK_URL_DOC = "The incoming webhook URL";
     public static final String CAMEL_SINK_SLACK_COMPONENT_WEBHOOK_URL_DEFAULT = null;
@@ -65,6 +71,7 @@ public class CamelSlackSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_SLACK_PATH_CHANNEL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SLACK_PATH_CHANNEL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_SLACK_PATH_CHANNEL_DOC);
+        conf.define(CAMEL_SINK_SLACK_ENDPOINT_TOKEN_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_SLACK_ENDPOINT_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SLACK_ENDPOINT_TOKEN_DOC);
         conf.define(CAMEL_SINK_SLACK_ENDPOINT_ICON_EMOJI_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SLACK_ENDPOINT_ICON_EMOJI_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_SLACK_ENDPOINT_ICON_EMOJI_DOC);
         conf.define(CAMEL_SINK_SLACK_ENDPOINT_ICON_URL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SLACK_ENDPOINT_ICON_URL_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_SLACK_ENDPOINT_ICON_URL_DOC);
         conf.define(CAMEL_SINK_SLACK_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_SLACK_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SLACK_ENDPOINT_LAZY_START_PRODUCER_DOC);
@@ -72,6 +79,7 @@ public class CamelSlackSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_SLACK_ENDPOINT_WEBHOOK_URL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SLACK_ENDPOINT_WEBHOOK_URL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SLACK_ENDPOINT_WEBHOOK_URL_DOC);
         conf.define(CAMEL_SINK_SLACK_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_SLACK_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SLACK_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_SLACK_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_SLACK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SLACK_COMPONENT_AUTOWIRED_ENABLED_DOC);
+        conf.define(CAMEL_SINK_SLACK_COMPONENT_TOKEN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SLACK_COMPONENT_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SLACK_COMPONENT_TOKEN_DOC);
         conf.define(CAMEL_SINK_SLACK_COMPONENT_WEBHOOK_URL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SLACK_COMPONENT_WEBHOOK_URL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SLACK_COMPONENT_WEBHOOK_URL_DOC);
         return conf;
     }
diff --git a/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/CamelSlackSourceConnectorConfig.java b/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/CamelSlackSourceConnectorConfig.java
index d4282cd..a2a63f5 100644
--- a/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/CamelSlackSourceConnectorConfig.java
+++ b/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/CamelSlackSourceConnectorConfig.java
@@ -29,21 +29,27 @@ public class CamelSlackSourceConnectorConfig
     public static final String CAMEL_SOURCE_SLACK_PATH_CHANNEL_CONF = "camel.source.path.channel";
     public static final String CAMEL_SOURCE_SLACK_PATH_CHANNEL_DOC = "The channel name (syntax #name) or slackuser (syntax userName) to send a message directly to an user.";
     public static final String CAMEL_SOURCE_SLACK_PATH_CHANNEL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_CONF = "camel.source.endpoint.token";
+    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_DOC = "The token to use";
+    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_DEFAULT = null;
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_SLACK_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_SLACK_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_CONVERSATION_TYPE_CONF = "camel.source.endpoint.conversationType";
+    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_CONVERSATION_TYPE_DOC = "Type of conversation One of: [PUBLIC_CHANNEL] [PRIVATE_CHANNEL] [MPIM] [IM]";
+    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_CONVERSATION_TYPE_DEFAULT = "PUBLIC_CHANNEL";
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_MAX_RESULTS_CONF = "camel.source.endpoint.maxResults";
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_MAX_RESULTS_DOC = "The Max Result for the poll";
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_MAX_RESULTS_DEFAULT = "10";
+    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_NATURAL_ORDER_CONF = "camel.source.endpoint.naturalOrder";
+    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_NATURAL_ORDER_DOC = "Create exchanges in natural order (oldest to newest) or not";
+    public static final Boolean CAMEL_SOURCE_SLACK_ENDPOINT_NATURAL_ORDER_DEFAULT = false;
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_CONF = "camel.source.endpoint.sendEmptyMessageWhenIdle";
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DOC = "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.";
     public static final Boolean CAMEL_SOURCE_SLACK_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DEFAULT = false;
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_SERVER_URL_CONF = "camel.source.endpoint.serverUrl";
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_SERVER_URL_DOC = "The Server URL of the Slack instance";
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_SERVER_URL_DEFAULT = "https://slack.com";
-    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_CONF = "camel.source.endpoint.token";
-    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_DOC = "The token to use";
-    public static final String CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_DEFAULT = null;
     public static final String CAMEL_SOURCE_SLACK_ENDPOINT_EXCEPTION_HANDLER_CONF = "camel.source.endpoint.exceptionHandler";
     public static final String CAMEL_SOURCE_SLACK_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_SLACK_ENDPOINT_EXCEPTION_HANDLER_DEFAULT = null;
@@ -101,6 +107,9 @@ public class CamelSlackSourceConnectorConfig
     public static final String CAMEL_SOURCE_SLACK_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.slack.autowiredEnabled";
     public static final String CAMEL_SOURCE_SLACK_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
     public static final Boolean CAMEL_SOURCE_SLACK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
+    public static final String CAMEL_SOURCE_SLACK_COMPONENT_TOKEN_CONF = "camel.component.slack.token";
+    public static final String CAMEL_SOURCE_SLACK_COMPONENT_TOKEN_DOC = "The token to use";
+    public static final String CAMEL_SOURCE_SLACK_COMPONENT_TOKEN_DEFAULT = null;
     public static final String CAMEL_SOURCE_SLACK_COMPONENT_WEBHOOK_URL_CONF = "camel.component.slack.webhookUrl";
     public static final String CAMEL_SOURCE_SLACK_COMPONENT_WEBHOOK_URL_DOC = "The incoming webhook URL";
     public static final String CAMEL_SOURCE_SLACK_COMPONENT_WEBHOOK_URL_DEFAULT = null;
@@ -118,11 +127,13 @@ public class CamelSlackSourceConnectorConfig
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSourceConnectorConfig.conf());
         conf.define(CAMEL_SOURCE_SLACK_PATH_CHANNEL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SLACK_PATH_CHANNEL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_SLACK_PATH_CHANNEL_DOC);
+        conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_DOC);
         conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SLACK_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_CONVERSATION_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SLACK_ENDPOINT_CONVERSATION_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_CONVERSATION_TYPE_DOC);
         conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_MAX_RESULTS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SLACK_ENDPOINT_MAX_RESULTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_MAX_RESULTS_DOC);
+        conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_NATURAL_ORDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SLACK_ENDPOINT_NATURAL_ORDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_NATURAL_ORDER_DOC);
         conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SLACK_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_SEND_EMPTY_MESSAGE_WHEN_IDLE_DOC);
         conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_SERVER_URL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SLACK_ENDPOINT_SERVER_URL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_SERVER_URL_DOC);
-        conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_TOKEN_DOC);
         conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SLACK_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SLACK_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_EXCHANGE_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_POLL_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SLACK_ENDPOINT_POLL_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_POLL_STRATEGY_DOC);
@@ -142,6 +153,7 @@ public class CamelSlackSourceConnectorConfig
         conf.define(CAMEL_SOURCE_SLACK_ENDPOINT_USE_FIXED_DELAY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SLACK_ENDPOINT_USE_FIXED_DELAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_ENDPOINT_USE_FIXED_DELAY_DOC);
         conf.define(CAMEL_SOURCE_SLACK_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SLACK_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_SLACK_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_SLACK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_COMPONENT_AUTOWIRED_ENABLED_DOC);
+        conf.define(CAMEL_SOURCE_SLACK_COMPONENT_TOKEN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SLACK_COMPONENT_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_COMPONENT_TOKEN_DOC);
         conf.define(CAMEL_SOURCE_SLACK_COMPONENT_WEBHOOK_URL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SLACK_COMPONENT_WEBHOOK_URL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SLACK_COMPONENT_WEBHOOK_URL_DOC);
         return conf;
     }
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index 8acc722..f8d3083 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -70,9 +70,6 @@
 ** camel-avro-kafka-connector
 *** xref:connectors/camel-avro-kafka-source-connector.adoc[Source Docs]
 *** xref:connectors/camel-avro-kafka-sink-connector.adoc[Sink Docs]
-** camel-aws-swf-kafka-connector
-*** xref:connectors/camel-aws-swf-kafka-source-connector.adoc[Source Docs]
-*** xref:connectors/camel-aws-swf-kafka-sink-connector.adoc[Sink Docs]
 ** camel-aws2-athena-kafka-connector
 *** xref:connectors/camel-aws2-athena-kafka-sink-connector.adoc[Sink Docs]
 ** camel-aws2-cw-kafka-connector
diff --git a/docs/modules/ROOT/pages/connectors.adoc b/docs/modules/ROOT/pages/connectors.adoc
index 05278a9..4e7893c 100644
--- a/docs/modules/ROOT/pages/connectors.adoc
+++ b/docs/modules/ROOT/pages/connectors.adoc
@@ -2,7 +2,7 @@
 = Supported connectors and documentation
 
 // kafka-connectors list: START
-Number of Camel Kafka connectors: 336 
+Number of Camel Kafka connectors: 335 
 
 [width="100%",cols="4,1,1,1,1,1",options="header"]
 |===
@@ -27,7 +27,6 @@ Number of Camel Kafka connectors: 336
 | *camel-atomix-set-kafka-connector* | true | true | xref:connectors/camel-atomix-set-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-atomix-set-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-atomix-set-kafka-connector/0.7.2/camel-atomix-set-kafka-connector-0.7.2-package.tar.gz[Download]
 | *camel-atomix-value-kafka-connector* | true | true | xref:connectors/camel-atomix-value-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-atomix-value-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-atomix-value-kafka-connector/0.7.2/camel-atomix-value-kafka-connector-0.7.2-package.tar.gz[Download]
 | *camel-avro-kafka-connector* | true | true | xref:connectors/camel-avro-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-avro-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-avro-kafka-connector/0.7.2/camel-avro-kafka-connector-0.7.2-package.tar.gz[Download]
-| *camel-aws-swf-kafka-connector* | true | true | xref:connectors/camel-aws-swf-kafka-sink-connector.adoc[Sink Docs] | xref:connectors/camel-aws-swf-kafka-source-connector.adoc[Source Docs] | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws-swf-kafka-connector/0.7.2/camel-aws-swf-kafka-connector-0.7.2-package.tar.gz[Download]
 | *camel-aws2-athena-kafka-connector* | true | false | xref:connectors/camel-aws2-athena-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws2-athena-kafka-connector/0.7.2/camel-aws2-athena-kafka-connector-0.7.2-package.tar.gz[Download]
 | *camel-aws2-cw-kafka-connector* | true | false | xref:connectors/camel-aws2-cw-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws2-cw-kafka-connector/0.7.2/camel-aws2-cw-kafka-connector-0.7.2-package.tar.gz[Download]
 | *camel-aws2-ddb-kafka-connector* | true | false | xref:connectors/camel-aws2-ddb-kafka-sink-connector.adoc[Sink Docs] |  | https://repo.maven.apache.org/maven2/org/apache/camel/kafkaconnector/camel-aws2-ddb-kafka-connector/0.7.2/camel-aws2-ddb-kafka-connector-0.7.2-package.tar.gz[Download]
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-cw-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-cw-kafka-sink-connector.adoc
index 63140b0..d99283c 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-cw-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-cw-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2cw.CamelAws2cwSinkConnector
 ----
 
 
-The camel-aws2-cw sink connector supports 29 options, which are listed below.
+The camel-aws2-cw sink connector supports 33 options, which are listed below.
 
 
 
@@ -35,6 +35,7 @@ The camel-aws2-cw sink connector supports 29 options, which are listed below.
 | *camel.sink.endpoint.amazonCwClient* | To use the AmazonCloudWatch as the client | 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.name* | The metric name | null | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the CW client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the CW client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the CW client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -42,6 +43,7 @@ The camel-aws2-cw sink connector supports 29 options, which are listed below.
 | *camel.sink.endpoint.timestamp* | The metric timestamp | 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.unit* | The metric unit | null | false | MEDIUM
+| *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.value* | The metric value | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -49,6 +51,7 @@ The camel-aws2-cw sink connector supports 29 options, which are listed below.
 | *camel.component.aws2-cw.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-cw.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 [...]
 | *camel.component.aws2-cw.name* | The metric name | null | false | MEDIUM
+| *camel.component.aws2-cw.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-cw.proxyHost* | To define a proxy host when instantiating the CW client | null | false | MEDIUM
 | *camel.component.aws2-cw.proxyPort* | To define a proxy port when instantiating the CW client | null | false | MEDIUM
 | *camel.component.aws2-cw.proxyProtocol* | To define a proxy protocol when instantiating the CW client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -56,6 +59,7 @@ The camel-aws2-cw sink connector supports 29 options, which are listed below.
 | *camel.component.aws2-cw.timestamp* | The metric timestamp | null | false | MEDIUM
 | *camel.component.aws2-cw.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
 | *camel.component.aws2-cw.unit* | The metric unit | null | false | MEDIUM
+| *camel.component.aws2-cw.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-cw.value* | The metric value | null | false | MEDIUM
 | *camel.component.aws2-cw.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-cw.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-ddb-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-ddb-kafka-sink-connector.adoc
index d29ab1e..e618515 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-ddb-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-ddb-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ddb.CamelAws2ddbSinkConnecto
 ----
 
 
-The camel-aws2-ddb sink connector supports 33 options, which are listed below.
+The camel-aws2-ddb sink connector supports 37 options, which are listed below.
 
 
 
@@ -38,12 +38,14 @@ The camel-aws2-ddb sink connector supports 33 options, which are listed below.
 | *camel.sink.endpoint.keyAttributeType* | Attribute type when creating table | 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.operation* | What operation to perform One of: [BatchGetItems] [DeleteItem] [DeleteTable] [DescribeTable] [GetItem] [PutItem] [Query] [Scan] [UpdateItem] [UpdateTable] | "PutItem" | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the DDB client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | The region in which DynamoDB 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.proxyProtocol* | To define a proxy protocol when instantiating the DDB client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.readCapacity* | The provisioned throughput to reserve for reading resources from your table | null | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which DDB client needs to work | 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.writeCapacity* | The provisioned throughput to reserved for writing resources to your table | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -54,12 +56,14 @@ The camel-aws2-ddb sink connector supports 33 options, which are listed below.
 | *camel.component.aws2-ddb.keyAttributeType* | Attribute type when creating table | null | false | MEDIUM
 | *camel.component.aws2-ddb.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-ddb.operation* | What operation to perform One of: [BatchGetItems] [DeleteItem] [DeleteTable] [DescribeTable] [GetItem] [PutItem] [Query] [Scan] [UpdateItem] [UpdateTable] | "PutItem" | false | MEDIUM
+| *camel.component.aws2-ddb.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ddb.proxyHost* | To define a proxy host when instantiating the DDB client | null | false | MEDIUM
 | *camel.component.aws2-ddb.proxyPort* | The region in which DynamoDB 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-ddb.proxyProtocol* | To define a proxy protocol when instantiating the DDB client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-ddb.readCapacity* | The provisioned throughput to reserve for reading resources from your table | null | false | MEDIUM
 | *camel.component.aws2-ddb.region* | The region in which DDB client needs to work | null | false | MEDIUM
 | *camel.component.aws2-ddb.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-ddb.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-ddb.writeCapacity* | The provisioned throughput to reserved for writing resources to your table | null | false | MEDIUM
 | *camel.component.aws2-ddb.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-ddb.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-ddbstream-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-ddbstream-kafka-source-connector.adoc
index 0f29b14..0f57a52 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-ddbstream-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-ddbstream-kafka-source-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ddbstream.CamelAws2ddbstream
 ----
 
 
-The camel-aws2-ddbstream source connector supports 45 options, which are listed below.
+The camel-aws2-ddbstream source connector supports 49 options, which are listed below.
 
 
 
@@ -36,6 +36,7 @@ The camel-aws2-ddbstream source connector supports 45 options, which are listed
 | *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.iteratorType* | Defines where in the DynaboDB stream to start getting records. Note that using TRIM_HORIZON can cause a significant delay before the stream has caught up to real-time. if {AT,AFTER}_SEQUENCE_NUMBER are used, then a sequenceNumberProvider MUST be supplied. One of: [TRIM_HORIZON] [LATEST] [AT_SEQUENCE_NUMBER] [AFTER_SEQUENCE_NUMBER] [null] | "LATEST" | false | MEDIUM
 | *camel.source.endpoint.maxResultsPerRequest* | Maximum number of records that will be fetched in each poll | null | false | MEDIUM
+| *camel.source.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.source.endpoint.proxyHost* | To define a proxy host when instantiating the DDBStreams client | null | false | MEDIUM
 | *camel.source.endpoint.proxyPort* | To define a proxy port when instantiating the DDBStreams client | null | false | MEDIUM
 | *camel.source.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -43,6 +44,7 @@ The camel-aws2-ddbstream source connector supports 45 options, which are listed
 | *camel.source.endpoint.sendEmptyMessageWhenIdle* | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | false | MEDIUM
 | *camel.source.endpoint.sequenceNumberProvider* | Provider for the sequence number when using one of the two ShardIteratorType.{AT,AFTER}_SEQUENCE_NUMBER iterator types. Can be a registry reference or a literal sequence number. | 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | 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
 | *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.pollStrategy* | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | null | false | MEDIUM
@@ -67,12 +69,14 @@ The camel-aws2-ddbstream source connector supports 45 options, which are listed
 | *camel.component.aws2-ddbstream.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.iteratorType* | Defines where in the DynaboDB stream to start getting records. Note that using TRIM_HORIZON can cause a significant delay before the stream has caught up to real-time. if {AT,AFTER}_SEQUENCE_NUMBER are used, then a sequenceNumberProvider MUST be supplied. One of: [TRIM_HORIZON] [LATEST] [AT_SEQUENCE_NUMBER] [AFTER_SEQUENCE_NUMBER] [null] | "LATEST" | false | MEDIUM
 | *camel.component.aws2-ddbstream.maxResultsPer Request* | Maximum number of records that will be fetched in each poll | null | false | MEDIUM
+| *camel.component.aws2-ddbstream.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ddbstream.proxyHost* | To define a proxy host when instantiating the DDBStreams client | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.proxyPort* | To define a proxy port when instantiating the DDBStreams client | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.proxyProtocol* | To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-ddbstream.region* | The region in which DDBStreams client needs to work | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.sequenceNumber Provider* | Provider for the sequence number when using one of the two ShardIteratorType.{AT,AFTER}_SEQUENCE_NUMBER iterator types. Can be a registry reference or a literal sequence number. | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.trustAll Certificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-ddbstream.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-ddbstream.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-ddbstream.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-ec2-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-ec2-kafka-sink-connector.adoc
index b9790a3..3097f40 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-ec2-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-ec2-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ec2.CamelAws2ec2SinkConnecto
 ----
 
 
-The camel-aws2-ec2 sink connector supports 25 options, which are listed below.
+The camel-aws2-ec2 sink connector supports 29 options, which are listed below.
 
 
 
@@ -36,6 +36,7 @@ The camel-aws2-ec2 sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.amazonEc2Client* | To use a existing configured AmazonEC2Client as client | 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.operation* | The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorInstances] [createTags] [deleteTags] | null [...]
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the EC2 client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the EC2 client | null | false | MEDIUM
@@ -43,11 +44,13 @@ The camel-aws2-ec2 sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.region* | The region in which EC2 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.secretKey* | Amazon AWS Secret Key | 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-ec2.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-ec2.amazonEc2Client* | To use a existing configured AmazonEC2Client as client | null | false | MEDIUM
 | *camel.component.aws2-ec2.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-ec2.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-ec2.operation* | The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags One of: [createAndRunInstances] [startInstances] [stopInstances] [terminateInstances] [describeInstances] [describeInstancesStatus] [rebootInstances] [monitorInstances] [unmonitorInstances] [createTags] [deleteTags] | [...]
+| *camel.component.aws2-ec2.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ec2.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-ec2.proxyHost* | To define a proxy host when instantiating the EC2 client | null | false | MEDIUM
 | *camel.component.aws2-ec2.proxyPort* | To define a proxy port when instantiating the EC2 client | null | false | MEDIUM
@@ -55,6 +58,7 @@ The camel-aws2-ec2 sink connector supports 25 options, which are listed below.
 | *camel.component.aws2-ec2.region* | The region in which EC2 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-ec2.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-ec2.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-ec2.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-ec2.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-ecs-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-ecs-kafka-sink-connector.adoc
index 092f7f7..ba4361a 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-ecs-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-ecs-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ecs.CamelAws2ecsSinkConnecto
 ----
 
 
-The camel-aws2-ecs sink connector supports 25 options, which are listed below.
+The camel-aws2-ecs sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-ecs sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.ecsClient* | To use a existing configured AWS ECS as client | 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.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the ECS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the ECS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the ECS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which ECS 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-ecs.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-ecs.ecsClient* | To use a existing configured AWS ECS as client | null | false | MEDIUM
 | *camel.component.aws2-ecs.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-ecs.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
+| *camel.component.aws2-ecs.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ecs.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-ecs.proxyHost* | To define a proxy host when instantiating the ECS client | null | false | MEDIUM
 | *camel.component.aws2-ecs.proxyPort* | To define a proxy port when instantiating the ECS client | null | false | MEDIUM
 | *camel.component.aws2-ecs.proxyProtocol* | To define a proxy protocol when instantiating the ECS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-ecs.region* | The region in which ECS 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-ecs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-ecs.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-ecs.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-ecs.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-ecs.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-eks-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-eks-kafka-sink-connector.adoc
index d20c169..e83fbaa 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-eks-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-eks-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2eks.CamelAws2eksSinkConnecto
 ----
 
 
-The camel-aws2-eks sink connector supports 25 options, which are listed below.
+The camel-aws2-eks sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-eks sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.eksClient* | To use a existing configured AWS EKS as client | 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.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the EKS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the EKS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the EKS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which EKS 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-eks.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-eks.eksClient* | To use a existing configured AWS EKS as client | null | false | MEDIUM
 | *camel.component.aws2-eks.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-eks.operation* | The operation to perform One of: [listClusters] [describeCluster] [createCluster] [deleteCluster] | null | true | HIGH
+| *camel.component.aws2-eks.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-eks.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-eks.proxyHost* | To define a proxy host when instantiating the EKS client | null | false | MEDIUM
 | *camel.component.aws2-eks.proxyPort* | To define a proxy port when instantiating the EKS client | null | false | MEDIUM
 | *camel.component.aws2-eks.proxyProtocol* | To define a proxy protocol when instantiating the EKS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-eks.region* | The region in which EKS 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-eks.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-eks.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-eks.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-eks.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-eks.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-eventbridge-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-eventbridge-kafka-sink-connector.adoc
index bf448fd..95f58f0 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-eventbridge-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-eventbridge-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2eventbridge.CamelAws2eventbr
 ----
 
 
-The camel-aws2-eventbridge sink connector supports 27 options, which are listed below.
+The camel-aws2-eventbridge sink connector supports 31 options, which are listed below.
 
 
 
@@ -36,12 +36,14 @@ The camel-aws2-eventbridge sink connector supports 27 options, which are listed
 | *camel.sink.endpoint.eventPatternFile* | EventPattern File | 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.operation* | The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [describeRule] [listRules] [listTargetsByRule] [listRuleNamesByTarget] | "putRule" | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the Eventbridge client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the Eventbridge client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the Eventbridge client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which Eventbridge 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.configuration* | Component configuration | null | false | MEDIUM
@@ -49,12 +51,14 @@ The camel-aws2-eventbridge sink connector supports 27 options, which are listed
 | *camel.component.aws2-eventbridge.eventPatternFile* | EventPattern File | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.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 proce [...]
 | *camel.component.aws2-eventbridge.operation* | The operation to perform One of: [putRule] [putTargets] [removeTargets] [deleteRule] [enableRule] [disableRule] [describeRule] [listRules] [listTargetsByRule] [listRuleNamesByTarget] | "putRule" | true | HIGH
+| *camel.component.aws2-eventbridge.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-eventbridge.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-eventbridge.proxyHost* | To define a proxy host when instantiating the Eventbridge client | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.proxyPort* | To define a proxy port when instantiating the Eventbridge client | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.proxyProtocol* | To define a proxy protocol when instantiating the Eventbridge client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-eventbridge.region* | The region in which Eventbridge 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-eventbridge.trustAll Certificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-eventbridge.uriEndpoint Override* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-eventbridge.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-eventbridge.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-iam-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-iam-kafka-sink-connector.adoc
index d78702a..aa83541 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-iam-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-iam-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2iam.CamelAws2iamSinkConnecto
 ----
 
 
-The camel-aws2-iam sink connector supports 25 options, which are listed below.
+The camel-aws2-iam sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-iam sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.iamClient* | To use a existing configured AWS IAM as client | 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.operation* | The operation to perform. You can configure a default operation on the component level, or the operation as part of the endpoint, or via a message header with the key CamelAwsIAMOperation. One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup] | null | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the IAM client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the IAM client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the IAM client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which IAM 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() | "aws-global" | 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-iam.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-iam.iamClient* | To use a existing configured AWS IAM as client | null | false | MEDIUM
 | *camel.component.aws2-iam.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-iam.operation* | The operation to perform. You can configure a default operation on the component level, or the operation as part of the endpoint, or via a message header with the key CamelAwsIAMOperation. One of: [listAccessKeys] [createUser] [deleteUser] [getUser] [listUsers] [createAccessKey] [deleteAccessKey] [updateAccessKey] [createGroup] [deleteGroup] [listGroups] [addUserToGroup] [removeUserFromGroup] | null | false | MEDIUM
+| *camel.component.aws2-iam.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-iam.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-iam.proxyHost* | To define a proxy host when instantiating the IAM client | null | false | MEDIUM
 | *camel.component.aws2-iam.proxyPort* | To define a proxy port when instantiating the IAM client | null | false | MEDIUM
 | *camel.component.aws2-iam.proxyProtocol* | To define a proxy protocol when instantiating the IAM client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-iam.region* | The region in which IAM 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() | "aws-global" | false | MEDIUM
 | *camel.component.aws2-iam.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-iam.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-iam.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-iam.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-iam.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-kms-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-kms-kafka-sink-connector.adoc
index 1460f0b..7ecc13d 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-kms-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-kms-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2kms.CamelAws2kmsSinkConnecto
 ----
 
 
-The camel-aws2-kms sink connector supports 25 options, which are listed below.
+The camel-aws2-kms sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-kms sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.kmsClient* | To use a existing configured AWS KMS as client | 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.operation* | The operation to perform One of: [listKeys] [createKey] [disableKey] [scheduleKeyDeletion] [describeKey] [enableKey] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the KMS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the KMS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the KMS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which EKS 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-kms.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-kms.kmsClient* | To use a existing configured AWS KMS as client | null | false | MEDIUM
 | *camel.component.aws2-kms.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-kms.operation* | The operation to perform One of: [listKeys] [createKey] [disableKey] [scheduleKeyDeletion] [describeKey] [enableKey] | null | true | HIGH
+| *camel.component.aws2-kms.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-kms.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-kms.proxyHost* | To define a proxy host when instantiating the KMS client | null | false | MEDIUM
 | *camel.component.aws2-kms.proxyPort* | To define a proxy port when instantiating the KMS client | null | false | MEDIUM
 | *camel.component.aws2-kms.proxyProtocol* | To define a proxy protocol when instantiating the KMS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-kms.region* | The region in which EKS 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-kms.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-kms.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-kms.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-kms.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-kms.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-lambda-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-lambda-kafka-sink-connector.adoc
index a6bdc39..703ff97 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-lambda-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-lambda-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2lambda.CamelAws2lambdaSinkCo
 ----
 
 
-The camel-aws2-lambda sink connector supports 25 options, which are listed below.
+The camel-aws2-lambda sink connector supports 29 options, which are listed below.
 
 
 
@@ -34,9 +34,11 @@ The camel-aws2-lambda sink connector supports 25 options, which are listed below
 | *camel.sink.path.function* | Name of the Lambda function. | null | true | HIGH
 | *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 perform. It can be listFunctions, getFunction, createFunction, deleteFunction or invokeFunction One of: [listFunctions] [getFunction] [createAlias] [deleteAlias] [getAlias] [listAliases] [createFunction] [deleteFunction] [invokeFunction] [updateFunction] [createEventSourceMapping] [deleteEventSourceMapping] [listEventSourceMapping] [listTags] [tagResource] [untagResource] [publishVersion] [listVersions] | "invokeFunction" | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which ECS 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.awsLambdaClient* | To use a existing configured AwsLambdaClient as client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the Lambda client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the Lambda client | null | false | MEDIUM
@@ -46,9 +48,11 @@ The camel-aws2-lambda sink connector supports 25 options, which are listed below
 | *camel.component.aws2-lambda.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-lambda.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  [...]
 | *camel.component.aws2-lambda.operation* | The operation to perform. It can be listFunctions, getFunction, createFunction, deleteFunction or invokeFunction One of: [listFunctions] [getFunction] [createAlias] [deleteAlias] [getAlias] [listAliases] [createFunction] [deleteFunction] [invokeFunction] [updateFunction] [createEventSourceMapping] [deleteEventSourceMapping] [listEventSourceMapping] [listTags] [tagResource] [untagResource] [publishVersion] [listVersions] | "invokeFunction" | fal [...]
+| *camel.component.aws2-lambda.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-lambda.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-lambda.region* | The region in which ECS 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-lambda.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-lambda.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-lambda.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-lambda.awsLambdaClient* | To use a existing configured AwsLambdaClient as client | null | false | MEDIUM
 | *camel.component.aws2-lambda.proxyHost* | To define a proxy host when instantiating the Lambda client | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-mq-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-mq-kafka-sink-connector.adoc
index e565b89..62e1ef9 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-mq-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-mq-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2mq.CamelAws2mqSinkConnector
 ----
 
 
-The camel-aws2-mq sink connector supports 25 options, which are listed below.
+The camel-aws2-mq sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-mq sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.amazonMqClient* | To use a existing configured AmazonMQClient as client | 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.operation* | The operation to perform. It can be listBrokers,createBroker,deleteBroker One of: [listBrokers] [createBroker] [deleteBroker] [rebootBroker] [updateBroker] [describeBroker] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the MQ client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the MQ client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the MQ client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which MQ 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-mq.amazonMqClient* | To use a existing configured AmazonMQClient as client | null | false | MEDIUM
 | *camel.component.aws2-mq.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-mq.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 [...]
 | *camel.component.aws2-mq.operation* | The operation to perform. It can be listBrokers,createBroker,deleteBroker One of: [listBrokers] [createBroker] [deleteBroker] [rebootBroker] [updateBroker] [describeBroker] | null | true | HIGH
+| *camel.component.aws2-mq.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-mq.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-mq.proxyHost* | To define a proxy host when instantiating the MQ client | null | false | MEDIUM
 | *camel.component.aws2-mq.proxyPort* | To define a proxy port when instantiating the MQ client | null | false | MEDIUM
 | *camel.component.aws2-mq.proxyProtocol* | To define a proxy protocol when instantiating the MQ client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-mq.region* | The region in which MQ 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-mq.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-mq.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-mq.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-mq.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-mq.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-msk-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-msk-kafka-sink-connector.adoc
index f993f6b..b17dc71 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-msk-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-msk-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2msk.CamelAws2mskSinkConnecto
 ----
 
 
-The camel-aws2-msk sink connector supports 25 options, which are listed below.
+The camel-aws2-msk sink connector supports 29 options, which are listed below.
 
 
 
@@ -35,24 +35,28 @@ The camel-aws2-msk sink connector supports 25 options, which are listed below.
 | *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.mskClient* | To use a existing configured AWS MSK as client | null | false | MEDIUM
 | *camel.sink.endpoint.operation* | The operation to perform One of: [listClusters] [createCluster] [deleteCluster] [describeCluster] | null | true | HIGH
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the MSK client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the MSK client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the MSK client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which MSK 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-msk.configuration* | Component configuration | null | false | MEDIUM
 | *camel.component.aws2-msk.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-msk.mskClient* | To use a existing configured AWS MSK as client | null | false | MEDIUM
 | *camel.component.aws2-msk.operation* | The operation to perform One of: [listClusters] [createCluster] [deleteCluster] [describeCluster] | null | true | HIGH
+| *camel.component.aws2-msk.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-msk.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
 | *camel.component.aws2-msk.proxyHost* | To define a proxy host when instantiating the MSK client | null | false | MEDIUM
 | *camel.component.aws2-msk.proxyPort* | To define a proxy port when instantiating the MSK client | null | false | MEDIUM
 | *camel.component.aws2-msk.proxyProtocol* | To define a proxy protocol when instantiating the MSK client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws2-msk.region* | The region in which MSK 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-msk.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-msk.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-msk.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-msk.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-msk.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-ses-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-ses-kafka-sink-connector.adoc
index 2ccc490..434ab72 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-ses-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-ses-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ses.CamelAws2sesSinkConnecto
 ----
 
 
-The camel-aws2-ses sink connector supports 29 options, which are listed below.
+The camel-aws2-ses sink connector supports 33 options, which are listed below.
 
 
 
@@ -34,6 +34,7 @@ The camel-aws2-ses sink connector supports 29 options, which are listed below.
 | *camel.sink.path.from* | The sender's email address. | null | true | HIGH
 | *camel.sink.endpoint.amazonSESClient* | To use the AmazonSimpleEmailService as the client | 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.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the SES client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the SES client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the SES client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -43,11 +44,13 @@ The camel-aws2-ses sink connector supports 29 options, which are listed below.
 | *camel.sink.endpoint.subject* | The subject which is used if the message header 'CamelAwsSesSubject' is not present. | null | false | MEDIUM
 | *camel.sink.endpoint.to* | List of destination email address. Can be overriden with 'CamelAwsSesTo' header. | 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-ses.amazonSESClient* | To use the AmazonSimpleEmailService as the client | null | false | MEDIUM
 | *camel.component.aws2-ses.configuration* | component configuration | null | false | MEDIUM
 | *camel.component.aws2-ses.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-ses.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-ses.proxyHost* | To define a proxy host when instantiating the SES client | null | false | MEDIUM
 | *camel.component.aws2-ses.proxyPort* | To define a proxy port when instantiating the SES client | null | false | MEDIUM
 | *camel.component.aws2-ses.proxyProtocol* | To define a proxy protocol when instantiating the SES client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
@@ -57,6 +60,7 @@ The camel-aws2-ses sink connector supports 29 options, which are listed below.
 | *camel.component.aws2-ses.subject* | The subject which is used if the message header 'CamelAwsSesSubject' is not present. | null | false | MEDIUM
 | *camel.component.aws2-ses.to* | List of destination email address. Can be overriden with 'CamelAwsSesTo' header. | null | false | MEDIUM
 | *camel.component.aws2-ses.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-ses.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-ses.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-ses.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-ses.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-sns-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-sns-kafka-sink-connector.adoc
index 6d99dd6..df40bba 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-sns-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-sns-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sns.CamelAws2snsSinkConnecto
 ----
 
 
-The camel-aws2-sns sink connector supports 44 options, which are listed below.
+The camel-aws2-sns sink connector supports 48 options, which are listed below.
 
 
 
@@ -40,6 +40,7 @@ The camel-aws2-sns sink connector supports 44 options, which are listed below.
 | *camel.sink.endpoint.messageDeduplicationIdStrategy* | Only for FIFO Topic. 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
 | *camel.sink.endpoint.messageGroupIdStrategy* | Only for FIFO Topic. Strategy for setting the messageGroupId on the message. Can be one of the following options: useConstant, useExchangeId, usePropertyValue. For the usePropertyValue option, the value of property CamelAwsMessageGroupId will be used. One of: [useConstant] [useExchangeId] [usePropertyValue] | null | false | MEDIUM
 | *camel.sink.endpoint.messageStructure* | The message structure to use such as json | null | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.policy* | The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the SNS client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the SNS client | null | false | MEDIUM
@@ -50,6 +51,7 @@ The camel-aws2-sns sink connector supports 44 options, which are listed below.
 | *camel.sink.endpoint.subject* | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | null | false | MEDIUM
 | *camel.sink.endpoint.subscribeSNStoSQS* | Define if the subscription between SNS Topic and SQS must be done or not | false | 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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.useDefaultCredentialsProvider* | Set whether the SNS 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.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -61,6 +63,7 @@ The camel-aws2-sns sink connector supports 44 options, which are listed below.
 | *camel.component.aws2-sns.messageDeduplicationId Strategy* | Only for FIFO Topic. 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
 | *camel.component.aws2-sns.messageGroupIdStrategy* | Only for FIFO Topic. Strategy for setting the messageGroupId on the message. Can be one of the following options: useConstant, useExchangeId, usePropertyValue. For the usePropertyValue option, the value of property CamelAwsMessageGroupId will be used. One of: [useConstant] [useExchangeId] [usePropertyValue] | null | false | MEDIUM
 | *camel.component.aws2-sns.messageStructure* | The message structure to use such as json | null | false | MEDIUM
+| *camel.component.aws2-sns.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-sns.policy* | The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.component.aws2-sns.proxyHost* | To define a proxy host when instantiating the SNS client | null | false | MEDIUM
 | *camel.component.aws2-sns.proxyPort* | To define a proxy port when instantiating the SNS client | null | false | MEDIUM
@@ -71,6 +74,7 @@ The camel-aws2-sns sink connector supports 44 options, which are listed below.
 | *camel.component.aws2-sns.subject* | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | null | false | MEDIUM
 | *camel.component.aws2-sns.subscribeSNStoSQS* | Define if the subscription between SNS Topic and SQS must be done or not | false | false | MEDIUM
 | *camel.component.aws2-sns.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-sns.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-sns.useDefaultCredentials Provider* | Set whether the SNS 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-sns.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-sns.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
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 1b7d196..9f58eef 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
@@ -24,7 +24,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 60 options, which are listed below.
 
 
 
@@ -36,11 +36,13 @@ The camel-aws2-sqs sink connector supports 56 options, which are listed below.
 | *camel.sink.endpoint.amazonSQSClient* | To use the AmazonSQS as client | null | false | MEDIUM
 | *camel.sink.endpoint.autoCreateQueue* | Setting the autocreation of the queue | true | false | MEDIUM
 | *camel.sink.endpoint.headerFilterStrategy* | To use a custom HeaderFilterStrategy to map headers to/from Camel. | null | false | MEDIUM
+| *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.protocol* | The underlying protocol used to communicate with SQS | "https" | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the SQS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.sink.endpoint.useDefaultCredentialsProvider* | 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.batchSeparator* | Set the separator when passing a String to send batch message operation | "," | false | MEDIUM
 | *camel.sink.endpoint.delaySeconds* | Delay sending messages for a number of seconds. | null | false | MEDIUM
@@ -63,11 +65,13 @@ The camel-aws2-sqs sink connector supports 56 options, which are listed below.
 | *camel.component.aws2-sqs.amazonSQSClient* | To use the AmazonSQS as client | null | false | MEDIUM
 | *camel.component.aws2-sqs.autoCreateQueue* | Setting the autocreation of the queue | true | false | MEDIUM
 | *camel.component.aws2-sqs.configuration* | The AWS SQS default configuration | null | false | MEDIUM
+| *camel.component.aws2-sqs.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-sqs.protocol* | The underlying protocol used to communicate with SQS | "https" | false | MEDIUM
 | *camel.component.aws2-sqs.proxyProtocol* | To define a proxy protocol when instantiating the SQS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-sqs.useDefaultCredentials Provider* | 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.batchSeparator* | Set the separator when passing a String to send batch message operation | "," | false | MEDIUM
 | *camel.component.aws2-sqs.delaySeconds* | Delay sending messages for a number of seconds. | null | 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 4b3169a..ba1b605 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
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sqs.CamelAws2sqsSourceConnec
 ----
 
 
-The camel-aws2-sqs source connector supports 89 options, which are listed below.
+The camel-aws2-sqs source connector supports 93 options, which are listed below.
 
 
 
@@ -36,11 +36,13 @@ The camel-aws2-sqs source connector supports 89 options, which are listed below.
 | *camel.source.endpoint.amazonSQSClient* | To use the AmazonSQS as client | null | false | MEDIUM
 | *camel.source.endpoint.autoCreateQueue* | Setting the autocreation of the queue | true | false | MEDIUM
 | *camel.source.endpoint.headerFilterStrategy* | To use a custom HeaderFilterStrategy to map headers to/from Camel. | null | false | MEDIUM
+| *camel.source.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.source.endpoint.protocol* | The underlying protocol used to communicate with SQS | "https" | false | MEDIUM
 | *camel.source.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the SQS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.source.endpoint.useDefaultCredentials Provider* | 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
@@ -89,11 +91,13 @@ The camel-aws2-sqs source connector supports 89 options, which are listed below.
 | *camel.component.aws2-sqs.amazonSQSClient* | To use the AmazonSQS as client | null | false | MEDIUM
 | *camel.component.aws2-sqs.autoCreateQueue* | Setting the autocreation of the queue | true | false | MEDIUM
 | *camel.component.aws2-sqs.configuration* | The AWS SQS default configuration | null | false | MEDIUM
+| *camel.component.aws2-sqs.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.component.aws2-sqs.protocol* | The underlying protocol used to communicate with SQS | "https" | false | MEDIUM
 | *camel.component.aws2-sqs.proxyProtocol* | To define a proxy protocol when instantiating the SQS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *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.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
 | *camel.component.aws2-sqs.useDefaultCredentials Provider* | 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
diff --git a/docs/modules/ROOT/pages/connectors/camel-file-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-file-kafka-sink-connector.adoc
index c0eafd7..c20fd0b 100644
--- a/docs/modules/ROOT/pages/connectors/camel-file-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-file-kafka-sink-connector.adoc
@@ -35,7 +35,7 @@ The camel-file sink connector supports 26 options, which are listed below.
 | *camel.sink.endpoint.charset* | This option is used to specify the encoding of the file. You can use this on the consumer, to specify the encodings of the files, which allow Camel to know the charset it should load the file content in case the file content is being accessed. Likewise when writing a file, you can use this option to specify which charset to write the file as well. Do mind that when writing the file Camel may have to read the message content into memory to be able to conv [...]
 | *camel.sink.endpoint.doneFileName* | Producer: If provided, then Camel will write a 2nd done file when the original file has been written. The done file will be empty. This option configures what file name to use. Either you can specify a fixed name. Or you can use dynamic placeholders. The done file will always be written in the same folder as the original file. Consumer: If provided, Camel will only consume files if a done file exists. This option configures what file name to use. Ei [...]
 | *camel.sink.endpoint.fileName* | Use Expression such as File Language to dynamically set the filename. For consumers, it's used as a filename filter. For producers, it's used to evaluate the filename to write. If an expression is set, it take precedence over the CamelFileName header. (Note: The header itself can also be an Expression). The expression options support both String and Expression types. If the expression is a String type, it is always evaluated using the File Language. If  [...]
-| *camel.sink.endpoint.appendChars* | Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending to existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n. | null | false | MEDIUM
+| *camel.sink.endpoint.appendChars* | Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending new files or existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n. | null | false | MEDIUM
 | *camel.sink.endpoint.fileExist* | What to do if a file already exists with the same name. Override, which is the default, replaces the existing file. - Append - adds content to the existing file. - Fail - throws a GenericFileOperationException, indicating that there is already an existing file. - Ignore - silently ignores the problem and does not override the existing file, but assumes everything is okay. - Move - option requires to use the moveExisting option to be configured as well. [...]
 | *camel.sink.endpoint.flatten* | Flatten is used to flatten the file name path to strip any leading paths, so it's just the file name. This allows you to consume recursively into sub-directories, but when you eg write the files to another directory they will be written in a single directory. Setting this to true on the producer enforces that any file name in CamelFileName header will be stripped for any leading paths. | false | false | MEDIUM
 | *camel.sink.endpoint.jailStartingDirectory* | Used for jailing (restricting) writing files to the starting directory (and sub) only. This is enabled by default to not allow Camel to write files to outside directories (to be more secured out of the box). You can turn this off to allow writing files to directories outside the starting directory, such as parent or root folders. | true | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-google-pubsub-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-google-pubsub-kafka-sink-connector.adoc
index 292449e..5a44594 100644
--- a/docs/modules/ROOT/pages/connectors/camel-google-pubsub-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-google-pubsub-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.googlepubsub.CamelGooglepubsubSi
 ----
 
 
-The camel-google-pubsub sink connector supports 17 options, which are listed below.
+The camel-google-pubsub sink connector supports 18 options, which are listed below.
 
 
 
@@ -37,6 +37,7 @@ The camel-google-pubsub sink connector supports 17 options, which are listed bel
 | *camel.sink.endpoint.concurrentConsumers* | The number of parallel streams consuming from the subscription | "1" | false | MEDIUM
 | *camel.sink.endpoint.loggerId* | Logger ID to use when a match to the parent route required | null | false | MEDIUM
 | *camel.sink.endpoint.maxMessagesPerPoll* | The max number of messages to receive from the server in a single API call | "1" | false | MEDIUM
+| *camel.sink.endpoint.serviceAccountKey* | The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.sink.endpoint.synchronousPull* | Synchronously pull batches of messages | 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.messageOrderingEnabled* | Should message ordering be enabled | false | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-google-pubsub-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-google-pubsub-kafka-source-connector.adoc
index 316316c..0f1018c 100644
--- a/docs/modules/ROOT/pages/connectors/camel-google-pubsub-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-google-pubsub-kafka-source-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.googlepubsub.CamelGooglepubsubSo
 ----
 
 
-The camel-google-pubsub source connector supports 14 options, which are listed below.
+The camel-google-pubsub source connector supports 15 options, which are listed below.
 
 
 
@@ -37,6 +37,7 @@ The camel-google-pubsub source connector supports 14 options, which are listed b
 | *camel.source.endpoint.concurrentConsumers* | The number of parallel streams consuming from the subscription | "1" | false | MEDIUM
 | *camel.source.endpoint.loggerId* | Logger ID to use when a match to the parent route required | null | false | MEDIUM
 | *camel.source.endpoint.maxMessagesPerPoll* | The max number of messages to receive from the server in a single API call | "1" | false | MEDIUM
+| *camel.source.endpoint.serviceAccountKey* | The Service account key that can be used as credentials for the PubSub publisher/subscriber. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.source.endpoint.synchronousPull* | Synchronously pull batches of messages | false | 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.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-google-storage-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-google-storage-kafka-sink-connector.adoc
index a79b9b2..1065606 100644
--- a/docs/modules/ROOT/pages/connectors/camel-google-storage-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-google-storage-kafka-sink-connector.adoc
@@ -33,7 +33,7 @@ The camel-google-storage sink connector supports 19 options, which are listed be
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.bucketName* | Bucket name or ARN | null | true | HIGH
 | *camel.sink.endpoint.autoCreateBucket* | Setting the autocreation of the bucket bucketName. | true | false | MEDIUM
-| *camel.sink.endpoint.serviceAccountKey* | Service account key to authenticate an application as a service account | null | false | MEDIUM
+| *camel.sink.endpoint.serviceAccountKey* | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.sink.endpoint.storageClass* | The Cloud Storage class to use when creating the new buckets | "STANDARD" | false | MEDIUM
 | *camel.sink.endpoint.storageClient* | The storage client | null | false | MEDIUM
 | *camel.sink.endpoint.storageLocation* | The Cloud Storage location to use when creating the new buckets | "US-EAST1" | false | MEDIUM
@@ -42,7 +42,7 @@ The camel-google-storage sink connector supports 19 options, which are listed be
 | *camel.sink.endpoint.operation* | Set the operation for the producer One of: [copyObject] [listObjects] [deleteObject] [deleteBucket] [listBuckets] [getObject] [createDownloadLink] | null | false | MEDIUM
 | *camel.component.google-storage.autoCreateBucket* | Setting the autocreation of the bucket bucketName. | true | false | MEDIUM
 | *camel.component.google-storage.configuration* | The component configuration | null | false | MEDIUM
-| *camel.component.google-storage.serviceAccountKey* | Service account key to authenticate an application as a service account | null | false | MEDIUM
+| *camel.component.google-storage.serviceAccountKey* | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.component.google-storage.storageClass* | The Cloud Storage class to use when creating the new buckets | "STANDARD" | false | MEDIUM
 | *camel.component.google-storage.storageClient* | The storage client | null | false | MEDIUM
 | *camel.component.google-storage.storageLocation* | The Cloud Storage location to use when creating the new buckets | "US-EAST1" | false | MEDIUM
@@ -67,8 +67,4 @@ The camel-google-storage sink connector has no transforms out of the box.
 
 
 The camel-google-storage sink connector has no aggregation strategies out of the box.
-
-
-
-
 // kafka-connector options: END
diff --git a/docs/modules/ROOT/pages/connectors/camel-google-storage-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-google-storage-kafka-source-connector.adoc
index 7fe6544..a4cb769 100644
--- a/docs/modules/ROOT/pages/connectors/camel-google-storage-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-google-storage-kafka-source-connector.adoc
@@ -33,7 +33,7 @@ The camel-google-storage source connector supports 43 options, which are listed
 | Name | Description | Default | Required | Priority
 | *camel.source.path.bucketName* | Bucket name or ARN | null | true | HIGH
 | *camel.source.endpoint.autoCreateBucket* | Setting the autocreation of the bucket bucketName. | true | false | MEDIUM
-| *camel.source.endpoint.serviceAccountKey* | Service account key to authenticate an application as a service account | null | false | MEDIUM
+| *camel.source.endpoint.serviceAccountKey* | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.source.endpoint.storageClass* | The Cloud Storage class to use when creating the new buckets | "STANDARD" | false | MEDIUM
 | *camel.source.endpoint.storageClient* | The storage client | null | false | MEDIUM
 | *camel.source.endpoint.storageLocation* | The Cloud Storage location to use when creating the new buckets | "US-EAST1" | false | MEDIUM
@@ -63,7 +63,7 @@ The camel-google-storage source connector supports 43 options, which are listed
 | *camel.source.endpoint.useFixedDelay* | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | false | MEDIUM
 | *camel.component.google-storage.autoCreateBucket* | Setting the autocreation of the bucket bucketName. | true | false | MEDIUM
 | *camel.component.google-storage.configuration* | The component configuration | null | false | MEDIUM
-| *camel.component.google-storage.serviceAccountKey* | Service account key to authenticate an application as a service account | null | false | MEDIUM
+| *camel.component.google-storage.serviceAccountKey* | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | null | false | MEDIUM
 | *camel.component.google-storage.storageClass* | The Cloud Storage class to use when creating the new buckets | "STANDARD" | false | MEDIUM
 | *camel.component.google-storage.storageClient* | The storage client | null | false | MEDIUM
 | *camel.component.google-storage.storageLocation* | The Cloud Storage location to use when creating the new buckets | "US-EAST1" | false | MEDIUM
@@ -91,8 +91,4 @@ The camel-google-storage source connector has no transforms out of the box.
 
 
 The camel-google-storage source connector has no aggregation strategies out of the box.
-
-
-
-
 // kafka-connector options: END
diff --git a/docs/modules/ROOT/pages/connectors/camel-http-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-http-kafka-sink-connector.adoc
index 88eecea..231508a 100644
--- a/docs/modules/ROOT/pages/connectors/camel-http-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-http-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.http.CamelHttpSinkConnector
 ----
 
 
-The camel-http sink connector supports 76 options, which are listed below.
+The camel-http sink connector supports 88 options, which are listed below.
 
 
 
@@ -37,7 +37,7 @@ The camel-http sink connector supports 76 options, which are listed below.
 | *camel.sink.endpoint.httpBinding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | null | false | MEDIUM
 | *camel.sink.endpoint.bridgeEndpoint* | If the option is true, HttpProducer will ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back. | false | false | MEDIUM
 | *camel.sink.endpoint.chunked* | If this option is false the Servlet will disable the HTTP streaming and set the content-length header on the response | true | false | MEDIUM
-| *camel.sink.endpoint.clearExpiredCookies* | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. | true | false | MEDIUM
+| *camel.sink.endpoint.clearExpiredCookies* | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too. | true | false | MEDIUM
 | *camel.sink.endpoint.connectionClose* | Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false. | false | false | MEDIUM
 | *camel.sink.endpoint.copyHeaders* | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers). | true | false | MEDIUM
 | *camel.sink.endpoint.customHostHeader* | To use custom host header for producer. When not set in query will be ignored. When set will override host header derived from url. | null | false | MEDIUM
@@ -52,6 +52,8 @@ The camel-http sink connector supports 76 options, which are listed below.
 | *camel.sink.endpoint.deleteWithBody* | Whether the HTTP DELETE should include the message body or not. By default HTTP DELETE do not include any HTTP body. However in some rare cases users may need to be able to include the message body. | false | false | MEDIUM
 | *camel.sink.endpoint.getWithBody* | Whether the HTTP GET should include the message body or not. By default HTTP GET do not include any HTTP body. However in some rare cases users may need to be able to include the message body. | false | false | MEDIUM
 | *camel.sink.endpoint.okStatusCodeRange* | The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included. | "200-299" | false | MEDIUM
+| *camel.sink.endpoint.skipRequestHeaders* | Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
+| *camel.sink.endpoint.skipResponseHeaders* | Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
 | *camel.sink.endpoint.clientBuilder* | Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint. | null | false | MEDIUM
 | *camel.sink.endpoint.clientConnectionManager* | To use a custom HttpClientConnectionManager to manage connections | null | false | MEDIUM
 | *camel.sink.endpoint.connectionsPerRoute* | The maximum number of connections per route. | 20 | false | MEDIUM
@@ -81,18 +83,28 @@ The camel-http sink connector supports 76 options, which are listed below.
 | *camel.sink.endpoint.sslContextParameters* | To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need. | null | false | MEDIUM
 | *camel.sink.endpoint.x509HostnameVerifier* | To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier | null | false | MEDIUM
 | *camel.component.http.cookieStore* | To use a custom org.apache.http.client.CookieStore. By default the org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to be a noop cookie store as cookie shouldn't be stored as we are just bridging (eg acting as a proxy). | null | false | MEDIUM
+| *camel.component.http.copyHeaders* | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers). | true | false | MEDIUM
 | *camel.component.http.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 cr [...]
 | *camel.component.http.responsePayloadStreaming Threshold* | This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode. | 8192 | false | MEDIUM
+| *camel.component.http.skipRequestHeaders* | Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
+| *camel.component.http.skipResponseHeaders* | Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
 | *camel.component.http.allowJavaSerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
+| *camel.component.http.authCachingDisabled* | Disables authentication scheme caching | false | false | MEDIUM
+| *camel.component.http.automaticRetriesDisabled* | Disables automatic request recovery and re-execution | false | false | MEDIUM
 | *camel.component.http.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.http.clientConnectionManager* | To use a custom and shared HttpClientConnectionManager to manage connections. If this has been configured then this is always used for all endpoints created by this component. | null | false | MEDIUM
 | *camel.component.http.connectionsPerRoute* | The maximum number of connections per route. | 20 | false | MEDIUM
+| *camel.component.http.connectionStateDisabled* | Disables connection state tracking | false | false | MEDIUM
 | *camel.component.http.connectionTimeToLive* | The time for connection to live, the time unit is millisecond, the default value is always keep alive. | null | false | MEDIUM
+| *camel.component.http.contentCompressionDisabled* | Disables automatic content decompression | false | false | MEDIUM
+| *camel.component.http.cookieManagementDisabled* | Disables state (cookie) management | false | false | MEDIUM
+| *camel.component.http.defaultUserAgentDisabled* | Disables the default user agent set by this builder if none has been provided by the user | false | false | MEDIUM
 | *camel.component.http.httpBinding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | null | false | MEDIUM
 | *camel.component.http.httpClientConfigurer* | To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used. | null | false | MEDIUM
 | *camel.component.http.httpConfiguration* | To use the shared HttpConfiguration as base configuration. | null | false | MEDIUM
 | *camel.component.http.httpContext* | To use a custom org.apache.http.protocol.HttpContext when executing requests. | null | false | MEDIUM
 | *camel.component.http.maxTotalConnections* | The maximum number of connections. | 200 | false | MEDIUM
+| *camel.component.http.redirectHandlingDisabled* | Disables automatic redirect handling | false | false | MEDIUM
 | *camel.component.http.headerFilterStrategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | null | false | MEDIUM
 | *camel.component.http.proxyAuthDomain* | Proxy authentication domain to use | null | false | MEDIUM
 | *camel.component.http.proxyAuthHost* | Proxy authentication host | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-https-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-https-kafka-sink-connector.adoc
index 672be73..5c19060 100644
--- a/docs/modules/ROOT/pages/connectors/camel-https-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-https-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.https.CamelHttpsSinkConnector
 ----
 
 
-The camel-https sink connector supports 76 options, which are listed below.
+The camel-https sink connector supports 88 options, which are listed below.
 
 
 
@@ -37,7 +37,7 @@ The camel-https sink connector supports 76 options, which are listed below.
 | *camel.sink.endpoint.httpBinding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | null | false | MEDIUM
 | *camel.sink.endpoint.bridgeEndpoint* | If the option is true, HttpProducer will ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back. | false | false | MEDIUM
 | *camel.sink.endpoint.chunked* | If this option is false the Servlet will disable the HTTP streaming and set the content-length header on the response | true | false | MEDIUM
-| *camel.sink.endpoint.clearExpiredCookies* | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. | true | false | MEDIUM
+| *camel.sink.endpoint.clearExpiredCookies* | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too. | true | false | MEDIUM
 | *camel.sink.endpoint.connectionClose* | Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false. | false | false | MEDIUM
 | *camel.sink.endpoint.copyHeaders* | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers). | true | false | MEDIUM
 | *camel.sink.endpoint.customHostHeader* | To use custom host header for producer. When not set in query will be ignored. When set will override host header derived from url. | null | false | MEDIUM
@@ -52,6 +52,8 @@ The camel-https sink connector supports 76 options, which are listed below.
 | *camel.sink.endpoint.deleteWithBody* | Whether the HTTP DELETE should include the message body or not. By default HTTP DELETE do not include any HTTP body. However in some rare cases users may need to be able to include the message body. | false | false | MEDIUM
 | *camel.sink.endpoint.getWithBody* | Whether the HTTP GET should include the message body or not. By default HTTP GET do not include any HTTP body. However in some rare cases users may need to be able to include the message body. | false | false | MEDIUM
 | *camel.sink.endpoint.okStatusCodeRange* | The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included. | "200-299" | false | MEDIUM
+| *camel.sink.endpoint.skipRequestHeaders* | Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
+| *camel.sink.endpoint.skipResponseHeaders* | Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
 | *camel.sink.endpoint.clientBuilder* | Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint. | null | false | MEDIUM
 | *camel.sink.endpoint.clientConnectionManager* | To use a custom HttpClientConnectionManager to manage connections | null | false | MEDIUM
 | *camel.sink.endpoint.connectionsPerRoute* | The maximum number of connections per route. | 20 | false | MEDIUM
@@ -81,18 +83,28 @@ The camel-https sink connector supports 76 options, which are listed below.
 | *camel.sink.endpoint.sslContextParameters* | To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need. | null | false | MEDIUM
 | *camel.sink.endpoint.x509HostnameVerifier* | To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier | null | false | MEDIUM
 | *camel.component.https.cookieStore* | To use a custom org.apache.http.client.CookieStore. By default the org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to be a noop cookie store as cookie shouldn't be stored as we are just bridging (eg acting as a proxy). | null | false | MEDIUM
+| *camel.component.https.copyHeaders* | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers). | true | false | MEDIUM
 | *camel.component.https.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.https.responsePayloadStreaming Threshold* | This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode. | 8192 | false | MEDIUM
+| *camel.component.https.skipRequestHeaders* | Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
+| *camel.component.https.skipResponseHeaders* | Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
 | *camel.component.https.allowJavaSerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
+| *camel.component.https.authCachingDisabled* | Disables authentication scheme caching | false | false | MEDIUM
+| *camel.component.https.automaticRetriesDisabled* | Disables automatic request recovery and re-execution | false | false | MEDIUM
 | *camel.component.https.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.https.clientConnectionManager* | To use a custom and shared HttpClientConnectionManager to manage connections. If this has been configured then this is always used for all endpoints created by this component. | null | false | MEDIUM
 | *camel.component.https.connectionsPerRoute* | The maximum number of connections per route. | 20 | false | MEDIUM
+| *camel.component.https.connectionStateDisabled* | Disables connection state tracking | false | false | MEDIUM
 | *camel.component.https.connectionTimeToLive* | The time for connection to live, the time unit is millisecond, the default value is always keep alive. | null | false | MEDIUM
+| *camel.component.https.contentCompressionDisabled* | Disables automatic content decompression | false | false | MEDIUM
+| *camel.component.https.cookieManagementDisabled* | Disables state (cookie) management | false | false | MEDIUM
+| *camel.component.https.defaultUserAgentDisabled* | Disables the default user agent set by this builder if none has been provided by the user | false | false | MEDIUM
 | *camel.component.https.httpBinding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | null | false | MEDIUM
 | *camel.component.https.httpClientConfigurer* | To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used. | null | false | MEDIUM
 | *camel.component.https.httpConfiguration* | To use the shared HttpConfiguration as base configuration. | null | false | MEDIUM
 | *camel.component.https.httpContext* | To use a custom org.apache.http.protocol.HttpContext when executing requests. | null | false | MEDIUM
 | *camel.component.https.maxTotalConnections* | The maximum number of connections. | 200 | false | MEDIUM
+| *camel.component.https.redirectHandlingDisabled* | Disables automatic redirect handling | false | false | MEDIUM
 | *camel.component.https.headerFilterStrategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | null | false | MEDIUM
 | *camel.component.https.proxyAuthDomain* | Proxy authentication domain to use | null | false | MEDIUM
 | *camel.component.https.proxyAuthHost* | Proxy authentication host | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-resteasy-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-resteasy-kafka-sink-connector.adoc
index fb827a3..47ca60f 100644
--- a/docs/modules/ROOT/pages/connectors/camel-resteasy-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-resteasy-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.resteasy.CamelResteasySinkConnec
 ----
 
 
-The camel-resteasy sink connector supports 32 options, which are listed below.
+The camel-resteasy sink connector supports 44 options, which are listed below.
 
 
 
@@ -38,7 +38,7 @@ The camel-resteasy sink connector supports 32 options, which are listed below.
 | *camel.sink.endpoint.servletName* | Sets the servlet name | null | false | MEDIUM
 | *camel.sink.endpoint.transferException* | If enabled and an Exchange failed processing on the consumer side, and if the caused Exception was send back serialized in the response as a application/x-java-serialized-object content type. On the producer side the exception will be deserialized and thrown as is, instead of the HttpOperationFailedException. The caused exception is required to be serialized. This is by default turned off. If you enable this then be aware that Java will deseria [...]
 | *camel.sink.endpoint.bridgeEndpoint* | If the option is true, HttpProducer will ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back. | false | false | MEDIUM
-| *camel.sink.endpoint.clearExpiredCookies* | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. | true | false | MEDIUM
+| *camel.sink.endpoint.clearExpiredCookies* | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. If the component has disabled cookie management then this option is disabled too. | true | false | MEDIUM
 | *camel.sink.endpoint.connectionClose* | Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false. | false | false | MEDIUM
 | *camel.sink.endpoint.copyHeaders* | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers). | true | false | MEDIUM
 | *camel.sink.endpoint.customHostHeader* | To use custom host header for producer. When not set in query will be ignored. When set will override host header derived from url. | null | false | MEDIUM
@@ -51,6 +51,8 @@ The camel-resteasy sink connector supports 32 options, which are listed below.
 | *camel.sink.endpoint.deleteWithBody* | Whether the HTTP DELETE should include the message body or not. By default HTTP DELETE do not include any HTTP body. However in some rare cases users may need to be able to include the message body. | false | false | MEDIUM
 | *camel.sink.endpoint.getWithBody* | Whether the HTTP GET should include the message body or not. By default HTTP GET do not include any HTTP body. However in some rare cases users may need to be able to include the message body. | false | false | MEDIUM
 | *camel.sink.endpoint.okStatusCodeRange* | The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included. | "200-299" | false | MEDIUM
+| *camel.sink.endpoint.skipRequestHeaders* | Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
+| *camel.sink.endpoint.skipResponseHeaders* | Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
 | *camel.sink.endpoint.headerFilterStrategy* | To use a custom HeaderFilterStrategy to filter header to and from Camel message. | null | false | MEDIUM
 | *camel.sink.endpoint.setHttpResponseDuring Processing* | Sets the flag to use the endpoint where you can either populate camel exchange from servlet response or use request itself which may be thought as if it is a proxy. | null | false | MEDIUM
 | *camel.sink.endpoint.skipServletProcessing* | Sets the flag to use skip servlet processing and let camel take over processing | null | false | MEDIUM
@@ -58,10 +60,20 @@ The camel-resteasy sink connector supports 32 options, which are listed below.
 | *camel.sink.endpoint.proxyClientClass* | Sets the resteasy proxyClientClass | null | false | MEDIUM
 | *camel.sink.endpoint.password* | Sets the password | null | false | MEDIUM
 | *camel.sink.endpoint.username* | Sets the username | null | false | MEDIUM
+| *camel.component.resteasy.copyHeaders* | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers). | true | false | MEDIUM
 | *camel.component.resteasy.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.resteasy.responsePayloadStreaming Threshold* | This threshold in bytes controls whether the response payload should be stored in memory as a byte array or be streaming based. Set this to -1 to always use streaming mode. | 8192 | false | MEDIUM
+| *camel.component.resteasy.skipRequestHeaders* | Whether to skip mapping all the Camel headers as HTTP request headers. If there are no data from Camel headers needed to be included in the HTTP request then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
+| *camel.component.resteasy.skipResponseHeaders* | Whether to skip mapping all the HTTP response headers to Camel headers. If there are no data needed from HTTP headers then this can avoid parsing overhead with many object allocations for the JVM garbage collector. | false | false | MEDIUM
 | *camel.component.resteasy.allowJavaSerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
+| *camel.component.resteasy.authCachingDisabled* | Disables authentication scheme caching | false | false | MEDIUM
+| *camel.component.resteasy.automaticRetriesDisabled* | Disables automatic request recovery and re-execution | false | false | MEDIUM
 | *camel.component.resteasy.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
+| *camel.component.resteasy.connectionStateDisabled* | Disables connection state tracking | false | false | MEDIUM
+| *camel.component.resteasy.contentCompression Disabled* | Disables automatic content decompression | false | false | MEDIUM
+| *camel.component.resteasy.cookieManagementDisabled* | Disables state (cookie) management | false | false | MEDIUM
+| *camel.component.resteasy.defaultUserAgentDisabled* | Disables the default user agent set by this builder if none has been provided by the user | false | false | MEDIUM
+| *camel.component.resteasy.redirectHandlingDisabled* | Disables automatic redirect handling | false | false | MEDIUM
 | *camel.component.resteasy.headerFilterStrategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | null | false | MEDIUM
 |===
 
diff --git a/docs/modules/ROOT/pages/connectors/camel-resteasy-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-resteasy-kafka-source-connector.adoc
index b66efe8..5e30a30 100644
--- a/docs/modules/ROOT/pages/connectors/camel-resteasy-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-resteasy-kafka-source-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.resteasy.CamelResteasySourceConn
 ----
 
 
-The camel-resteasy source connector supports 32 options, which are listed below.
+The camel-resteasy source connector supports 39 options, which are listed below.
 
 
 
@@ -61,7 +61,14 @@ The camel-resteasy source connector supports 32 options, which are listed below.
 | *camel.component.resteasy.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.resteasy.proxyConsumersClasses* | Proxy classes for consumer endpoints. Multiple classes can be separated by comma. | null | false | MEDIUM
 | *camel.component.resteasy.allowJavaSerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
+| *camel.component.resteasy.authCachingDisabled* | Disables authentication scheme caching | false | false | MEDIUM
+| *camel.component.resteasy.automaticRetriesDisabled* | Disables automatic request recovery and re-execution | false | false | MEDIUM
 | *camel.component.resteasy.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
+| *camel.component.resteasy.connectionStateDisabled* | Disables connection state tracking | false | false | MEDIUM
+| *camel.component.resteasy.contentCompression Disabled* | Disables automatic content decompression | false | false | MEDIUM
+| *camel.component.resteasy.cookieManagementDisabled* | Disables state (cookie) management | false | false | MEDIUM
+| *camel.component.resteasy.defaultUserAgentDisabled* | Disables the default user agent set by this builder if none has been provided by the user | false | false | MEDIUM
+| *camel.component.resteasy.redirectHandlingDisabled* | Disables automatic redirect handling | false | false | MEDIUM
 | *camel.component.resteasy.headerFilterStrategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | null | false | MEDIUM
 |===
 
diff --git a/docs/modules/ROOT/pages/connectors/camel-slack-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-slack-kafka-sink-connector.adoc
index fe364f0..e23c945 100644
--- a/docs/modules/ROOT/pages/connectors/camel-slack-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-slack-kafka-sink-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.slack.CamelSlackSinkConnector
 ----
 
 
-The camel-slack sink connector supports 9 options, which are listed below.
+The camel-slack sink connector supports 11 options, which are listed below.
 
 
 
@@ -32,6 +32,7 @@ The camel-slack sink connector supports 9 options, which are listed below.
 |===
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.channel* | The channel name (syntax #name) or slackuser (syntax userName) to send a message directly to an user. | null | true | HIGH
+| *camel.sink.endpoint.token* | The token to use | null | false | MEDIUM
 | *camel.sink.endpoint.iconEmoji* | Use a Slack emoji as an avatar | null | false | LOW
 | *camel.sink.endpoint.iconUrl* | The avatar that the component will use when sending message to a channel or user. | null | false | LOW
 | *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 [...]
@@ -39,6 +40,7 @@ The camel-slack sink connector supports 9 options, which are listed below.
 | *camel.sink.endpoint.webhookUrl* | The incoming webhook URL | null | false | MEDIUM
 | *camel.component.slack.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.slack.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
+| *camel.component.slack.token* | The token to use | null | false | MEDIUM
 | *camel.component.slack.webhookUrl* | The incoming webhook URL | null | false | MEDIUM
 |===
 
diff --git a/docs/modules/ROOT/pages/connectors/camel-slack-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-slack-kafka-source-connector.adoc
index c3501d7..3d842c7 100644
--- a/docs/modules/ROOT/pages/connectors/camel-slack-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-slack-kafka-source-connector.adoc
@@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.slack.CamelSlackSourceConnector
 ----
 
 
-The camel-slack source connector supports 26 options, which are listed below.
+The camel-slack source connector supports 29 options, which are listed below.
 
 
 
@@ -32,11 +32,13 @@ The camel-slack source connector supports 26 options, which are listed below.
 |===
 | Name | Description | Default | Required | Priority
 | *camel.source.path.channel* | The channel name (syntax #name) or slackuser (syntax userName) to send a message directly to an user. | null | true | HIGH
+| *camel.source.endpoint.token* | The token to use | 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.conversationType* | Type of conversation One of: [PUBLIC_CHANNEL] [PRIVATE_CHANNEL] [MPIM] [IM] | "PUBLIC_CHANNEL" | false | MEDIUM
 | *camel.source.endpoint.maxResults* | The Max Result for the poll | "10" | false | MEDIUM
+| *camel.source.endpoint.naturalOrder* | Create exchanges in natural order (oldest to newest) or not | false | false | MEDIUM
 | *camel.source.endpoint.sendEmptyMessageWhenIdle* | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | false | MEDIUM
 | *camel.source.endpoint.serverUrl* | The Server URL of the Slack instance | "https://slack.com" | false | MEDIUM
-| *camel.source.endpoint.token* | The token to use | 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
 | *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.pollStrategy* | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | null | false | MEDIUM
@@ -56,6 +58,7 @@ The camel-slack source connector supports 26 options, which are listed below.
 | *camel.source.endpoint.useFixedDelay* | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | false | MEDIUM
 | *camel.component.slack.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.slack.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
+| *camel.component.slack.token* | The token to use | null | false | MEDIUM
 | *camel.component.slack.webhookUrl* | The incoming webhook URL | null | false | MEDIUM
 |===