You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by va...@apache.org on 2022/05/03 09:32:28 UTC

[camel-kafka-connector] 02/03: chore: regen after kamelet catalog update.

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

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

commit 2f98db207bdd3024d3e221526675759679a5d334
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Tue May 3 01:09:18 2022 +0200

    chore: regen after kamelet catalog update.
---
 .../connectors/camel-aws-cloudwatch-sink-sink.json |  30 +++-
 .../connectors/camel-aws-ddb-sink-sink.json        |  71 +++++++++
 .../camel-aws-ddb-streams-source-source.json       |  30 +++-
 .../connectors/camel-aws-ec2-sink-sink.json        |  30 +++-
 .../camel-aws-kinesis-firehose-sink-sink.json      |  30 +++-
 .../connectors/camel-aws-kinesis-sink-sink.json    |  30 +++-
 .../camel-aws-kinesis-source-source.json           |  30 +++-
 .../connectors/camel-aws-lambda-sink-sink.json     |  17 +-
 .../connectors/camel-aws-s3-sink-sink.json         |  36 ++++-
 .../connectors/camel-aws-s3-source-source.json     |  30 +++-
 .../camel-aws-s3-streaming-upload-sink-sink.json   |  30 +++-
 .../camel-aws-secrets-manager-sink-sink.json       |  17 +-
 .../connectors/camel-aws-ses-sink-sink.json        |  44 +++++
 .../connectors/camel-aws-sns-fifo-sink-sink.json   |  30 +++-
 .../connectors/camel-aws-sns-sink-sink.json        |  30 +++-
 .../connectors/camel-aws-sqs-batch-sink-sink.json  |  31 +++-
 .../connectors/camel-aws-sqs-fifo-sink-sink.json   |  31 +++-
 .../connectors/camel-aws-sqs-sink-sink.json        |  31 +++-
 .../connectors/camel-aws-sqs-source-source.json    |  37 ++++-
 .../camel-azure-servicebus-sink-sink.json          |  25 +++
 .../camel-azure-servicebus-source-source.json      |  38 +++++
 ...zure-storage-blob-changefeed-source-source.json |  32 ++++
 .../connectors/camel-cassandra-sink-sink.json      |   4 +-
 .../connectors/camel-cassandra-source-source.json  |   2 +-
 .../resources/connectors/camel-file-sink.json      |   2 +-
 .../resources/connectors/camel-file-source.json    |   6 -
 .../camel-github-commit-source-source.json         |  44 +++++
 .../camel-github-event-source-source.json          |  31 ++++
 ...l-github-pullrequest-comment-source-source.json |  31 ++++
 .../camel-github-pullrequest-source-source.json    |  31 ++++
 .../connectors/camel-github-tag-source-source.json |  31 ++++
 .../camel-google-bigquery-sink-sink.json           |  37 +++++
 .../camel-google-sheets-source-source.json         |  10 +-
 .../camel-jms-apache-activemq-sink-sink.json       |  46 ++++++
 .../camel-jms-apache-activemq-source-source.json   |  46 ++++++
 .../connectors/camel-kafka-source-source.json      |   7 +
 .../connectors/camel-kafka-ssl-sink-sink.json      |  77 +++++++++
 .../connectors/camel-kafka-ssl-source-source.json  | 118 ++++++++++++++
 .../connectors/camel-mqtt5-sink-sink.json          |  37 +++++
 .../connectors/camel-mqtt5-source-source.json      |  44 +++++
 .../connectors/camel-netty-http-sink.json          |  28 ++--
 .../resources/connectors/camel-netty-sink.json     |  28 ++--
 .../camel-oracle-database-sink-sink.json           |  50 ++++++
 .../camel-oracle-database-source-source.json       |  56 +++++++
 .../connectors/camel-rest-openapi-sink-sink.json   |  25 +++
 .../camel-salesforce-create-sink-sink.json         |  50 ++++++
 .../camel-salesforce-delete-sink-sink.json         |  44 +++++
 .../camel-salesforce-update-sink-sink.json         |  56 +++++++
 .../connectors/camel-slack-source-source.json      |   8 +-
 .../resources/descriptors/connectors.properties    |  24 ++-
 .../pom.xml                                        |   4 +
 .../resources/camel-aws-cloudwatch-sink-sink.json  |  30 +++-
 .../CamelAwscloudwatchsinkSinkConnector.properties |   5 -
 .../CamelAwscloudwatchsinkSinkConnectorConfig.java |  16 +-
 .../kamelets/aws-cloudwatch-sink.kamelet.yaml      |  41 ++++-
 .../pom.xml                                        |  19 +--
 .../descriptors/connector-sink.properties          |   1 +
 .../resources/camel-aws-ddb-sink-sink.json         |  71 +++++++++
 .../src/main/assembly/package.xml                  |   0
 .../CamelAwsddbsinkSinkConnector.properties}       |   9 +-
 .../awsddbsink/CamelAwsddbsinkSinkConnector.java}  |  10 +-
 .../CamelAwsddbsinkSinkConnectorConfig.java        |  80 ++++++++++
 .../awsddbsink/CamelAwsddbsinkSinkTask.java}       |  16 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../resources/kamelets/aws-ddb-sink.kamelet.yaml}  |  97 +++++++----
 .../camel-aws-ddb-streams-source-source.json       |  30 +++-
 ...elAwsddbstreamssourceSourceConnector.properties |   5 -
 ...elAwsddbstreamssourceSourceConnectorConfig.java |  16 +-
 .../kamelets/aws-ddb-streams-source.kamelet.yaml   |  37 ++++-
 .../camel-aws-ec2-sink-kafka-connector/pom.xml     |   4 +
 .../resources/camel-aws-ec2-sink-sink.json         |  30 +++-
 .../CamelAwsec2sinkSinkConnector.properties        |   5 -
 .../CamelAwsec2sinkSinkConnectorConfig.java        |  16 +-
 .../resources/kamelets/aws-ec2-sink.kamelet.yaml   |  38 ++++-
 .../camel-aws-kinesis-firehose-sink-sink.json      |  30 +++-
 ...lAwskinesisfirehosesinkSinkConnector.properties |   5 -
 ...lAwskinesisfirehosesinkSinkConnectorConfig.java |  16 +-
 .../aws-kinesis-firehose-sink.kamelet.yaml         |  37 ++++-
 .../camel-aws-kinesis-sink-kafka-connector/pom.xml |   4 +
 .../resources/camel-aws-kinesis-sink-sink.json     |  30 +++-
 .../CamelAwskinesissinkSinkConnector.properties    |   5 -
 .../CamelAwskinesissinkSinkConnectorConfig.java    |  16 +-
 .../kamelets/aws-kinesis-sink.kamelet.yaml         |  41 ++++-
 .../pom.xml                                        |   8 +-
 .../resources/camel-aws-kinesis-source-source.json |  30 +++-
 ...CamelAwskinesissourceSourceConnector.properties |   5 -
 ...CamelAwskinesissourceSourceConnectorConfig.java |  16 +-
 .../kamelets/aws-kinesis-source.kamelet.yaml       |  44 +++--
 .../resources/camel-aws-lambda-sink-sink.json      |  17 +-
 .../CamelAwslambdasinkSinkConnector.properties     |   5 -
 .../CamelAwslambdasinkSinkConnectorConfig.java     |   8 +-
 .../kamelets/aws-lambda-sink.kamelet.yaml          |  26 ++-
 .../pom.xml                                        |   4 +-
 .../CamelAwsredshiftsinkSinkConnector.properties   |   1 -
 .../kamelets/aws-redshift-sink.kamelet.yaml        |   8 +-
 .../pom.xml                                        |   4 +-
 ...amelAwsredshiftsourceSourceConnector.properties |   1 -
 .../kamelets/aws-redshift-source.kamelet.yaml      |   8 +-
 .../camel-aws-s3-sink-kafka-connector/pom.xml      |   4 +
 .../resources/camel-aws-s3-sink-sink.json          |  36 ++++-
 .../CamelAwss3sinkSinkConnector.properties         |   5 -
 .../CamelAwss3sinkSinkConnectorConfig.java         |  20 ++-
 .../resources/kamelets/aws-s3-sink.kamelet.yaml    |  54 +++++--
 .../resources/camel-aws-s3-source-source.json      |  30 +++-
 .../CamelAwss3sourceSourceConnector.properties     |   5 -
 .../CamelAwss3sourceSourceConnectorConfig.java     |  16 +-
 .../resources/kamelets/aws-s3-source.kamelet.yaml  |  41 +++--
 .../camel-aws-s3-streaming-upload-sink-sink.json   |  30 +++-
 ...wss3streaminguploadsinkSinkConnector.properties |   5 -
 ...wss3streaminguploadsinkSinkConnectorConfig.java |  16 +-
 .../aws-s3-streaming-upload-sink.kamelet.yaml      |  37 ++++-
 .../pom.xml                                        |   4 +
 .../camel-aws-secrets-manager-sink-sink.json       |  17 +-
 ...elAwssecretsmanagersinkSinkConnector.properties |   5 -
 ...elAwssecretsmanagersinkSinkConnectorConfig.java |   8 +-
 .../kamelets/aws-secrets-manager-sink.kamelet.yaml |  25 ++-
 .../pom.xml                                        |  10 +-
 .../descriptors/connector-sink.properties          |   1 +
 .../resources/camel-aws-ses-sink-sink.json         |  44 +++++
 .../src/main/assembly/package.xml                  |   0
 .../CamelAwssessinkSinkConnector.properties}       |  11 +-
 .../awssessink/CamelAwssessinkSinkConnector.java}  |  10 +-
 .../CamelAwssessinkSinkConnectorConfig.java        |  64 ++++++++
 .../awssessink/CamelAwssessinkSinkTask.java}       |  16 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../resources/kamelets/aws-ses-sink.kamelet.yaml   | 143 +++++++++++++++++
 .../resources/camel-aws-sns-fifo-sink-sink.json    |  30 +++-
 .../CamelAwssnsfifosinkSinkConnector.properties    |   5 -
 .../CamelAwssnsfifosinkSinkConnectorConfig.java    |  16 +-
 .../kamelets/aws-sns-fifo-sink.kamelet.yaml        |  46 ++++--
 .../camel-aws-sns-sink-kafka-connector/pom.xml     |   4 +
 .../resources/camel-aws-sns-sink-sink.json         |  30 +++-
 .../CamelAwssnssinkSinkConnector.properties        |   5 -
 .../CamelAwssnssinkSinkConnectorConfig.java        |  16 +-
 .../resources/kamelets/aws-sns-sink.kamelet.yaml   |  40 ++++-
 .../resources/camel-aws-sqs-batch-sink-sink.json   |  31 +++-
 .../CamelAwssqsbatchsinkSinkConnector.properties   |   5 -
 .../CamelAwssqsbatchsinkSinkConnectorConfig.java   |  18 ++-
 .../kamelets/aws-sqs-batch-sink.kamelet.yaml       |  42 +++--
 .../resources/camel-aws-sqs-fifo-sink-sink.json    |  31 +++-
 .../CamelAwssqsfifosinkSinkConnector.properties    |   5 -
 .../CamelAwssqsfifosinkSinkConnectorConfig.java    |  18 ++-
 .../kamelets/aws-sqs-fifo-sink.kamelet.yaml        |  53 ++++--
 .../resources/camel-aws-sqs-sink-sink.json         |  31 +++-
 .../CamelAwssqssinkSinkConnector.properties        |   5 -
 .../CamelAwssqssinkSinkConnectorConfig.java        |  18 ++-
 .../resources/kamelets/aws-sqs-sink.kamelet.yaml   |  42 +++--
 .../resources/camel-aws-sqs-source-source.json     |  37 ++++-
 .../CamelAwssqssourceSourceConnector.properties    |   5 -
 .../CamelAwssqssourceSourceConnectorConfig.java    |  22 ++-
 .../resources/kamelets/aws-sqs-source.kamelet.yaml |  51 +++++-
 .../examples/CamelAws2iamSinkConnector.properties  |   1 -
 .../examples/CamelAws2kmsSinkConnector.properties  |   1 -
 ...elAzurecosmosdbsourceSourceConnector.properties |   1 -
 .../kamelets/azure-cosmosdb-source.kamelet.yaml    |   4 +-
 .../pom.xml                                        |   4 +
 ...CamelAzureeventhubssinkSinkConnector.properties |   1 -
 .../kamelets/azure-eventhubs-sink.kamelet.yaml     |  19 +--
 ...lAzureeventhubssourceSourceConnector.properties |   1 -
 .../kamelets/azure-eventhubs-source.kamelet.yaml   |   4 +-
 .../pom.xml                                        |  12 +-
 .../descriptors/connector-sink.properties          |   1 +
 .../camel-azure-servicebus-sink-sink.json          |  25 +++
 .../src/main/assembly/package.xml                  |   0
 ...melAzureservicebussinkSinkConnector.properties} |  11 +-
 .../CamelAzureservicebussinkSinkConnector.java}    |  10 +-
 ...amelAzureservicebussinkSinkConnectorConfig.java |  53 ++++++
 .../CamelAzureservicebussinkSinkTask.java}         |  16 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../kamelets/azure-servicebus-sink.kamelet.yaml    |  67 ++++++++
 .../pom.xml                                        |  16 +-
 .../descriptors/connector-source.properties        |   1 +
 .../camel-azure-servicebus-source-source.json      |  38 +++++
 .../src/main/assembly/package.xml                  |   0
 ...zureservicebussourceSourceConnector.properties} |   9 +-
 ...CamelAzureservicebussourceSourceConnector.java} |  10 +-
 ...AzureservicebussourceSourceConnectorConfig.java |  61 +++++++
 .../CamelAzureservicebussourceSourceTask.java}     |   8 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../kamelets/azure-servicebus-source.kamelet.yaml  |  78 +++++++++
 .../pom.xml                                        |  16 +-
 .../descriptors/connector-source.properties        |   1 +
 ...zure-storage-blob-changefeed-source-source.json |  32 ++++
 .../src/main/assembly/package.xml                  |   0
 ...blobchangefeedsourceSourceConnector.properties} |  15 +-
 ...torageblobchangefeedsourceSourceConnector.java} |  10 +-
 ...eblobchangefeedsourceSourceConnectorConfig.java |  57 +++++++
 ...zurestorageblobchangefeedsourceSourceTask.java} |  10 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 ...re-storage-blob-changefeed-source.kamelet.yaml} |  47 ++----
 .../pom.xml                                        |   4 +
 ...melAzurestorageblobsinkSinkConnector.properties |   1 -
 .../kamelets/azure-storage-blob-sink.kamelet.yaml  |   9 +-
 ...zurestorageblobsourceSourceConnector.properties |   1 -
 .../azure-storage-blob-source.kamelet.yaml         |   4 +-
 .../pom.xml                                        |   4 +
 ...elAzurestoragequeuesinkSinkConnector.properties |   1 -
 .../kamelets/azure-storage-queue-sink.kamelet.yaml |   5 +-
 ...urestoragequeuesourceSourceConnector.properties |   1 -
 .../azure-storage-queue-source.kamelet.yaml        |   4 +-
 .../CamelBitcoinsourceSourceConnector.properties   |   1 -
 .../resources/kamelets/bitcoin-source.kamelet.yaml |   4 +-
 .../resources/camel-cassandra-sink-sink.json       |   4 +-
 .../CamelCassandrasinkSinkConnector.properties     |   1 -
 .../CamelCassandrasinkSinkConnectorConfig.java     |   8 +-
 .../resources/kamelets/cassandra-sink.kamelet.yaml |  10 +-
 .../resources/camel-cassandra-source-source.json   |   2 +-
 .../CamelCassandrasourceSourceConnector.properties |   1 -
 .../CamelCassandrasourceSourceConnectorConfig.java |   2 +-
 .../kamelets/cassandra-source.kamelet.yaml         |   6 +-
 ...amelChucknorrissourceSourceConnector.properties |   1 -
 .../kamelets/chuck-norris-source.kamelet.yaml      |   4 +-
 .../CamelCouchbasesinkSinkConnector.properties     |   1 -
 .../resources/kamelets/couchbase-sink.kamelet.yaml |   4 +-
 .../CamelCronsourceSourceConnector.properties      |   1 -
 .../resources/kamelets/cron-source.kamelet.yaml    |   4 +-
 .../docs/examples/CamelCxfSinkConnector.properties |   1 -
 .../examples/CamelCxfSourceConnector.properties    |   1 -
 .../examples/CamelCxfrsSinkConnector.properties    |   1 -
 .../examples/CamelCxfrsSourceConnector.properties  |   1 -
 .../camel-dropbox-sink-kafka-connector/pom.xml     |   4 +
 .../CamelDropboxsinkSinkConnector.properties       |   1 -
 .../resources/kamelets/dropbox-sink.kamelet.yaml   |   5 +-
 .../CamelDropboxsourceSourceConnector.properties   |   1 -
 .../resources/kamelets/dropbox-source.kamelet.yaml |   8 +-
 ...CamelEarthquakesourceSourceConnector.properties |   1 -
 .../kamelets/earthquake-source.kamelet.yaml        |  10 +-
 .../pom.xml                                        |   4 +
 ...lElasticsearchindexsinkSinkConnector.properties |   1 -
 .../kamelets/elasticsearch-index-sink.kamelet.yaml |  16 +-
 ...ticsearchsearchsourceSourceConnector.properties |   1 -
 .../elasticsearch-search-source.kamelet.yaml       |   4 +-
 .../examples/CamelExecsinkSinkConnector.properties |   1 -
 .../main/resources/kamelets/exec-sink.kamelet.yaml |   4 +-
 .../CamelFhirsourceSourceConnector.properties      |   1 -
 .../resources/kamelets/fhir-source.kamelet.yaml    |   4 +-
 .../src/generated/resources/camel-file-sink.json   |   2 +-
 .../src/generated/resources/camel-file-source.json |   6 -
 .../examples/CamelFileSinkConnector.properties     |   1 -
 .../examples/CamelFileSourceConnector.properties   |   1 -
 .../file/CamelFileSinkConnectorConfig.java         |   2 +-
 .../file/CamelFileSourceConnectorConfig.java       |   4 -
 .../CamelFilewatchsourceSourceConnector.properties |   1 -
 .../kamelets/file-watch-source.kamelet.yaml        |   4 +-
 .../examples/CamelFtpsinkSinkConnector.properties  |   1 -
 .../main/resources/kamelets/ftp-sink.kamelet.yaml  |   4 +-
 .../CamelFtpsourceSourceConnector.properties       |   1 -
 .../resources/kamelets/ftp-source.kamelet.yaml     |   4 +-
 .../examples/CamelFtpssinkSinkConnector.properties |   1 -
 .../main/resources/kamelets/ftps-sink.kamelet.yaml |   4 +-
 .../CamelFtpssourceSourceConnector.properties      |   1 -
 .../resources/kamelets/ftps-source.kamelet.yaml    |   4 +-
 .../pom.xml                                        |   6 +-
 .../descriptors/connector-source.properties        |   1 +
 .../camel-github-commit-source-source.json         |  44 +++++
 .../src/main/assembly/package.xml                  |   0
 ...elGithubcommitsourceSourceConnector.properties} |  17 +-
 .../CamelGithubcommitsourceSourceConnector.java}   |  10 +-
 ...melGithubcommitsourceSourceConnectorConfig.java |  65 ++++++++
 .../CamelGithubcommitsourceSourceTask.java}        |   8 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../kamelets/github-commit-source.kamelet.yaml}    |  28 ++--
 .../pom.xml                                        |   6 +-
 .../descriptors/connector-source.properties        |   1 +
 .../camel-github-event-source-source.json          |  31 ++++
 .../src/main/assembly/package.xml                  |   0
 ...melGithubeventsourceSourceConnector.properties} |  11 +-
 .../CamelGithubeventsourceSourceConnector.java}    |  10 +-
 ...amelGithubeventsourceSourceConnectorConfig.java |  57 +++++++
 .../CamelGithubeventsourceSourceTask.java}         |   8 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../kamelets/github-event-source.kamelet.yaml}     |  18 +--
 .../pom.xml                                        |   6 +-
 .../descriptors/connector-source.properties        |   1 +
 ...l-github-pullrequest-comment-source-source.json |  31 ++++
 .../src/main/assembly/package.xml                  |   0
 ...requestcommentsourceSourceConnector.properties} |  13 +-
 ...ubpullrequestcommentsourceSourceConnector.java} |  10 +-
 ...lrequestcommentsourceSourceConnectorConfig.java |  57 +++++++
 ...lGithubpullrequestcommentsourceSourceTask.java} |  10 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 ...github-pullrequest-comment-source.kamelet.yaml} |  18 +--
 .../pom.xml                                        |   6 +-
 .../descriptors/connector-source.properties        |   1 +
 .../camel-github-pullrequest-source-source.json    |  31 ++++
 .../src/main/assembly/package.xml                  |   0
 ...hubpullrequestsourceSourceConnector.properties} |  13 +-
 ...melGithubpullrequestsourceSourceConnector.java} |  10 +-
 ...thubpullrequestsourceSourceConnectorConfig.java |  57 +++++++
 .../CamelGithubpullrequestsourceSourceTask.java}   |   8 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../github-pullrequest-source.kamelet.yaml}        |  18 +--
 .../descriptors/connector-source.properties        |   1 -
 .../resources/camel-github-source-source.json      |  38 -----
 .../CamelGithubsourceSourceConnectorConfig.java    |  61 -------
 .../pom.xml                                        |   6 +-
 .../descriptors/connector-source.properties        |   1 +
 .../resources/camel-github-tag-source-source.json  |  31 ++++
 .../src/main/assembly/package.xml                  |   0
 ...CamelGithubtagsourceSourceConnector.properties} |  11 +-
 .../CamelGithubtagsourceSourceConnector.java}      |   8 +-
 .../CamelGithubtagsourceSourceConnectorConfig.java |  57 +++++++
 .../CamelGithubtagsourceSourceTask.java}           |   8 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../kamelets/github-tag-source.kamelet.yaml}       |  18 +--
 .../pom.xml                                        |  19 ++-
 .../descriptors/connector-sink.properties          |   1 +
 .../resources/camel-google-bigquery-sink-sink.json |  37 +++++
 .../src/main/assembly/package.xml                  |   0
 ...amelGooglebigquerysinkSinkConnector.properties} |  19 +--
 .../CamelGooglebigquerysinkSinkConnector.java}     |  10 +-
 ...CamelGooglebigquerysinkSinkConnectorConfig.java |  61 +++++++
 .../CamelGooglebigquerysinkSinkTask.java}          |  16 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../kamelets/google-bigquery-sink.kamelet.yaml     |  87 ++++++++++
 ...lGooglecalendarsourceSourceConnector.properties |   1 -
 .../kamelets/google-calendar-source.kamelet.yaml   |   4 +-
 ...amelGooglefunctionssinkSinkConnector.properties |   1 -
 .../kamelets/google-functions-sink.kamelet.yaml    |   4 +-
 ...CamelGooglemailsourceSourceConnector.properties |   1 -
 .../kamelets/google-mail-source.kamelet.yaml       |   4 +-
 .../CamelGooglepubsubsinkSinkConnector.properties  |   1 -
 .../kamelets/google-pubsub-sink.kamelet.yaml       |   4 +-
 ...melGooglepubsubsourceSourceConnector.properties |   1 -
 .../kamelets/google-pubsub-source.kamelet.yaml     |   4 +-
 .../camel-google-sheets-source-source.json         |  10 +-
 ...melGooglesheetssourceSourceConnector.properties |   5 -
 ...melGooglesheetssourceSourceConnectorConfig.java |  10 +-
 .../kamelets/google-sheets-source.kamelet.yaml     |  23 +--
 .../pom.xml                                        |   4 +
 .../CamelGooglestoragesinkSinkConnector.properties |   1 -
 .../kamelets/google-storage-sink.kamelet.yaml      |   5 +-
 ...elGooglestoragesourceSourceConnector.properties |   1 -
 .../kamelets/google-storage-source.kamelet.yaml    |   4 +-
 .../examples/CamelHdfsSinkConnector.properties     |   1 -
 .../examples/CamelHdfsSourceConnector.properties   |   1 -
 .../CamelHttpsecuredsinkSinkConnector.properties   |   1 -
 .../kamelets/http-secured-sink.kamelet.yaml        |   4 +-
 ...amelHttpsecuredsourceSourceConnector.properties |   1 -
 .../kamelets/http-secured-source.kamelet.yaml      |   4 +-
 .../examples/CamelHttpsinkSinkConnector.properties |   1 -
 .../main/resources/kamelets/http-sink.kamelet.yaml |   4 +-
 .../CamelHttpsourceSourceConnector.properties      |   1 -
 .../resources/kamelets/http-source.kamelet.yaml    |   4 +-
 .../examples/CamelHttpsSinkConnector.properties    |   1 -
 .../CamelInfinispansinkSinkConnector.properties    |   1 -
 .../kamelets/infinispan-sink.kamelet.yaml          |   4 +-
 ...CamelInfinispansourceSourceConnector.properties |   1 -
 .../kamelets/infinispan-source.kamelet.yaml        |   4 +-
 .../examples/CamelJdbcSinkConnector.properties     |   1 -
 .../CamelJirasourceSourceConnector.properties      |   1 -
 .../resources/kamelets/jira-source.kamelet.yaml    |   4 +-
 .../CamelJmsamqp10sinkSinkConnector.properties     |   1 -
 .../kamelets/jms-amqp-10-sink.kamelet.yaml         |   4 +-
 .../CamelJmsamqp10sourceSourceConnector.properties |   1 -
 .../kamelets/jms-amqp-10-source.kamelet.yaml       |   4 +-
 .../pom.xml                                        |  22 +--
 .../descriptors/connector-sink.properties          |   1 +
 .../camel-jms-apache-activemq-sink-sink.json       |  46 ++++++
 .../src/main/assembly/package.xml                  |   0
 ...lJmsapacheactivemqsinkSinkConnector.properties} |   9 +-
 .../CamelJmsapacheactivemqsinkSinkConnector.java}  |  12 +-
 ...elJmsapacheactivemqsinkSinkConnectorConfig.java |  65 ++++++++
 .../CamelJmsapacheactivemqsinkSinkTask.java}       |  16 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../jms-apache-activemq-sink.kamelet.yaml}         |  46 ++++--
 .../pom.xml                                        |  22 +--
 .../descriptors/connector-source.properties        |   1 +
 .../camel-jms-apache-activemq-source-source.json   |  46 ++++++
 .../src/main/assembly/package.xml                  |   0
 ...apacheactivemqsourceSourceConnector.properties} |   9 +-
 ...melJmsapacheactivemqsourceSourceConnector.java} |  10 +-
 ...sapacheactivemqsourceSourceConnectorConfig.java |  65 ++++++++
 .../CamelJmsapacheactivemqsourceSourceTask.java}   |   8 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../jms-apache-activemq-source.kamelet.yaml}       |  47 ++++--
 .../pom.xml                                        |  10 +-
 ...melJmsapacheartemissinkSinkConnector.properties |   1 -
 .../kamelets/jms-apache-artemis-sink.kamelet.yaml  |   6 +-
 .../pom.xml                                        |  10 +-
 ...msapacheartemissourceSourceConnector.properties |   1 -
 .../jms-apache-artemis-source.kamelet.yaml         |   6 +-
 .../pom.xml                                        |   4 +
 ...amelKafkanotsecuredsinkSinkConnector.properties |   1 -
 .../kamelets/kafka-not-secured-sink.kamelet.yaml   |   5 +-
 ...KafkanotsecuredsourceSourceConnector.properties |   1 -
 .../kamelets/kafka-not-secured-source.kamelet.yaml |  16 +-
 .../camel-kafka-sink-kafka-connector/pom.xml       |   4 +
 .../CamelKafkasinkSinkConnector.properties         |   1 -
 .../resources/kamelets/kafka-sink.kamelet.yaml     |   5 +-
 .../camel-kafka-source-kafka-connector/pom.xml     |   9 ++
 .../resources/camel-kafka-source-source.json       |   7 +
 .../CamelKafkasourceSourceConnector.properties     |   1 -
 .../CamelKafkasourceSourceConnectorConfig.java     |   4 +
 .../resources/kamelets/kafka-source.kamelet.yaml   |  45 +++++-
 .../pom.xml                                        |  16 +-
 .../descriptors/connector-sink.properties          |   1 +
 .../resources/camel-kafka-ssl-sink-sink.json       |  77 +++++++++
 .../src/main/assembly/package.xml                  |   0
 .../CamelKafkasslsinkSinkConnector.properties}     |  17 +-
 .../CamelKafkasslsinkSinkConnector.java}           |  10 +-
 .../CamelKafkasslsinkSinkConnectorConfig.java      |  84 ++++++++++
 .../kafkasslsink/CamelKafkasslsinkSinkTask.java}   |  16 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../kamelets/kafka-ssl-sink.kamelet.yaml}          | 177 ++++++++++++++-------
 .../pom.xml                                        |  18 +--
 .../descriptors/connector-source.properties        |   1 +
 .../resources/camel-kafka-ssl-source-source.json   | 118 ++++++++++++++
 .../src/main/assembly/package.xml                  |   0
 .../CamelKafkasslsourceSourceConnector.properties} |  21 +--
 .../CamelKafkasslsourceSourceConnector.java}       |   8 +-
 .../CamelKafkasslsourceSourceConnectorConfig.java  | 109 +++++++++++++
 .../CamelKafkasslsourceSourceTask.java}            |   8 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../kamelets/kafka-ssl-source.kamelet.yaml}        | 153 +++++++++++++-----
 ...netesnamespacessourceSourceConnector.properties |   1 -
 .../kubernetes-namespaces-source.kamelet.yaml      |   4 +-
 ...KubernetesnodessourceSourceConnector.properties |   1 -
 .../kamelets/kubernetes-nodes-source.kamelet.yaml  |   4 +-
 ...lKubernetespodssourceSourceConnector.properties |   1 -
 .../kamelets/kubernetes-pods-source.kamelet.yaml   |   4 +-
 .../examples/CamelLogsinkSinkConnector.properties  |   1 -
 .../main/resources/kamelets/log-sink.kamelet.yaml  |   4 +-
 .../CamelMailimapsourceSourceConnector.properties  |   1 -
 .../kamelets/mail-imap-source.kamelet.yaml         |   4 +-
 .../examples/CamelMailsinkSinkConnector.properties |   1 -
 .../main/resources/kamelets/mail-sink.kamelet.yaml |   4 +-
 .../camel-mariadb-sink-kafka-connector/pom.xml     |   2 +-
 .../CamelMariadbsinkSinkConnector.properties       |   1 -
 .../resources/kamelets/mariadb-sink.kamelet.yaml   |   6 +-
 .../camel-mariadb-source-kafka-connector/pom.xml   |   2 +-
 .../CamelMariadbsourceSourceConnector.properties   |   1 -
 .../resources/kamelets/mariadb-source.kamelet.yaml |   6 +-
 .../camel-minio-sink-kafka-connector/pom.xml       |   4 +
 .../CamelMiniosinkSinkConnector.properties         |   1 -
 .../resources/kamelets/minio-sink.kamelet.yaml     |   5 +-
 .../CamelMiniosourceSourceConnector.properties     |   1 -
 .../resources/kamelets/minio-source.kamelet.yaml   |   4 +-
 .../camel-mongodb-sink-kafka-connector/pom.xml     |   4 +
 .../CamelMongodbsinkSinkConnector.properties       |   1 -
 .../resources/kamelets/mongodb-sink.kamelet.yaml   |   5 +-
 .../CamelMongodbsourceSourceConnector.properties   |   1 -
 .../resources/kamelets/mongodb-source.kamelet.yaml |   4 +-
 .../examples/CamelMqttsinkSinkConnector.properties |   1 -
 .../main/resources/kamelets/mqtt-sink.kamelet.yaml |   4 +-
 .../CamelMqttsourceSourceConnector.properties      |   1 -
 .../resources/kamelets/mqtt-source.kamelet.yaml    |   4 +-
 .../pom.xml                                        |  14 +-
 .../descriptors/connector-sink.properties          |   1 +
 .../generated/resources/camel-mqtt5-sink-sink.json |  37 +++++
 .../src/main/assembly/package.xml                  |   0
 .../CamelMqtt5sinkSinkConnector.properties}        |   9 +-
 .../mqtt5sink/CamelMqtt5sinkSinkConnector.java}    |  10 +-
 .../CamelMqtt5sinkSinkConnectorConfig.java         |  60 +++++++
 .../mqtt5sink/CamelMqtt5sinkSinkTask.java}         |  16 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../resources/kamelets/mqtt5-sink.kamelet.yaml}    |  20 +--
 .../pom.xml                                        |   8 +-
 .../descriptors/connector-source.properties        |   1 +
 .../resources/camel-mqtt5-source-source.json       |  44 +++++
 .../src/main/assembly/package.xml                  |   0
 .../CamelMqtt5sourceSourceConnector.properties}    |   9 +-
 .../CamelMqtt5sourceSourceConnector.java}          |   8 +-
 .../CamelMqtt5sourceSourceConnectorConfig.java     |  65 ++++++++
 .../mqtt5source/CamelMqtt5sourceSourceTask.java}   |   8 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../resources/kamelets/mqtt5-source.kamelet.yaml}  |  20 +--
 .../camel-mysql-sink-kafka-connector/pom.xml       |   2 +-
 .../CamelMysqlsinkSinkConnector.properties         |   1 -
 .../resources/kamelets/mysql-sink.kamelet.yaml     |   6 +-
 .../camel-mysql-source-kafka-connector/pom.xml     |   2 +-
 .../CamelMysqlsourceSourceConnector.properties     |   1 -
 .../resources/kamelets/mysql-source.kamelet.yaml   |   6 +-
 .../examples/CamelNatssinkSinkConnector.properties |   1 -
 .../main/resources/kamelets/nats-sink.kamelet.yaml |   4 +-
 .../CamelNatssourceSourceConnector.properties      |   1 -
 .../resources/kamelets/nats-source.kamelet.yaml    |   4 +-
 .../generated/resources/camel-netty-http-sink.json |  28 ++--
 .../CamelNettyhttpSinkConnector.properties         |   1 -
 .../CamelNettyhttpSourceConnector.properties       |   1 -
 .../CamelNettyhttpSinkConnectorConfig.java         |  16 +-
 .../src/generated/resources/camel-netty-sink.json  |  28 ++--
 .../examples/CamelNettySinkConnector.properties    |   1 -
 .../examples/CamelNettySourceConnector.properties  |   1 -
 .../netty/CamelNettySinkConnectorConfig.java       |  16 +-
 .../pom.xml                                        |   8 +-
 .../descriptors/connector-sink.properties          |   1 +
 .../resources/camel-oracle-database-sink-sink.json |  50 ++++++
 .../src/main/assembly/package.xml                  |   0
 ...amelOracledatabasesinkSinkConnector.properties} |  21 ++-
 .../CamelOracledatabasesinkSinkConnector.java}     |  10 +-
 ...CamelOracledatabasesinkSinkConnectorConfig.java |  69 ++++++++
 .../CamelOracledatabasesinkSinkTask.java}          |  16 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../kamelets/oracle-database-sink.kamelet.yaml}    |  33 ++--
 .../pom.xml                                        |   8 +-
 .../descriptors/connector-source.properties        |   1 +
 .../camel-oracle-database-source-source.json       |  56 +++++++
 .../src/main/assembly/package.xml                  |   0
 ...OracledatabasesourceSourceConnector.properties} |  21 ++-
 .../CamelOracledatabasesourceSourceConnector.java} |  10 +-
 ...lOracledatabasesourceSourceConnectorConfig.java |  73 +++++++++
 .../CamelOracledatabasesourceSourceTask.java}      |   8 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../kamelets/oracle-database-source.kamelet.yaml}  |  33 ++--
 .../camel-postgresql-sink-kafka-connector/pom.xml  |  12 +-
 .../CamelPostgresqlsinkSinkConnector.properties    |   1 -
 .../kamelets/postgresql-sink.kamelet.yaml          |   8 +-
 .../pom.xml                                        |  12 +-
 ...CamelPostgresqlsourceSourceConnector.properties |   1 -
 .../kamelets/postgresql-source.kamelet.yaml        |   8 +-
 .../CamelPulsarsinkSinkConnector.properties        |   1 -
 .../resources/kamelets/pulsar-sink.kamelet.yaml    |   4 +-
 .../CamelPulsarsourceSourceConnector.properties    |   1 -
 .../resources/kamelets/pulsar-source.kamelet.yaml  |   4 +-
 .../CamelRabbitmqsourceSourceConnector.properties  |   1 -
 .../kamelets/rabbitmq-source.kamelet.yaml          |   4 +-
 .../CamelRedissinkSinkConnector.properties         |   1 -
 .../resources/kamelets/redis-sink.kamelet.yaml     |   4 +-
 .../CamelRedissourceSourceConnector.properties     |   1 -
 .../resources/kamelets/redis-source.kamelet.yaml   |   4 +-
 .../pom.xml                                        |  19 ++-
 .../descriptors/connector-sink.properties          |   1 +
 .../resources/camel-rest-openapi-sink-sink.json    |  25 +++
 .../src/main/assembly/package.xml                  |   0
 .../CamelRestopenapisinkSinkConnector.properties}  |  11 +-
 .../CamelRestopenapisinkSinkConnector.java}        |  10 +-
 .../CamelRestopenapisinkSinkConnectorConfig.java   |  53 ++++++
 .../CamelRestopenapisinkSinkTask.java}             |  16 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../kamelets/rest-openapi-sink.kamelet.yaml        |  57 +++++++
 .../pom.xml                                        |  10 +-
 .../descriptors/connector-sink.properties          |   1 +
 .../camel-salesforce-create-sink-sink.json         |  50 ++++++
 .../src/main/assembly/package.xml                  |   0
 ...elSalesforcecreatesinkSinkConnector.properties} |  21 ++-
 .../CamelSalesforcecreatesinkSinkConnector.java}   |  12 +-
 ...melSalesforcecreatesinkSinkConnectorConfig.java |  69 ++++++++
 .../CamelSalesforcecreatesinkSinkTask.java}        |  16 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../kamelets/salesforce-create-sink.kamelet.yaml}  |  68 +++-----
 .../pom.xml                                        |  16 +-
 .../descriptors/connector-sink.properties          |   1 +
 .../camel-salesforce-delete-sink-sink.json         |  44 +++++
 .../src/main/assembly/package.xml                  |   0
 ...elSalesforcedeletesinkSinkConnector.properties} |  21 ++-
 .../CamelSalesforcedeletesinkSinkConnector.java}   |  12 +-
 ...melSalesforcedeletesinkSinkConnectorConfig.java |  65 ++++++++
 .../CamelSalesforcedeletesinkSinkTask.java}        |  16 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../kamelets/salesforce-delete-sink.kamelet.yaml}  |  87 +++++-----
 ...CamelSalesforcesourceSourceConnector.properties |   1 -
 .../kamelets/salesforce-source.kamelet.yaml        |  15 +-
 .../pom.xml                                        |  10 +-
 .../descriptors/connector-sink.properties          |   1 +
 .../camel-salesforce-update-sink-sink.json         |  56 +++++++
 .../src/main/assembly/package.xml                  |   0
 ...elSalesforceupdatesinkSinkConnector.properties} |  23 ++-
 .../CamelSalesforceupdatesinkSinkConnector.java}   |  12 +-
 ...melSalesforceupdatesinkSinkConnectorConfig.java |  73 +++++++++
 .../CamelSalesforceupdatesinkSinkTask.java}        |  16 +-
 .../src/main/resources/META-INF/LICENSE.txt        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../kamelets/salesforce-update-sink.kamelet.yaml}  |  74 ++++-----
 .../examples/CamelSftpsinkSinkConnector.properties |   1 -
 .../main/resources/kamelets/sftp-sink.kamelet.yaml |   4 +-
 .../CamelSftpsourceSourceConnector.properties      |   1 -
 .../resources/kamelets/sftp-source.kamelet.yaml    |   4 +-
 .../examples/CamelSjms2SinkConnector.properties    |   1 -
 .../examples/CamelSjms2SourceConnector.properties  |   1 -
 .../CamelSlacksinkSinkConnector.properties         |   1 -
 .../resources/kamelets/slack-sink.kamelet.yaml     |   4 +-
 .../camel-slack-source-kafka-connector/pom.xml     |   8 +-
 .../resources/camel-slack-source-source.json       |   8 +-
 .../CamelSlacksourceSourceConnector.properties     |   3 +-
 .../CamelSlacksourceSourceConnectorConfig.java     |   6 +-
 .../resources/kamelets/slack-source.kamelet.yaml   |  17 +-
 .../examples/CamelSolrsinkSinkConnector.properties |   1 -
 .../main/resources/kamelets/solr-sink.kamelet.yaml |   4 +-
 .../CamelSolrsourceSourceConnector.properties      |   1 -
 .../resources/kamelets/solr-source.kamelet.yaml    |   4 +-
 .../camel-sqlserver-sink-kafka-connector/pom.xml   |   2 +-
 .../CamelSqlserversinkSinkConnector.properties     |   1 -
 .../resources/kamelets/sqlserver-sink.kamelet.yaml |   6 +-
 .../camel-sqlserver-source-kafka-connector/pom.xml |   2 +-
 .../CamelSqlserversourceSourceConnector.properties |   1 -
 .../kamelets/sqlserver-source.kamelet.yaml         |   6 +-
 .../examples/CamelSshsinkSinkConnector.properties  |   1 -
 .../main/resources/kamelets/ssh-sink.kamelet.yaml  |   4 +-
 .../CamelSshsourceSourceConnector.properties       |   1 -
 .../resources/kamelets/ssh-source.kamelet.yaml     |   4 +-
 .../camel-telegram-sink-kafka-connector/pom.xml    |   4 +
 .../CamelTelegramsinkSinkConnector.properties      |   1 -
 .../resources/kamelets/telegram-sink.kamelet.yaml  |   5 +-
 .../CamelTelegramsourceSourceConnector.properties  |   1 -
 .../kamelets/telegram-source.kamelet.yaml          |   4 +-
 .../CamelTimersourceSourceConnector.properties     |   1 -
 .../resources/kamelets/timer-source.kamelet.yaml   |   4 +-
 ...erdirectmessagesourceSourceConnector.properties |   1 -
 .../twitter-directmessage-source.kamelet.yaml      |   4 +-
 ...elTwittersearchsourceSourceConnector.properties |   1 -
 .../kamelets/twitter-search-source.kamelet.yaml    |   4 +-
 ...TwittertimelinesourceSourceConnector.properties |   1 -
 .../kamelets/twitter-timeline-source.kamelet.yaml  |   4 +-
 .../CamelWebhooksourceSourceConnector.properties   |   1 -
 .../resources/kamelets/webhook-source.kamelet.yaml |   4 +-
 .../CamelWebsocketsourceSourceConnector.properties |   1 -
 .../kamelets/websocket-source.kamelet.yaml         |   6 +-
 .../camel-wttrin-source-kafka-connector/pom.xml    |   4 +
 .../CamelWttrinsourceSourceConnector.properties    |   1 -
 .../resources/kamelets/wttrin-source.kamelet.yaml  |   5 +-
 connectors/pom.xml                                 |  24 ++-
 docs/modules/ROOT/nav.adoc                         |  48 +++++-
 docs/modules/ROOT/pages/reference/index.adoc       |  26 ++-
 636 files changed, 7563 insertions(+), 2062 deletions(-)

diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cloudwatch-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cloudwatch-sink-sink.json
index 27a49d280..8c1be4e51 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cloudwatch-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cloudwatch-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-cloudwatch-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Send messages to AWS CloudWatch metrics.\n\nThere are several properties you can set in the headers, such as:\n\n`metric-name` \/ `ce-metricname` for the metric name.\n`metric-value` \/ `ce-metricvalue` for the metric value.\n`metric-unit` \/ `ce-metricunit` for the metric unit.\n`metric-timestamp` \/ `ce-metrictimestamp` for the metric timestamp.\n`metric-dimension-name` \/ `ce-metricdimensionname` for the dimension name.\n`metric-dimension-value` \/ `ce-metricdimensio [...]
+		"description": "Send messages to AWS CloudWatch metrics.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS CloudWatch Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the CloudWatch client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter  [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-cloudwatch-sink.cwNamespace": {
@@ -18,20 +18,40 @@
 		"camel.kamelet.aws-cloudwatch-sink.accessKey": {
 			"name": "camel.kamelet.aws-cloudwatch-sink.accessKey",
 			"description": "The access key obtained from AWS.",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-cloudwatch-sink.secretKey": {
 			"name": "camel.kamelet.aws-cloudwatch-sink.secretKey",
 			"description": "The secret key obtained from AWS.",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-cloudwatch-sink.region": {
 			"name": "camel.kamelet.aws-cloudwatch-sink.region",
 			"description": "The AWS region to connect to. Example: eu-west-1",
 			"priority": "HIGH",
 			"required": "true"
+		},
+		"camel.kamelet.aws-cloudwatch-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-cloudwatch-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the CloudWatch client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-cloudwatch-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-cloudwatch-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-cloudwatch-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-cloudwatch-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-sink-sink.json
new file mode 100644
index 000000000..7a5324a52
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-sink-sink.json
@@ -0,0 +1,71 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.awsddbsink.CamelAwsddbsinkSinkConnector",
+		"artifactId": "camel-aws-ddb-sink-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-aws-ddb-sink-sink",
+		"type": "sink",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Send data to AWS DynamoDB service. The sent data will insert\/update\/delete an item on the given AWS DynamoDB table.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS DynamoDB service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the AWS DynamoDB client will load the credentials through this provider and won't use the static credential. This i [...]
+	},
+	"properties": {
+		"camel.kamelet.aws-ddb-sink.table": {
+			"name": "camel.kamelet.aws-ddb-sink.table",
+			"description": "Name of the DynamoDB table to look at",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.aws-ddb-sink.accessKey": {
+			"name": "camel.kamelet.aws-ddb-sink.accessKey",
+			"description": "The access key obtained from AWS",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ddb-sink.secretKey": {
+			"name": "camel.kamelet.aws-ddb-sink.secretKey",
+			"description": "The secret key obtained from AWS",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ddb-sink.region": {
+			"name": "camel.kamelet.aws-ddb-sink.region",
+			"description": "The AWS region to connect to Example: eu-west-1",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.aws-ddb-sink.operation": {
+			"name": "camel.kamelet.aws-ddb-sink.operation",
+			"description": "The operation to perform (one of PutItem, UpdateItem, DeleteItem) Example: PutItem",
+			"defaultValue": "\"PutItem\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ddb-sink.writeCapacity": {
+			"name": "camel.kamelet.aws-ddb-sink.writeCapacity",
+			"description": "The provisioned throughput to reserved for writing resources to your table",
+			"defaultValue": "1",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ddb-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-ddb-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the DynamoDB client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ddb-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-ddb-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ddb-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-ddb-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-streams-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-streams-source-source.json
index af6f42a79..692c2342a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-streams-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-streams-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-ddb-streams-source-source",
 		"type": "source",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Receive events from AWS DynamoDB Streams."
+		"description": "Receive events from AWS DynamoDB Streams.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS DynamoDB Streams Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the AWS DynamoDB Streams client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as man [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-ddb-streams-source.table": {
@@ -18,14 +18,14 @@
 		"camel.kamelet.aws-ddb-streams-source.accessKey": {
 			"name": "camel.kamelet.aws-ddb-streams-source.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-ddb-streams-source.secretKey": {
 			"name": "camel.kamelet.aws-ddb-streams-source.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-ddb-streams-source.region": {
 			"name": "camel.kamelet.aws-ddb-streams-source.region",
@@ -46,6 +46,26 @@
 			"defaultValue": "\"000000000000000000000\"",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.aws-ddb-streams-source.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-ddb-streams-source.useDefaultCredentialsProvider",
+			"description": "Set whether the AWS DynamoDB Streams client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ddb-streams-source.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-ddb-streams-source.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ddb-streams-source.overrideEndpoint": {
+			"name": "camel.kamelet.aws-ddb-streams-source.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ec2-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ec2-sink-sink.json
index 056a9e234..0dbb9c9be 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ec2-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ec2-sink-sink.json
@@ -6,26 +6,46 @@
 		"id": "camel-aws-ec2-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Check the status of EC2 instances\n\nThe Kamelet expects the following headers to be set:\n\n- `instanceIds` \/ `ce-instanceids`: as a comma separated list of EC2 instance ids."
+		"description": "Check the status of EC2 instances\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS EC2 Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the EC2 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.\n\n [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-ec2-sink.accessKey": {
 			"name": "camel.kamelet.aws-ec2-sink.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-ec2-sink.secretKey": {
 			"name": "camel.kamelet.aws-ec2-sink.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-ec2-sink.region": {
 			"name": "camel.kamelet.aws-ec2-sink.region",
 			"description": "The AWS region to connect to Example: eu-west-1",
 			"priority": "HIGH",
 			"required": "true"
+		},
+		"camel.kamelet.aws-ec2-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-ec2-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the EC2 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ec2-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-ec2-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ec2-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-ec2-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-firehose-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-firehose-sink-sink.json
index 90661ae5e..296093c98 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-firehose-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-firehose-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-kinesis-firehose-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Send message to an AWS Kinesis Firehose Stream"
+		"description": "Send message to an AWS Kinesis Firehose Stream\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS Kinesis Firehose Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the Kinesis Firehose client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as ma [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-kinesis-firehose-sink.streamName": {
@@ -18,20 +18,40 @@
 		"camel.kamelet.aws-kinesis-firehose-sink.accessKey": {
 			"name": "camel.kamelet.aws-kinesis-firehose-sink.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-kinesis-firehose-sink.secretKey": {
 			"name": "camel.kamelet.aws-kinesis-firehose-sink.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-kinesis-firehose-sink.region": {
 			"name": "camel.kamelet.aws-kinesis-firehose-sink.region",
 			"description": "The AWS region to connect to Example: eu-west-1",
 			"priority": "HIGH",
 			"required": "true"
+		},
+		"camel.kamelet.aws-kinesis-firehose-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-kinesis-firehose-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the Kinesis Firehose client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-kinesis-firehose-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-kinesis-firehose-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-kinesis-firehose-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-kinesis-firehose-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-sink-sink.json
index bb31afa4a..fae42d944 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-kinesis-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Send data to AWS Kinesis.\n\nThe Kamelet expects the following header:\n\n- `partition` \/ `ce-partition`: to set the Kinesis partition key\n\nIf the header won't be set the exchange ID will be used.\n\nThe Kamelet is also able to recognize the following header:\n\n- `sequence-number` \/ `ce-sequencenumber`: to set the Sequence number\n\nThis header is optional."
+		"description": "Send data to AWS Kinesis.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS Kinesis Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the Kinesis client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.\n\n [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-kinesis-sink.stream": {
@@ -18,20 +18,40 @@
 		"camel.kamelet.aws-kinesis-sink.accessKey": {
 			"name": "camel.kamelet.aws-kinesis-sink.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-kinesis-sink.secretKey": {
 			"name": "camel.kamelet.aws-kinesis-sink.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-kinesis-sink.region": {
 			"name": "camel.kamelet.aws-kinesis-sink.region",
 			"description": "The AWS region to connect to Example: eu-west-1",
 			"priority": "HIGH",
 			"required": "true"
+		},
+		"camel.kamelet.aws-kinesis-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-kinesis-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the Kinesis client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-kinesis-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-kinesis-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-kinesis-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-kinesis-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-source-source.json
index ad416dc31..2bc4cfb7e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-kinesis-source-source",
 		"type": "source",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Receive data from AWS Kinesis."
+		"description": "Receive data from AWS Kinesis.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS Kinesis Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the Kinesis client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
 	},
 	"properties": {
 		"camel.kamelet.aws-kinesis-source.stream": {
@@ -18,20 +18,40 @@
 		"camel.kamelet.aws-kinesis-source.accessKey": {
 			"name": "camel.kamelet.aws-kinesis-source.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-kinesis-source.secretKey": {
 			"name": "camel.kamelet.aws-kinesis-source.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-kinesis-source.region": {
 			"name": "camel.kamelet.aws-kinesis-source.region",
 			"description": "The AWS region to connect to Example: eu-west-1",
 			"priority": "HIGH",
 			"required": "true"
+		},
+		"camel.kamelet.aws-kinesis-source.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-kinesis-source.useDefaultCredentialsProvider",
+			"description": "Set whether the Kinesis client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-kinesis-source.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-kinesis-source.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-kinesis-source.overrideEndpoint": {
+			"name": "camel.kamelet.aws-kinesis-source.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-lambda-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-lambda-sink-sink.json
index fa801b0b6..4f4eaec71 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-lambda-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-lambda-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-lambda-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Send a payload to an AWS Lambda function"
+		"description": "Send a payload to an AWS Lambda function.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS Lambda Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the Lambda client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for thi [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-lambda-sink.function": {
@@ -18,20 +18,27 @@
 		"camel.kamelet.aws-lambda-sink.accessKey": {
 			"name": "camel.kamelet.aws-lambda-sink.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-lambda-sink.secretKey": {
 			"name": "camel.kamelet.aws-lambda-sink.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-lambda-sink.region": {
 			"name": "camel.kamelet.aws-lambda-sink.region",
 			"description": "The AWS region to connect to Example: eu-west-1",
 			"priority": "HIGH",
 			"required": "true"
+		},
+		"camel.kamelet.aws-lambda-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-lambda-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the Lambda client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-sink-sink.json
index 7ce9d0126..478ce38de 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-s3-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Upload data to AWS S3.\n\nThe Kamelet expects the following headers to be set:\n\n- `file` \/ `ce-file`: as the file name to upload\n\nIf the header won't be set the exchange ID will be used as file name."
+		"description": "Upload data to AWS S3 Bucket.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS S3 Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the S3 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.\n\nThe Ka [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-s3-sink.bucketNameOrArn": {
@@ -18,14 +18,14 @@
 		"camel.kamelet.aws-s3-sink.accessKey": {
 			"name": "camel.kamelet.aws-s3-sink.accessKey",
 			"description": "The access key obtained from AWS.",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-s3-sink.secretKey": {
 			"name": "camel.kamelet.aws-s3-sink.secretKey",
 			"description": "The secret key obtained from AWS.",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-s3-sink.region": {
 			"name": "camel.kamelet.aws-s3-sink.region",
@@ -39,6 +39,32 @@
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.aws-s3-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-s3-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-s3-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-s3-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-s3-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-s3-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-s3-sink.keyName": {
+			"name": "camel.kamelet.aws-s3-sink.keyName",
+			"description": "The key name for saving an element in the bucket.",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-source-source.json
index 475b515fb..58199abb4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-s3-source-source",
 		"type": "source",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Receive data from AWS S3."
+		"description": "Receive data from AWS S3 Bucket.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS S3 Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the S3 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
 	},
 	"properties": {
 		"camel.kamelet.aws-s3-source.bucketNameOrArn": {
@@ -25,14 +25,14 @@
 		"camel.kamelet.aws-s3-source.accessKey": {
 			"name": "camel.kamelet.aws-s3-source.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-s3-source.secretKey": {
 			"name": "camel.kamelet.aws-s3-source.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-s3-source.region": {
 			"name": "camel.kamelet.aws-s3-source.region",
@@ -66,6 +66,26 @@
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.aws-s3-source.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-s3-source.useDefaultCredentialsProvider",
+			"description": "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-s3-source.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-s3-source.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-s3-source.overrideEndpoint": {
+			"name": "camel.kamelet.aws-s3-source.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-streaming-upload-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-streaming-upload-sink-sink.json
index 5a41c6a39..539ca5d7e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-streaming-upload-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-streaming-upload-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-s3-streaming-upload-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Upload data to AWS S3 in streaming upload mode."
+		"description": "Upload data to AWS S3 in streaming upload mode.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS S3 Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the S3 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this  [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-s3-streaming-upload-sink.bucketNameOrArn": {
@@ -18,14 +18,14 @@
 		"camel.kamelet.aws-s3-streaming-upload-sink.accessKey": {
 			"name": "camel.kamelet.aws-s3-streaming-upload-sink.accessKey",
 			"description": "The access key obtained from AWS.",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-s3-streaming-upload-sink.secretKey": {
 			"name": "camel.kamelet.aws-s3-streaming-upload-sink.secretKey",
 			"description": "The secret key obtained from AWS.",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-s3-streaming-upload-sink.region": {
 			"name": "camel.kamelet.aws-s3-streaming-upload-sink.region",
@@ -86,6 +86,26 @@
 			"description": "Setting the key name for an element in the bucket through endpoint parameter. In Streaming Upload, with the default configuration, this will be the base for the progressive creation of files.",
 			"priority": "HIGH",
 			"required": "true"
+		},
+		"camel.kamelet.aws-s3-streaming-upload-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-s3-streaming-upload-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-s3-streaming-upload-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-s3-streaming-upload-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-s3-streaming-upload-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-s3-streaming-upload-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-secrets-manager-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-secrets-manager-sink-sink.json
index 9c44ad61e..fb41b805f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-secrets-manager-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-secrets-manager-sink-sink.json
@@ -6,26 +6,33 @@
 		"id": "camel-aws-secrets-manager-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Create a secret in AWS Secrets Manager\n\nThe Kamelet expects the following headers to be set:\n\n- `secret-name` \/ `ce-secret-name`: as the secret name to create.\n\nIf the header won't be set the exchange ID will be used as secret name."
+		"description": "Create a secret in AWS Secrets Manager.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS Secrets Manager Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the Secrets Manager client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory p [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-secrets-manager-sink.accessKey": {
 			"name": "camel.kamelet.aws-secrets-manager-sink.accessKey",
 			"description": "The access key obtained from AWS.",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-secrets-manager-sink.secretKey": {
 			"name": "camel.kamelet.aws-secrets-manager-sink.secretKey",
 			"description": "The secret key obtained from AWS.",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-secrets-manager-sink.region": {
 			"name": "camel.kamelet.aws-secrets-manager-sink.region",
 			"description": "The AWS region to connect to. Example: eu-west-1",
 			"priority": "HIGH",
 			"required": "true"
+		},
+		"camel.kamelet.aws-secrets-manager-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-secrets-manager-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the Secrets Manager client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ses-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ses-sink-sink.json
new file mode 100644
index 000000000..d863069a3
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ses-sink-sink.json
@@ -0,0 +1,44 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.awssessink.CamelAwssessinkSinkConnector",
+		"artifactId": "camel-aws-ses-sink-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-aws-ses-sink-sink",
+		"type": "sink",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Send Email through AWS SES Service.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SES Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SES client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.\n [...]
+	},
+	"properties": {
+		"camel.kamelet.aws-ses-sink.from": {
+			"name": "camel.kamelet.aws-ses-sink.from",
+			"description": "From address Example: user@example.com",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.aws-ses-sink.accessKey": {
+			"name": "camel.kamelet.aws-ses-sink.accessKey",
+			"description": "The access key obtained from AWS.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ses-sink.secretKey": {
+			"name": "camel.kamelet.aws-ses-sink.secretKey",
+			"description": "The secret key obtained from AWS.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ses-sink.region": {
+			"name": "camel.kamelet.aws-ses-sink.region",
+			"description": "The AWS region to connect to. Example: eu-west-1",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.aws-ses-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-ses-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the SES client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-fifo-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-fifo-sink-sink.json
index d87221472..735bb9d37 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-fifo-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-fifo-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sns-fifo-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Send message to an AWS SNS FIFO Topic\n\nThe Kamelet expects the following headers to be set:\n\n- `subject` \/ `ce-subject`: the subject of the message"
+		"description": "Send message to an AWS SNS FIFO Topic.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SNS Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SNS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-sns-fifo-sink.topicNameOrArn": {
@@ -18,14 +18,14 @@
 		"camel.kamelet.aws-sns-fifo-sink.accessKey": {
 			"name": "camel.kamelet.aws-sns-fifo-sink.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sns-fifo-sink.secretKey": {
 			"name": "camel.kamelet.aws-sns-fifo-sink.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sns-fifo-sink.region": {
 			"name": "camel.kamelet.aws-sns-fifo-sink.region",
@@ -46,6 +46,26 @@
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.aws-sns-fifo-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-sns-fifo-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the SNS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sns-fifo-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-sns-fifo-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sns-fifo-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-sns-fifo-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-sink-sink.json
index 6414c5bfd..b34085069 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sns-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Send message to an AWS SNS Topic\n\nThe Kamelet expects the following headers to be set:\n\n- `subject` \/ `ce-subject`: the subject of the message"
+		"description": "Send message to an AWS SNS Topic.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SNS Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SNS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.\n\n [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-sns-sink.topicNameOrArn": {
@@ -18,14 +18,14 @@
 		"camel.kamelet.aws-sns-sink.accessKey": {
 			"name": "camel.kamelet.aws-sns-sink.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sns-sink.secretKey": {
 			"name": "camel.kamelet.aws-sns-sink.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sns-sink.region": {
 			"name": "camel.kamelet.aws-sns-sink.region",
@@ -39,6 +39,26 @@
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.aws-sns-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-sns-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the SNS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sns-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-sns-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sns-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-sns-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-batch-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-batch-sink-sink.json
index 10277b13a..1d8a3e58e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-batch-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-batch-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sqs-batch-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Send Batch message to an AWS SQS Queue"
+		"description": "Send Batch message to an AWS SQS Queue.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
 	},
 	"properties": {
 		"camel.kamelet.aws-sqs-batch-sink.queueNameOrArn": {
@@ -18,14 +18,14 @@
 		"camel.kamelet.aws-sqs-batch-sink.accessKey": {
 			"name": "camel.kamelet.aws-sqs-batch-sink.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sqs-batch-sink.secretKey": {
 			"name": "camel.kamelet.aws-sqs-batch-sink.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sqs-batch-sink.region": {
 			"name": "camel.kamelet.aws-sqs-batch-sink.region",
@@ -49,6 +49,7 @@
 		"camel.kamelet.aws-sqs-batch-sink.amazonAWSHost": {
 			"name": "camel.kamelet.aws-sqs-batch-sink.amazonAWSHost",
 			"description": "The hostname of the Amazon AWS cloud.",
+			"defaultValue": "\"amazonaws.com\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -58,6 +59,26 @@
 			"defaultValue": "\"https\"",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-batch-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-sqs-batch-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the SQS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-batch-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-sqs-batch-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-batch-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-sqs-batch-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-fifo-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-fifo-sink-sink.json
index de561215a..64e20e2f0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-fifo-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-fifo-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sqs-fifo-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Send message to an AWS SQS FIFO Queue"
+		"description": "\nSend message to an AWS SQS FIFO Queue.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
 	},
 	"properties": {
 		"camel.kamelet.aws-sqs-fifo-sink.queueNameOrArn": {
@@ -18,14 +18,14 @@
 		"camel.kamelet.aws-sqs-fifo-sink.accessKey": {
 			"name": "camel.kamelet.aws-sqs-fifo-sink.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sqs-fifo-sink.secretKey": {
 			"name": "camel.kamelet.aws-sqs-fifo-sink.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sqs-fifo-sink.region": {
 			"name": "camel.kamelet.aws-sqs-fifo-sink.region",
@@ -50,6 +50,7 @@
 		"camel.kamelet.aws-sqs-fifo-sink.amazonAWSHost": {
 			"name": "camel.kamelet.aws-sqs-fifo-sink.amazonAWSHost",
 			"description": "The hostname of the Amazon AWS cloud.",
+			"defaultValue": "\"amazonaws.com\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -59,6 +60,26 @@
 			"defaultValue": "\"https\"",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-fifo-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-sqs-fifo-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the SQS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-fifo-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-sqs-fifo-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-fifo-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-sqs-fifo-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-sink-sink.json
index d22e5915d..baa83b599 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sqs-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Send message to an AWS SQS Queue"
+		"description": "Send message to an AWS SQS Queue.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
 	},
 	"properties": {
 		"camel.kamelet.aws-sqs-sink.queueNameOrArn": {
@@ -18,14 +18,14 @@
 		"camel.kamelet.aws-sqs-sink.accessKey": {
 			"name": "camel.kamelet.aws-sqs-sink.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sqs-sink.secretKey": {
 			"name": "camel.kamelet.aws-sqs-sink.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sqs-sink.region": {
 			"name": "camel.kamelet.aws-sqs-sink.region",
@@ -43,6 +43,7 @@
 		"camel.kamelet.aws-sqs-sink.amazonAWSHost": {
 			"name": "camel.kamelet.aws-sqs-sink.amazonAWSHost",
 			"description": "The hostname of the Amazon AWS cloud.",
+			"defaultValue": "\"amazonaws.com\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -52,6 +53,26 @@
 			"defaultValue": "\"https\"",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-sqs-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the SQS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-sqs-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-sqs-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-source-source.json
index 9ad13da09..6a9d88985 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sqs-source-source",
 		"type": "source",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Receive data from AWS SQS."
+		"description": "Receive data from AWS SQS.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
 	},
 	"properties": {
 		"camel.kamelet.aws-sqs-source.queueNameOrArn": {
@@ -25,14 +25,14 @@
 		"camel.kamelet.aws-sqs-source.accessKey": {
 			"name": "camel.kamelet.aws-sqs-source.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sqs-source.secretKey": {
 			"name": "camel.kamelet.aws-sqs-source.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sqs-source.region": {
 			"name": "camel.kamelet.aws-sqs-source.region",
@@ -50,6 +50,7 @@
 		"camel.kamelet.aws-sqs-source.amazonAWSHost": {
 			"name": "camel.kamelet.aws-sqs-source.amazonAWSHost",
 			"description": "The hostname of the Amazon AWS cloud.",
+			"defaultValue": "\"amazonaws.com\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -59,6 +60,32 @@
 			"defaultValue": "\"https\"",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-source.queueURL": {
+			"name": "camel.kamelet.aws-sqs-source.queueURL",
+			"description": "The full SQS Queue URL (required if using KEDA)",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-source.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-sqs-source.useDefaultCredentialsProvider",
+			"description": "Set whether the SQS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-source.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-sqs-source.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-source.overrideEndpoint": {
+			"name": "camel.kamelet.aws-sqs-source.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-servicebus-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-servicebus-sink-sink.json
new file mode 100644
index 000000000..20be54e31
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-servicebus-sink-sink.json
@@ -0,0 +1,25 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.azureservicebussink.CamelAzureservicebussinkSinkConnector",
+		"artifactId": "camel-azure-servicebus-sink-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-azure-servicebus-sink-sink",
+		"type": "sink",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Send Messages to Azure Servicebus."
+	},
+	"properties": {
+		"camel.kamelet.azure-servicebus-sink.topicOrQueueName": {
+			"name": "camel.kamelet.azure-servicebus-sink.topicOrQueueName",
+			"description": "Topic Or Queue Name for the Azure Servicebus instance",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.azure-servicebus-sink.connectionString": {
+			"name": "camel.kamelet.azure-servicebus-sink.connectionString",
+			"description": "Connection String for Azure Servicebus instance",
+			"priority": "HIGH",
+			"required": "true"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-servicebus-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-servicebus-source-source.json
new file mode 100644
index 000000000..4bd12ab69
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-servicebus-source-source.json
@@ -0,0 +1,38 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.azureservicebussource.CamelAzureservicebussourceSourceConnector",
+		"artifactId": "camel-azure-servicebus-source-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-azure-servicebus-source-source",
+		"type": "source",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Consume Messages from Azure Servicebus.\n\nThe subscribtion name parameter needs to be populated in case of consuming from a Topic."
+	},
+	"properties": {
+		"camel.kamelet.azure-servicebus-source.topicOrQueueName": {
+			"name": "camel.kamelet.azure-servicebus-source.topicOrQueueName",
+			"description": "Topic Or Queue Name for the Azure Servicebus instance",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.azure-servicebus-source.connectionString": {
+			"name": "camel.kamelet.azure-servicebus-source.connectionString",
+			"description": "Connection String for Azure Servicebus instance",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.azure-servicebus-source.serviceBusReceiveMode": {
+			"name": "camel.kamelet.azure-servicebus-source.serviceBusReceiveMode",
+			"description": "Sets the receive mode for the receiver, possible values are PEEK_LOCK and RECEIVE_AND_DELETE",
+			"defaultValue": "\"PEEK_LOCK\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.azure-servicebus-source.subscriptionName": {
+			"name": "camel.kamelet.azure-servicebus-source.subscriptionName",
+			"description": "Sets the name of the subscription in the topic to listen to. This parameter is mandatory in case of topic.",
+			"priority": "MEDIUM",
+			"required": "false"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-changefeed-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-changefeed-source-source.json
new file mode 100644
index 000000000..b6126744b
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-changefeed-source-source.json
@@ -0,0 +1,32 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.azurestorageblobchangefeedsource.CamelAzurestorageblobchangefeedsourceSourceConnector",
+		"artifactId": "camel-azure-storage-blob-changefeed-source-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-azure-storage-blob-changefeed-source-source",
+		"type": "source",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Consume Events from Azure Storage Blob Change feed."
+	},
+	"properties": {
+		"camel.kamelet.azure-storage-blob-changefeed-source.period": {
+			"name": "camel.kamelet.azure-storage-blob-changefeed-source.period",
+			"description": "The interval between fetches to the Azure Storage Changefeed in milliseconds",
+			"defaultValue": "10000",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.azure-storage-blob-changefeed-source.accountName": {
+			"name": "camel.kamelet.azure-storage-blob-changefeed-source.accountName",
+			"description": "The Azure Storage Blob account name.",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.azure-storage-blob-changefeed-source.accessKey": {
+			"name": "camel.kamelet.azure-storage-blob-changefeed-source.accessKey",
+			"description": "The Azure Storage Blob access Key.",
+			"priority": "HIGH",
+			"required": "true"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cassandra-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cassandra-sink-sink.json
index f17127cca..76b06db7c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cassandra-sink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cassandra-sink-sink.json
@@ -46,8 +46,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.kamelet.cassandra-sink.preparedStatement": {
-			"name": "camel.kamelet.cassandra-sink.preparedStatement",
+		"camel.kamelet.cassandra-sink.prepareStatements": {
+			"name": "camel.kamelet.cassandra-sink.prepareStatements",
 			"description": "Whether to use PreparedStatements or regular Statements as the query.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cassandra-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cassandra-source-source.json
index bf30cc06d..34f39383a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cassandra-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cassandra-source-source.json
@@ -49,7 +49,7 @@
 		"camel.kamelet.cassandra-source.consistencyLevel": {
 			"name": "camel.kamelet.cassandra-source.consistencyLevel",
 			"description": "Consistency level to use. The value can be one of ANY, ONE, TWO, THREE, QUORUM, ALL, LOCAL_QUORUM, EACH_QUORUM, SERIAL, LOCAL_SERIAL, LOCAL_ONE",
-			"defaultValue": "\"ANY\"",
+			"defaultValue": "\"QUORUM\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
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 d7bb48343..f4804adb5 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
@@ -128,7 +128,7 @@
 		},
 		"camel.sink.endpoint.keepLastModified": {
 			"name": "camel.sink.endpoint.keepLastModified",
-			"description": "Will keep the last modified timestamp from the source file (if any). Will use the Exchange.FILE_LAST_MODIFIED header to located the timestamp. This header can contain either a java.util.Date or long with the timestamp. If the timestamp exists and the option is enabled it will set this timestamp on the written file. Note: This option only applies to the file producer. You cannot use this option with any of the ftp producers.",
+			"description": "Will keep the last modified timestamp from the source file (if any). Will use the FileConstants.FILE_LAST_MODIFIED header to located the timestamp. This header can contain either a java.util.Date or long with the timestamp. If the timestamp exists and the option is enabled it will set this timestamp on the written file. Note: This option only applies to the file producer. You cannot use this option with any of the ftp producers.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-source.json
index 1e7f7eca2..453a82553 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-source.json
@@ -154,12 +154,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.resumeStrategy": {
-			"name": "camel.source.endpoint.resumeStrategy",
-			"description": "Set a resume strategy for files. This makes it possible to define a strategy for resuming reading files after the last point before stopping the application. See the FileConsumerResumeStrategy for implementation details",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.startingDirectoryMustExist": {
 			"name": "camel.source.endpoint.startingDirectoryMustExist",
 			"description": "Whether the starting directory must exist. Mind that the autoCreate option is default enabled, which means the starting directory is normally auto created if it doesn't exist. You can disable autoCreate and enable this to ensure the starting directory must exist. Will thrown an exception if the directory doesn't exist.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-commit-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-commit-source-source.json
new file mode 100644
index 000000000..874a95447
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-commit-source-source.json
@@ -0,0 +1,44 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.githubcommitsource.CamelGithubcommitsourceSourceConnector",
+		"artifactId": "camel-github-commit-source-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-github-commit-source-source",
+		"type": "source",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Receive commit From Github."
+	},
+	"properties": {
+		"camel.kamelet.github-commit-source.repoName": {
+			"name": "camel.kamelet.github-commit-source.repoName",
+			"description": "The Github Repository name",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.github-commit-source.repoOwner": {
+			"name": "camel.kamelet.github-commit-source.repoOwner",
+			"description": "The repository owner",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.github-commit-source.oauthToken": {
+			"name": "camel.kamelet.github-commit-source.oauthToken",
+			"description": "Oauth token",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.github-commit-source.startingSha": {
+			"name": "camel.kamelet.github-commit-source.startingSha",
+			"description": "The SHA from which we want to consume, possible values beginning, last or a specific SHA",
+			"defaultValue": "\"last\"",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.github-commit-source.branch": {
+			"name": "camel.kamelet.github-commit-source.branch",
+			"description": "The branch we want to consume commit from",
+			"priority": "HIGH",
+			"required": "true"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-event-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-event-source-source.json
new file mode 100644
index 000000000..cdfdbe645
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-event-source-source.json
@@ -0,0 +1,31 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.githubeventsource.CamelGithubeventsourceSourceConnector",
+		"artifactId": "camel-github-event-source-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-github-event-source-source",
+		"type": "source",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Receive Events From a Github Repository."
+	},
+	"properties": {
+		"camel.kamelet.github-event-source.repoName": {
+			"name": "camel.kamelet.github-event-source.repoName",
+			"description": "The Github Repository name",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.github-event-source.repoOwner": {
+			"name": "camel.kamelet.github-event-source.repoOwner",
+			"description": "The repository owner",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.github-event-source.oauthToken": {
+			"name": "camel.kamelet.github-event-source.oauthToken",
+			"description": "Oauth token",
+			"priority": "HIGH",
+			"required": "true"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-pullrequest-comment-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-pullrequest-comment-source-source.json
new file mode 100644
index 000000000..740456d62
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-pullrequest-comment-source-source.json
@@ -0,0 +1,31 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.githubpullrequestcommentsource.CamelGithubpullrequestcommentsourceSourceConnector",
+		"artifactId": "camel-github-pullrequest-comment-source-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-github-pullrequest-comment-source-source",
+		"type": "source",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Receive pull request Comments From Github."
+	},
+	"properties": {
+		"camel.kamelet.github-pullrequest-comment-source.repoName": {
+			"name": "camel.kamelet.github-pullrequest-comment-source.repoName",
+			"description": "The Github Repository name",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.github-pullrequest-comment-source.repoOwner": {
+			"name": "camel.kamelet.github-pullrequest-comment-source.repoOwner",
+			"description": "The repository owner",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.github-pullrequest-comment-source.oauthToken": {
+			"name": "camel.kamelet.github-pullrequest-comment-source.oauthToken",
+			"description": "Oauth token",
+			"priority": "HIGH",
+			"required": "true"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-pullrequest-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-pullrequest-source-source.json
new file mode 100644
index 000000000..975af74c4
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-pullrequest-source-source.json
@@ -0,0 +1,31 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.githubpullrequestsource.CamelGithubpullrequestsourceSourceConnector",
+		"artifactId": "camel-github-pullrequest-source-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-github-pullrequest-source-source",
+		"type": "source",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Receive pull request From Github."
+	},
+	"properties": {
+		"camel.kamelet.github-pullrequest-source.repoName": {
+			"name": "camel.kamelet.github-pullrequest-source.repoName",
+			"description": "The Github Repository name",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.github-pullrequest-source.repoOwner": {
+			"name": "camel.kamelet.github-pullrequest-source.repoOwner",
+			"description": "The repository owner",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.github-pullrequest-source.oauthToken": {
+			"name": "camel.kamelet.github-pullrequest-source.oauthToken",
+			"description": "Oauth token",
+			"priority": "HIGH",
+			"required": "true"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-tag-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-tag-source-source.json
new file mode 100644
index 000000000..f7e84cbd0
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-tag-source-source.json
@@ -0,0 +1,31 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.githubtagsource.CamelGithubtagsourceSourceConnector",
+		"artifactId": "camel-github-tag-source-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-github-tag-source-source",
+		"type": "source",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Receive Tags From a Github Repository."
+	},
+	"properties": {
+		"camel.kamelet.github-tag-source.repoName": {
+			"name": "camel.kamelet.github-tag-source.repoName",
+			"description": "The Github Repository name",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.github-tag-source.repoOwner": {
+			"name": "camel.kamelet.github-tag-source.repoOwner",
+			"description": "The repository owner",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.github-tag-source.oauthToken": {
+			"name": "camel.kamelet.github-tag-source.oauthToken",
+			"description": "Oauth token",
+			"priority": "HIGH",
+			"required": "true"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sink-sink.json
new file mode 100644
index 000000000..1f5fd4c89
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sink-sink.json
@@ -0,0 +1,37 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.googlebigquerysink.CamelGooglebigquerysinkSinkConnector",
+		"artifactId": "camel-google-bigquery-sink-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-google-bigquery-sink-sink",
+		"type": "sink",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Send data to a Google Big Query table.\n\nIt is expected the body is in Json format representing an object or an array of objects.\n\nThe credentialsFileLocation property needs to be a path to a service account key file."
+	},
+	"properties": {
+		"camel.kamelet.google-bigquery-sink.projectId": {
+			"name": "camel.kamelet.google-bigquery-sink.projectId",
+			"description": "Google Cloud Project id",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.google-bigquery-sink.dataset": {
+			"name": "camel.kamelet.google-bigquery-sink.dataset",
+			"description": "The Big Query Dataset Id",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.google-bigquery-sink.table": {
+			"name": "camel.kamelet.google-bigquery-sink.table",
+			"description": "The Big Query Table Id",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.google-bigquery-sink.credentialsFileLocation": {
+			"name": "camel.kamelet.google-bigquery-sink.credentialsFileLocation",
+			"description": "The credential to access Google Cloud Platform api services",
+			"priority": "HIGH",
+			"required": "true"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-source-source.json
index b992f93b9..98419b333 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-source-source.json
@@ -9,12 +9,6 @@
 		"description": "Receive data from Google Sheets."
 	},
 	"properties": {
-		"camel.kamelet.google-sheets-source.index": {
-			"name": "camel.kamelet.google-sheets-source.index",
-			"description": "An index for the google sheets endpoint",
-			"priority": "HIGH",
-			"required": "true"
-		},
 		"camel.kamelet.google-sheets-source.spreadsheetId": {
 			"name": "camel.kamelet.google-sheets-source.spreadsheetId",
 			"description": "The Spreadsheet ID to be used as events source",
@@ -61,8 +55,8 @@
 		"camel.kamelet.google-sheets-source.applicationName": {
 			"name": "camel.kamelet.google-sheets-source.applicationName",
 			"description": "Google Sheets application name",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.google-sheets-source.splitResults": {
 			"name": "camel.kamelet.google-sheets-source.splitResults",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jms-apache-activemq-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jms-apache-activemq-sink-sink.json
new file mode 100644
index 000000000..49759dc1f
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jms-apache-activemq-sink-sink.json
@@ -0,0 +1,46 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.jmsapacheactivemqsink.CamelJmsapacheactivemqsinkSinkConnector",
+		"artifactId": "camel-jms-apache-activemq-sink-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-jms-apache-activemq-sink-sink",
+		"type": "sink",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "A Kamelet that can produce events to an Apache ActiveMQ Classic message broker using JMS"
+	},
+	"properties": {
+		"camel.kamelet.jms-apache-activemq-sink.destinationType": {
+			"name": "camel.kamelet.jms-apache-activemq-sink.destinationType",
+			"description": "The JMS destination type (i.e.: queue or topic)",
+			"defaultValue": "\"queue\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.jms-apache-activemq-sink.destinationName": {
+			"name": "camel.kamelet.jms-apache-activemq-sink.destinationName",
+			"description": "The JMS destination name Example: person",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.jms-apache-activemq-sink.brokerURL": {
+			"name": "camel.kamelet.jms-apache-activemq-sink.brokerURL",
+			"description": "The JMS URL Example: tcp:\/\/my-host:61616",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.jms-apache-activemq-sink.password": {
+			"name": "camel.kamelet.jms-apache-activemq-sink.password",
+			"description": "Target AMQ Broker password Example: password1!",
+			"defaultValue": "\"admin\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.jms-apache-activemq-sink.username": {
+			"name": "camel.kamelet.jms-apache-activemq-sink.username",
+			"description": "Target AMQ Broker Username Example: userName",
+			"defaultValue": "\"admin\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jms-apache-activemq-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jms-apache-activemq-source-source.json
new file mode 100644
index 000000000..4223dec40
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jms-apache-activemq-source-source.json
@@ -0,0 +1,46 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.jmsapacheactivemqsource.CamelJmsapacheactivemqsourceSourceConnector",
+		"artifactId": "camel-jms-apache-activemq-source-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-jms-apache-activemq-source-source",
+		"type": "source",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "A Kamelet that can consume events from an Apache ActiveMQ Classic message broker using JMS"
+	},
+	"properties": {
+		"camel.kamelet.jms-apache-activemq-source.destinationType": {
+			"name": "camel.kamelet.jms-apache-activemq-source.destinationType",
+			"description": "The JMS destination type (i.e.: queue or topic)",
+			"defaultValue": "\"queue\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.jms-apache-activemq-source.destinationName": {
+			"name": "camel.kamelet.jms-apache-activemq-source.destinationName",
+			"description": "The JMS destination name",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.jms-apache-activemq-source.brokerURL": {
+			"name": "camel.kamelet.jms-apache-activemq-source.brokerURL",
+			"description": "The JMS URL Example: tcp:\/\/k3s-node-master.usersys.redhat.com:31616",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.jms-apache-activemq-source.password": {
+			"name": "camel.kamelet.jms-apache-activemq-source.password",
+			"description": "Target AMQ Broker password Example: password1!",
+			"defaultValue": "\"admin\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.jms-apache-activemq-source.username": {
+			"name": "camel.kamelet.jms-apache-activemq-source.username",
+			"description": "Target AMQ Broker userName Example: userName",
+			"defaultValue": "\"admin\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source-source.json
index 45aba2ea5..cddaef06b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source-source.json
@@ -80,6 +80,13 @@
 			"description": "A string that uniquely identifies the group of consumers to which this source belongs Example: my-group-id",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.kafka-source.deserializeHeaders": {
+			"name": "camel.kamelet.kafka-source.deserializeHeaders",
+			"description": "When enabled the Kamelet source will deserialize all message headers to String representation.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-ssl-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-ssl-sink-sink.json
new file mode 100644
index 000000000..6249a25d4
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-ssl-sink-sink.json
@@ -0,0 +1,77 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.kafkasslsink.CamelKafkasslsinkSinkConnector",
+		"artifactId": "camel-kafka-ssl-sink-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-kafka-ssl-sink-sink",
+		"type": "sink",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Send data to Kafka topics wit TLS\/SSL support.\n\nThe Kamelet is able to understand the following headers to be set:\n\n- `key` \/ `ce-key`: as message key\n\n- `partition-key` \/ `ce-partitionkey`: as message partition key\n\nBoth the headers are optional."
+	},
+	"properties": {
+		"camel.kamelet.kafka-ssl-sink.bootstrapServers": {
+			"name": "camel.kamelet.kafka-ssl-sink.bootstrapServers",
+			"description": "Comma separated list of Kafka Broker URLs",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.kafka-ssl-sink.sslKeystoreLocation": {
+			"name": "camel.kamelet.kafka-ssl-sink.sslKeystoreLocation",
+			"description": "The location of the key store file. This is optional for client and can be used for two-way authentication for client.",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.kafka-ssl-sink.sslProtocol": {
+			"name": "camel.kamelet.kafka-ssl-sink.sslProtocol",
+			"description": "The SSL protocol used to generate the SSLContext. Default setting is TLS, which is fine for most cases. Allowed values in recent JVMs are TLS, TLSv1.1 and TLSv1.2. SSL, SSLv2 and SSLv3 may be supported in older JVMs, but their usage is discouraged due to known security vulnerabilities.",
+			"defaultValue": "\"TLSv1.2\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.kafka-ssl-sink.saslMechanism": {
+			"name": "camel.kamelet.kafka-ssl-sink.saslMechanism",
+			"description": "The Simple Authentication and Security Layer (SASL) Mechanism used.",
+			"defaultValue": "\"GSSAPI\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.kafka-ssl-sink.sslEnabledProtocols": {
+			"name": "camel.kamelet.kafka-ssl-sink.sslEnabledProtocols",
+			"description": "The list of protocols enabled for SSL connections. TLSv1.2, TLSv1.1 and TLSv1 are enabled by default.",
+			"defaultValue": "\"TLSv1.2,TLSv1.1,TLSv1\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.kafka-ssl-sink.sslKeystorePassword": {
+			"name": "camel.kamelet.kafka-ssl-sink.sslKeystorePassword",
+			"description": "The store password for the key store file.This is optional for client and only needed if ssl.keystore.location is configured.",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.kafka-ssl-sink.sslTruststoreLocation": {
+			"name": "camel.kamelet.kafka-ssl-sink.sslTruststoreLocation",
+			"description": "The location of the trust store file.",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.kafka-ssl-sink.sslKeyPassword": {
+			"name": "camel.kamelet.kafka-ssl-sink.sslKeyPassword",
+			"description": "The password of the private key in the key store file.",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.kafka-ssl-sink.topic": {
+			"name": "camel.kamelet.kafka-ssl-sink.topic",
+			"description": "Comma separated list of Kafka topic names",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.kafka-ssl-sink.securityProtocol": {
+			"name": "camel.kamelet.kafka-ssl-sink.securityProtocol",
+			"description": "Protocol used to communicate with brokers. SASL_PLAINTEXT, PLAINTEXT, SASL_SSL and SSL are supported",
+			"defaultValue": "\"SSL\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-ssl-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-ssl-source-source.json
new file mode 100644
index 000000000..c05e586b3
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-ssl-source-source.json
@@ -0,0 +1,118 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.kafkasslsource.CamelKafkasslsourceSourceConnector",
+		"artifactId": "camel-kafka-ssl-source-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-kafka-ssl-source-source",
+		"type": "source",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Receive data from Kafka topics with SSL\/TLS support"
+	},
+	"properties": {
+		"camel.kamelet.kafka-ssl-source.topic": {
+			"name": "camel.kamelet.kafka-ssl-source.topic",
+			"description": "Comma separated list of Kafka topic names",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.kafka-ssl-source.bootstrapServers": {
+			"name": "camel.kamelet.kafka-ssl-source.bootstrapServers",
+			"description": "Comma separated list of Kafka Broker URLs",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.kafka-ssl-source.securityProtocol": {
+			"name": "camel.kamelet.kafka-ssl-source.securityProtocol",
+			"description": "Protocol used to communicate with brokers. SASL_PLAINTEXT, PLAINTEXT, SASL_SSL and SSL are supported",
+			"defaultValue": "\"SSL\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.kafka-ssl-source.saslMechanism": {
+			"name": "camel.kamelet.kafka-ssl-source.saslMechanism",
+			"description": "The Simple Authentication and Security Layer (SASL) Mechanism used.",
+			"defaultValue": "\"GSSAPI\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.kafka-ssl-source.autoCommitEnable": {
+			"name": "camel.kamelet.kafka-ssl-source.autoCommitEnable",
+			"description": "If true, periodically commit to ZooKeeper the offset of messages already fetched by the consumer",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.kafka-ssl-source.allowManualCommit": {
+			"name": "camel.kamelet.kafka-ssl-source.allowManualCommit",
+			"description": "Whether to allow doing manual commits",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.kafka-ssl-source.pollOnError": {
+			"name": "camel.kamelet.kafka-ssl-source.pollOnError",
+			"description": "What to do if kafka threw an exception while polling for new messages. There are 5 enums and the value can be one of DISCARD, ERROR_HANDLER, RECONNECT, RETRY, STOP",
+			"defaultValue": "\"ERROR_HANDLER\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.kafka-ssl-source.autoOffsetReset": {
+			"name": "camel.kamelet.kafka-ssl-source.autoOffsetReset",
+			"description": "What to do when there is no initial offset. There are 3 enums and the value can be one of latest, earliest, none",
+			"defaultValue": "\"latest\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.kafka-ssl-source.consumerGroup": {
+			"name": "camel.kamelet.kafka-ssl-source.consumerGroup",
+			"description": "A string that uniquely identifies the group of consumers to which this source belongs Example: my-group-id",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.kafka-ssl-source.deserializeHeaders": {
+			"name": "camel.kamelet.kafka-ssl-source.deserializeHeaders",
+			"description": "When enabled the Kamelet source will deserialize all message headers to String representation.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.kafka-ssl-source.sslKeyPassword": {
+			"name": "camel.kamelet.kafka-ssl-source.sslKeyPassword",
+			"description": "The password of the private key in the key store file.",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.kafka-ssl-source.sslKeystorePassword": {
+			"name": "camel.kamelet.kafka-ssl-source.sslKeystorePassword",
+			"description": "The store password for the key store file.This is optional for client and only needed if ssl.keystore.location is configured.",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.kafka-ssl-source.sslProtocol": {
+			"name": "camel.kamelet.kafka-ssl-source.sslProtocol",
+			"description": "The SSL protocol used to generate the SSLContext. Default setting is TLS, which is fine for most cases. Allowed values in recent JVMs are TLS, TLSv1.1 and TLSv1.2. SSL, SSLv2 and SSLv3 may be supported in older JVMs, but their usage is discouraged due to known security vulnerabilities.",
+			"defaultValue": "\"TLSv1.2\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.kafka-ssl-source.sslKeystoreLocation": {
+			"name": "camel.kamelet.kafka-ssl-source.sslKeystoreLocation",
+			"description": "The location of the key store file. This is optional for client and can be used for two-way authentication for client.",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.kafka-ssl-source.sslTruststoreLocation": {
+			"name": "camel.kamelet.kafka-ssl-source.sslTruststoreLocation",
+			"description": "The location of the trust store file.",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.kafka-ssl-source.sslEnabledProtocols": {
+			"name": "camel.kamelet.kafka-ssl-source.sslEnabledProtocols",
+			"description": "The list of protocols enabled for SSL connections. TLSv1.2, TLSv1.1 and TLSv1 are enabled by default.",
+			"defaultValue": "\"TLSv1.2,TLSv1.1,TLSv1\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mqtt5-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mqtt5-sink-sink.json
new file mode 100644
index 000000000..63c47f9cf
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mqtt5-sink-sink.json
@@ -0,0 +1,37 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.mqtt5sink.CamelMqtt5sinkSinkConnector",
+		"artifactId": "camel-mqtt5-sink-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-mqtt5-sink-sink",
+		"type": "sink",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Allows sending messages to any endpoint that supports the MQTT v5 protocol, such as a message broker."
+	},
+	"properties": {
+		"camel.kamelet.mqtt5-sink.topic": {
+			"name": "camel.kamelet.mqtt5-sink.topic",
+			"description": "The topic to send messages to Example: mytopic",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.mqtt5-sink.brokerUrl": {
+			"name": "camel.kamelet.mqtt5-sink.brokerUrl",
+			"description": "The URL of the broker where to establish the connection Example: tcp:\/\/mosquitto:1883",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.mqtt5-sink.username": {
+			"name": "camel.kamelet.mqtt5-sink.username",
+			"description": "Username to use when connecting to the MQTT v5 compliant broker",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.mqtt5-sink.password": {
+			"name": "camel.kamelet.mqtt5-sink.password",
+			"description": "Password to use when connecting to the MQTT v5 compliant broker",
+			"priority": "MEDIUM",
+			"required": "false"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mqtt5-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mqtt5-source-source.json
new file mode 100644
index 000000000..3d567102b
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mqtt5-source-source.json
@@ -0,0 +1,44 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.mqtt5source.CamelMqtt5sourceSourceConnector",
+		"artifactId": "camel-mqtt5-source-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-mqtt5-source-source",
+		"type": "source",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Allows receiving messages from any endpoint that supports the MQTT v5 protocol, such as a message broker."
+	},
+	"properties": {
+		"camel.kamelet.mqtt5-source.topic": {
+			"name": "camel.kamelet.mqtt5-source.topic",
+			"description": "The topic to subscribe to Example: mytopic",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.mqtt5-source.brokerUrl": {
+			"name": "camel.kamelet.mqtt5-source.brokerUrl",
+			"description": "The URL of the broker where to establish the connection Example: tcp:\/\/mosquitto:1883",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.mqtt5-source.clientId": {
+			"name": "camel.kamelet.mqtt5-source.clientId",
+			"description": "The client ID to use when connecting to the resource",
+			"defaultValue": "\"mqtt-source\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.mqtt5-source.username": {
+			"name": "camel.kamelet.mqtt5-source.username",
+			"description": "Username to use when connecting to the MQTT v5 compliant broker",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.mqtt5-source.password": {
+			"name": "camel.kamelet.mqtt5-source.password",
+			"description": "Password to use when connecting to the MQTT v5 compliant broker",
+			"priority": "MEDIUM",
+			"required": "false"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json
index 8aa3d1a02..0fa8e4e02 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json
@@ -146,13 +146,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.producerPoolMaxActive": {
-			"name": "camel.sink.endpoint.producerPoolMaxActive",
-			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.",
-			"defaultValue": "-1",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.producerPoolMaxIdle": {
 			"name": "camel.sink.endpoint.producerPoolMaxIdle",
 			"description": "Sets the cap on the number of idle instances in the pool.",
@@ -160,6 +153,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.producerPoolMaxTotal": {
+			"name": "camel.sink.endpoint.producerPoolMaxTotal",
+			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.",
+			"defaultValue": "-1",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.producerPoolMinEvictableIdle": {
 			"name": "camel.sink.endpoint.producerPoolMinEvictableIdle",
 			"description": "Sets the minimum amount of time (value in millis) an object may sit idle in the pool before it is eligible for eviction by the idle object evictor.",
@@ -472,13 +472,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.netty-http.producerPoolMaxActive": {
-			"name": "camel.component.netty-http.producerPoolMaxActive",
-			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.",
-			"defaultValue": "-1",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.netty-http.producerPoolMaxIdle": {
 			"name": "camel.component.netty-http.producerPoolMaxIdle",
 			"description": "Sets the cap on the number of idle instances in the pool.",
@@ -486,6 +479,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.netty-http.producerPoolMaxTotal": {
+			"name": "camel.component.netty-http.producerPoolMaxTotal",
+			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.",
+			"defaultValue": "-1",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.netty-http.producerPoolMinEvictableIdle": {
 			"name": "camel.component.netty-http.producerPoolMinEvictableIdle",
 			"description": "Sets the minimum amount of time (value in millis) an object may sit idle in the pool before it is eligible for eviction by the idle object evictor.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json
index 5e284462d..cf45dbf66 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json
@@ -119,13 +119,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.producerPoolMaxActive": {
-			"name": "camel.sink.endpoint.producerPoolMaxActive",
-			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.",
-			"defaultValue": "-1",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.producerPoolMaxIdle": {
 			"name": "camel.sink.endpoint.producerPoolMaxIdle",
 			"description": "Sets the cap on the number of idle instances in the pool.",
@@ -133,6 +126,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.producerPoolMaxTotal": {
+			"name": "camel.sink.endpoint.producerPoolMaxTotal",
+			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.",
+			"defaultValue": "-1",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.producerPoolMinEvictableIdle": {
 			"name": "camel.sink.endpoint.producerPoolMinEvictableIdle",
 			"description": "Sets the minimum amount of time (value in millis) an object may sit idle in the pool before it is eligible for eviction by the idle object evictor.",
@@ -472,13 +472,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.netty.producerPoolMaxActive": {
-			"name": "camel.component.netty.producerPoolMaxActive",
-			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.",
-			"defaultValue": "-1",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.netty.producerPoolMaxIdle": {
 			"name": "camel.component.netty.producerPoolMaxIdle",
 			"description": "Sets the cap on the number of idle instances in the pool.",
@@ -486,6 +479,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.netty.producerPoolMaxTotal": {
+			"name": "camel.component.netty.producerPoolMaxTotal",
+			"description": "Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit.",
+			"defaultValue": "-1",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.netty.producerPoolMinEvictableIdle": {
 			"name": "camel.component.netty.producerPoolMinEvictableIdle",
 			"description": "Sets the minimum amount of time (value in millis) an object may sit idle in the pool before it is eligible for eviction by the idle object evictor.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oracle-database-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oracle-database-sink-sink.json
new file mode 100644
index 000000000..0792be633
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oracle-database-sink-sink.json
@@ -0,0 +1,50 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.oracledatabasesink.CamelOracledatabasesinkSinkConnector",
+		"artifactId": "camel-oracle-database-sink-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-oracle-database-sink-sink",
+		"type": "sink",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Send data to a Oracle Database.\n\nIn your KameletBinding file you'll need to explicitly declare the Oracle Database driver dependency in spec->integration->dependencies\n\n- \"mvn:com.oracle.database.jdbc:ojdbc11:<version>\"\n\nThis Kamelet expects a JSON as body. The mapping between the JSON fields and parameters is done by key, so if you have the following query:\n\n'INSERT INTO accounts (username,city) VALUES (:#username,:#city)'\n\nThe Kamelet needs to receive as i [...]
+	},
+	"properties": {
+		"camel.kamelet.oracle-database-sink.serverName": {
+			"name": "camel.kamelet.oracle-database-sink.serverName",
+			"description": "Server Name for the data source Example: localhost",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.oracle-database-sink.serverPort": {
+			"name": "camel.kamelet.oracle-database-sink.serverPort",
+			"description": "Server Port for the data source",
+			"defaultValue": "\"1521\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.oracle-database-sink.username": {
+			"name": "camel.kamelet.oracle-database-sink.username",
+			"description": "The username to use for accessing a secured Oracle Database",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.oracle-database-sink.password": {
+			"name": "camel.kamelet.oracle-database-sink.password",
+			"description": "The password to use for accessing a secured Oracle Database",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.oracle-database-sink.query": {
+			"name": "camel.kamelet.oracle-database-sink.query",
+			"description": "The Query to execute against the Oracle Database Example: INSERT INTO accounts (username,city) VALUES (:#username,:#city)",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.oracle-database-sink.databaseName": {
+			"name": "camel.kamelet.oracle-database-sink.databaseName",
+			"description": "The Database Name we are pointing",
+			"priority": "HIGH",
+			"required": "true"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oracle-database-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oracle-database-source-source.json
new file mode 100644
index 000000000..9a4bbb5d2
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oracle-database-source-source.json
@@ -0,0 +1,56 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.oracledatabasesource.CamelOracledatabasesourceSourceConnector",
+		"artifactId": "camel-oracle-database-source-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-oracle-database-source-source",
+		"type": "source",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Query data from a Oracle Database.\n\nIn your KameletBinding file you'll need to explicitly declare the Oracle Database driver dependency in spec->integration->dependencies\n\n- \"mvn:com.oracle.database.jdbc:ojdbc11:<version>\""
+	},
+	"properties": {
+		"camel.kamelet.oracle-database-source.serverName": {
+			"name": "camel.kamelet.oracle-database-source.serverName",
+			"description": "Server Name for the data source Example: localhost",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.oracle-database-source.serverPort": {
+			"name": "camel.kamelet.oracle-database-source.serverPort",
+			"description": "Server Port for the data source",
+			"defaultValue": "\"1521\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.oracle-database-source.username": {
+			"name": "camel.kamelet.oracle-database-source.username",
+			"description": "The username to use for accessing a secured Oracle Database",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.oracle-database-source.password": {
+			"name": "camel.kamelet.oracle-database-source.password",
+			"description": "The password to use for accessing a secured Oracle Database",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.oracle-database-source.query": {
+			"name": "camel.kamelet.oracle-database-source.query",
+			"description": "The Query to execute against the Oracle Database Example: INSERT INTO accounts (username,city) VALUES (:#username,:#city)",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.oracle-database-source.databaseName": {
+			"name": "camel.kamelet.oracle-database-source.databaseName",
+			"description": "The Database Name we are pointing",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.oracle-database-source.consumedQuery": {
+			"name": "camel.kamelet.oracle-database-source.consumedQuery",
+			"description": "A query to run on a tuple consumed Example: DELETE FROM accounts where user_id = :#user_id",
+			"priority": "MEDIUM",
+			"required": "false"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-openapi-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-openapi-sink-sink.json
new file mode 100644
index 000000000..8fcd8928c
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-openapi-sink-sink.json
@@ -0,0 +1,25 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.restopenapisink.CamelRestopenapisinkSinkConnector",
+		"artifactId": "camel-rest-openapi-sink-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-rest-openapi-sink-sink",
+		"type": "sink",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Load OpenAPI specification from URI and call an operation on the HTTP service. The request is generated respecting the rules given in the OpenAPI specification (e.g. path parameters, Content-Type)."
+	},
+	"properties": {
+		"camel.kamelet.rest-openapi-sink.specification": {
+			"name": "camel.kamelet.rest-openapi-sink.specification",
+			"description": "URI to the OpenApi specification file Example: https:\/\/api.example.com\/openapi.json",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.rest-openapi-sink.operation": {
+			"name": "camel.kamelet.rest-openapi-sink.operation",
+			"description": "The operation to call",
+			"priority": "HIGH",
+			"required": "true"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-create-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-create-sink-sink.json
new file mode 100644
index 000000000..4d13305bb
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-create-sink-sink.json
@@ -0,0 +1,50 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.salesforcecreatesink.CamelSalesforcecreatesinkSinkConnector",
+		"artifactId": "camel-salesforce-create-sink-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-salesforce-create-sink-sink",
+		"type": "sink",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Creates an object in Salesforce. The body of the message must contain\nthe JSON of the salesforce object.\n\nExample body: { \"Phone\": \"555\", \"Name\": \"Antonia\", \"LastName\": \"Garcia\" }"
+	},
+	"properties": {
+		"camel.kamelet.salesforce-create-sink.sObjectName": {
+			"name": "camel.kamelet.salesforce-create-sink.sObjectName",
+			"description": "Type of the object Example: Contact",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.salesforce-create-sink.loginUrl": {
+			"name": "camel.kamelet.salesforce-create-sink.loginUrl",
+			"description": "The Salesforce instance login URL",
+			"defaultValue": "\"https:\/\/login.salesforce.com\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.salesforce-create-sink.clientId": {
+			"name": "camel.kamelet.salesforce-create-sink.clientId",
+			"description": "The Salesforce application consumer key",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.salesforce-create-sink.clientSecret": {
+			"name": "camel.kamelet.salesforce-create-sink.clientSecret",
+			"description": "The Salesforce application consumer secret",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.salesforce-create-sink.userName": {
+			"name": "camel.kamelet.salesforce-create-sink.userName",
+			"description": "The Salesforce username",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.salesforce-create-sink.password": {
+			"name": "camel.kamelet.salesforce-create-sink.password",
+			"description": "The Salesforce user password",
+			"priority": "HIGH",
+			"required": "true"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-delete-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-delete-sink-sink.json
new file mode 100644
index 000000000..a71af9fd1
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-delete-sink-sink.json
@@ -0,0 +1,44 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.salesforcedeletesink.CamelSalesforcedeletesinkSinkConnector",
+		"artifactId": "camel-salesforce-delete-sink-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-salesforce-delete-sink-sink",
+		"type": "sink",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Removes an object from Salesforce. The body received must be a json\ncontaining two keys: sObjectId and sObjectName.\n\nExample body: { \"sObjectId\": \"XXXXX0\", \"sObjectName\": \"Contact\" }"
+	},
+	"properties": {
+		"camel.kamelet.salesforce-delete-sink.loginUrl": {
+			"name": "camel.kamelet.salesforce-delete-sink.loginUrl",
+			"description": "The Salesforce instance login URL",
+			"defaultValue": "\"https:\/\/login.salesforce.com\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.salesforce-delete-sink.clientId": {
+			"name": "camel.kamelet.salesforce-delete-sink.clientId",
+			"description": "The Salesforce application consumer key",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.salesforce-delete-sink.clientSecret": {
+			"name": "camel.kamelet.salesforce-delete-sink.clientSecret",
+			"description": "The Salesforce application consumer secret",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.salesforce-delete-sink.userName": {
+			"name": "camel.kamelet.salesforce-delete-sink.userName",
+			"description": "The Salesforce username",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.salesforce-delete-sink.password": {
+			"name": "camel.kamelet.salesforce-delete-sink.password",
+			"description": "The Salesforce user password",
+			"priority": "HIGH",
+			"required": "true"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-update-sink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-update-sink-sink.json
new file mode 100644
index 000000000..ac3d78bbf
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-update-sink-sink.json
@@ -0,0 +1,56 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.salesforceupdatesink.CamelSalesforceupdatesinkSinkConnector",
+		"artifactId": "camel-salesforce-update-sink-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-salesforce-update-sink-sink",
+		"type": "sink",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Updates an object in  Salesforce. The body received must contain a\nJSON key-value pair for each property to update and sObjectName and\nsObjectId must be provided as parameters.\n\nExample of key-value pair: { \"Phone\": \"1234567890\", \"Name\": \"Antonia\" }"
+	},
+	"properties": {
+		"camel.kamelet.salesforce-update-sink.sObjectName": {
+			"name": "camel.kamelet.salesforce-update-sink.sObjectName",
+			"description": "Type of the object. Only required if using key-value pair. Example: Contact",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.salesforce-update-sink.sObjectId": {
+			"name": "camel.kamelet.salesforce-update-sink.sObjectId",
+			"description": "Id of the object. Only required if using key-value pair.",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.salesforce-update-sink.loginUrl": {
+			"name": "camel.kamelet.salesforce-update-sink.loginUrl",
+			"description": "The Salesforce instance login URL",
+			"defaultValue": "\"https:\/\/login.salesforce.com\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.salesforce-update-sink.clientId": {
+			"name": "camel.kamelet.salesforce-update-sink.clientId",
+			"description": "The Salesforce application consumer key",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.salesforce-update-sink.clientSecret": {
+			"name": "camel.kamelet.salesforce-update-sink.clientSecret",
+			"description": "The Salesforce application consumer secret",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.salesforce-update-sink.userName": {
+			"name": "camel.kamelet.salesforce-update-sink.userName",
+			"description": "The Salesforce username",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.salesforce-update-sink.password": {
+			"name": "camel.kamelet.salesforce-update-sink.password",
+			"description": "The Salesforce user password",
+			"priority": "HIGH",
+			"required": "true"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source-source.json
index b742aa023..a123b3cff 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source-source.json
@@ -17,9 +17,15 @@
 		},
 		"camel.kamelet.slack-source.token": {
 			"name": "camel.kamelet.slack-source.token",
-			"description": "The token to access Slack. A Slack app is needed. This app needs to have channels:history and channels:read permissions. The Bot User OAuth Access Token is the kind of token needed.",
+			"description": "The token to access Slack. A Slack app is needed. The token to access Slack. This app needs to have channels:history, groups:history, im:history, mpim:history, channels:read, groups:read, im:read and mpim:read permissions. The User OAuth Token is the kind of token needed.",
 			"priority": "HIGH",
 			"required": "true"
+		},
+		"camel.kamelet.slack-source.delay": {
+			"name": "camel.kamelet.slack-source.delay",
+			"description": "The delay between polls Example: 1s",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
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 5759de58c..b6aa51b98 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties
+++ b/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties
@@ -1,4 +1,5 @@
 camel-aws-cloudwatch-sink-sink
+camel-aws-ddb-sink-sink
 camel-aws-ddb-streams-source-source
 camel-aws-ec2-sink-sink
 camel-aws-kinesis-firehose-sink-sink
@@ -11,6 +12,7 @@ camel-aws-s3-sink-sink
 camel-aws-s3-source-source
 camel-aws-s3-streaming-upload-sink-sink
 camel-aws-secrets-manager-sink-sink
+camel-aws-ses-sink-sink
 camel-aws-sns-fifo-sink-sink
 camel-aws-sns-sink-sink
 camel-aws-sqs-batch-sink-sink
@@ -22,6 +24,9 @@ camel-aws2-kms-sink
 camel-azure-cosmosdb-source-source
 camel-azure-eventhubs-sink-sink
 camel-azure-eventhubs-source-source
+camel-azure-servicebus-sink-sink
+camel-azure-servicebus-source-source
+camel-azure-storage-blob-changefeed-source-source
 camel-azure-storage-blob-sink-sink
 camel-azure-storage-blob-source-source
 camel-azure-storage-queue-sink-sink
@@ -50,7 +55,12 @@ camel-ftp-sink-sink
 camel-ftp-source-source
 camel-ftps-sink-sink
 camel-ftps-source-source
-camel-github-source-source
+camel-github-commit-source-source
+camel-github-event-source-source
+camel-github-pullrequest-comment-source-source
+camel-github-pullrequest-source-source
+camel-github-tag-source-source
+camel-google-bigquery-sink-sink
 camel-google-calendar-source-source
 camel-google-functions-sink-sink
 camel-google-mail-source-source
@@ -72,12 +82,16 @@ camel-jdbc-sink
 camel-jira-source-source
 camel-jms-amqp-10-sink-sink
 camel-jms-amqp-10-source-source
+camel-jms-apache-activemq-sink-sink
+camel-jms-apache-activemq-source-source
 camel-jms-apache-artemis-sink-sink
 camel-jms-apache-artemis-source-source
 camel-kafka-not-secured-sink-sink
 camel-kafka-not-secured-source-source
 camel-kafka-sink-sink
 camel-kafka-source-source
+camel-kafka-ssl-sink-sink
+camel-kafka-ssl-source-source
 camel-kubernetes-namespaces-source-source
 camel-kubernetes-nodes-source-source
 camel-kubernetes-pods-source-source
@@ -92,6 +106,8 @@ camel-mongodb-sink-sink
 camel-mongodb-source-source
 camel-mqtt-sink-sink
 camel-mqtt-source-source
+camel-mqtt5-sink-sink
+camel-mqtt5-source-source
 camel-mysql-sink-sink
 camel-mysql-source-source
 camel-nats-sink-sink
@@ -100,6 +116,8 @@ camel-netty-http-source
 camel-netty-http-sink
 camel-netty-source
 camel-netty-sink
+camel-oracle-database-sink-sink
+camel-oracle-database-source-source
 camel-postgresql-sink-sink
 camel-postgresql-source-source
 camel-pulsar-sink-sink
@@ -107,7 +125,11 @@ camel-pulsar-source-source
 camel-rabbitmq-source-source
 camel-redis-sink-sink
 camel-redis-source-source
+camel-rest-openapi-sink-sink
+camel-salesforce-create-sink-sink
+camel-salesforce-delete-sink-sink
 camel-salesforce-source-source
+camel-salesforce-update-sink-sink
 camel-sftp-sink-sink
 camel-sftp-source-source
 camel-sjms2-source
diff --git a/connectors/camel-aws-cloudwatch-sink-kafka-connector/pom.xml b/connectors/camel-aws-cloudwatch-sink-kafka-connector/pom.xml
index dc920f6e4..a10e84bcc 100644
--- a/connectors/camel-aws-cloudwatch-sink-kafka-connector/pom.xml
+++ b/connectors/camel-aws-cloudwatch-sink-kafka-connector/pom.xml
@@ -45,6 +45,10 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-aws2-cw</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
diff --git a/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/generated/resources/camel-aws-cloudwatch-sink-sink.json b/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/generated/resources/camel-aws-cloudwatch-sink-sink.json
index 27a49d280..8c1be4e51 100644
--- a/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/generated/resources/camel-aws-cloudwatch-sink-sink.json
+++ b/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/generated/resources/camel-aws-cloudwatch-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-cloudwatch-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Send messages to AWS CloudWatch metrics.\n\nThere are several properties you can set in the headers, such as:\n\n`metric-name` \/ `ce-metricname` for the metric name.\n`metric-value` \/ `ce-metricvalue` for the metric value.\n`metric-unit` \/ `ce-metricunit` for the metric unit.\n`metric-timestamp` \/ `ce-metrictimestamp` for the metric timestamp.\n`metric-dimension-name` \/ `ce-metricdimensionname` for the dimension name.\n`metric-dimension-value` \/ `ce-metricdimensio [...]
+		"description": "Send messages to AWS CloudWatch metrics.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS CloudWatch Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the CloudWatch client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter  [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-cloudwatch-sink.cwNamespace": {
@@ -18,20 +18,40 @@
 		"camel.kamelet.aws-cloudwatch-sink.accessKey": {
 			"name": "camel.kamelet.aws-cloudwatch-sink.accessKey",
 			"description": "The access key obtained from AWS.",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-cloudwatch-sink.secretKey": {
 			"name": "camel.kamelet.aws-cloudwatch-sink.secretKey",
 			"description": "The secret key obtained from AWS.",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-cloudwatch-sink.region": {
 			"name": "camel.kamelet.aws-cloudwatch-sink.region",
 			"description": "The AWS region to connect to. Example: eu-west-1",
 			"priority": "HIGH",
 			"required": "true"
+		},
+		"camel.kamelet.aws-cloudwatch-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-cloudwatch-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the CloudWatch client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-cloudwatch-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-cloudwatch-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-cloudwatch-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-cloudwatch-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/docs/examples/CamelAwscloudwatchsinkSinkConnector.properties b/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/docs/examples/CamelAwscloudwatchsinkSinkConnector.properties
index cfbe4bbe4..7f3a63ed4 100644
--- a/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/docs/examples/CamelAwscloudwatchsinkSinkConnector.properties
+++ b/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/docs/examples/CamelAwscloudwatchsinkSinkConnector.properties
@@ -28,12 +28,7 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The access key obtained from AWS.
-camel.kamelet.aws-cloudwatch-sink.accessKey=
 # The cloud watch metric namespace.
 camel.kamelet.aws-cloudwatch-sink.cwNamespace=
 # The AWS region to connect to. Example: eu-west-1
 camel.kamelet.aws-cloudwatch-sink.region=
-# The secret key obtained from AWS.
-camel.kamelet.aws-cloudwatch-sink.secretKey=
-
diff --git a/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscloudwatchsink/CamelAwscloudwatchsinkSinkConnectorConfig.java b/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscloudwatchsink/CamelAwscloudwatchsinkSinkConnectorConfig.java
index 4a7e7a27e..d811c346e 100644
--- a/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscloudwatchsink/CamelAwscloudwatchsinkSinkConnectorConfig.java
+++ b/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscloudwatchsink/CamelAwscloudwatchsinkSinkConnectorConfig.java
@@ -38,6 +38,15 @@ public class CamelAwscloudwatchsinkSinkConnectorConfig
     public static final String CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_REGION_CONF = "camel.kamelet.aws-cloudwatch-sink.region";
     public static final String CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_REGION_DOC = "The AWS region to connect to. Example: eu-west-1";
     public static final String CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_REGION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-cloudwatch-sink.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the CloudWatch client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF = "camel.kamelet.aws-cloudwatch-sink.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.";
+    public static final String CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_OVERRIDE_ENDPOINT_CONF = "camel.kamelet.aws-cloudwatch-sink.overrideEndpoint";
+    public static final String CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_OVERRIDE_ENDPOINT_DOC = "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.";
+    public static final Boolean CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT = false;
 
     public CamelAwscloudwatchsinkSinkConnectorConfig(
             ConfigDef config,
@@ -53,9 +62,12 @@ public class CamelAwscloudwatchsinkSinkConnectorConfig
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_CW_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_CW_NAMESPACE_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_CW_NAMESPACE_DOC);
-        conf.define(CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_REGION_DOC);
+        conf.define(CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        conf.define(CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC);
+        conf.define(CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCLOUDWATCHSINK_KAMELET_OVERRIDE_ENDPOINT_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/resources/kamelets/aws-cloudwatch-sink.kamelet.yaml b/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/resources/kamelets/aws-cloudwatch-sink.kamelet.yaml
index baeffd44d..2e25c48a1 100644
--- a/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/resources/kamelets/aws-cloudwatch-sink.kamelet.yaml
+++ b/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/resources/kamelets/aws-cloudwatch-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-cloudwatch-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjIwNyIgaGVpZ2h0PSIyNTAwIiB2aWV3Qm94PSIwIDAgMjU2IDI5MCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCI+PHBhdGggZD0iTTI1NiAxOTkuMzA1bC0xMjcuOTU3LTE4Ljc5N0wwIDE5OS4zMjlsMTI4LjAxIDQ3LjQzOUwyNTYgMTk5LjMwNSIgZmlsbD0iI0I3Q0E5RCIvPjxwYXRoIGQ9Ik0yNS42MjEgMTk3LjExM2wyMS42MyA2Ljc2MSAxLjk3MS0yLjIzOFY1MC4yODRsLTEuOTcxLTIuNTg1LTIxLjYzIDguMjc0djE0MS4xNCIgZmlsbD0iIzRCNjEyQyIvPjxwYXRoIG [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS Cloudwatch"
@@ -33,6 +33,13 @@ spec:
     description: |-
       Send messages to AWS CloudWatch metrics.
 
+      Access Key/Secret Key are the basic method for authenticating to the AWS CloudWatch Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+      
+      When using a default Credentials Provider the CloudWatch client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
+
+      The Kamelet expects the following headers to be set:
+
+
       There are several properties you can set in the headers, such as:
 
       `metric-name` / `ce-metricname` for the metric name.
@@ -43,8 +50,6 @@ spec:
       `metric-dimension-value` / `ce-metricdimensionvalue` for the dimension value.
     required:
       - cwNamespace
-      - accessKey
-      - secretKey
       - region
     type: object
     properties:
@@ -73,10 +78,29 @@ spec:
         description: The AWS region to connect to.
         type: string
         example: eu-west-1
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the CloudWatch client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+        - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwrite Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
   dependencies:
+    - "camel:core"
     - "camel:aws2-cw"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: kamelet:source
       steps:
@@ -155,6 +179,9 @@ spec:
       - to:
           uri: "aws2-cw:{{cwNamespace}}"
           parameters:
-            secretKey: "{{secretKey}}"
-            accessKey: "{{accessKey}}"
-            region: "{{region}}"
\ No newline at end of file
+            secretKey: "{{?secretKey}}"
+            accessKey: "{{?accessKey}}"
+            region: "{{region}}"
+            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+            uriEndpointOverride: "{{?uriEndpointOverride}}"
+            overrideEndpoint: "{{overrideEndpoint}}"
\ No newline at end of file
diff --git a/connectors/camel-elasticsearch-index-sink-kafka-connector/pom.xml b/connectors/camel-aws-ddb-sink-kafka-connector/pom.xml
similarity index 92%
copy from connectors/camel-elasticsearch-index-sink-kafka-connector/pom.xml
copy to connectors/camel-aws-ddb-sink-kafka-connector/pom.xml
index b7ec4adf6..d41900749 100644
--- a/connectors/camel-elasticsearch-index-sink-kafka-connector/pom.xml
+++ b/connectors/camel-aws-ddb-sink-kafka-connector/pom.xml
@@ -24,9 +24,9 @@
     <artifactId>connectors</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>camel-elasticsearch-index-sink-kafka-connector</artifactId>
-  <name>Camel-Kafka-Connector :: elasticsearch-index-sink</name>
-  <description>Camel Kafka Connector for elasticsearch-index-sink</description>
+  <artifactId>camel-aws-ddb-sink-kafka-connector</artifactId>
+  <name>Camel-Kafka-Connector :: aws-ddb-sink</name>
+  <description>Camel Kafka Connector for aws-ddb-sink</description>
   <dependencies>
     <!-- Kafka -->
     <dependency>
@@ -45,22 +45,23 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel.kamelets</groupId>
+      <artifactId>camel-kamelets-utils</artifactId>
+      <version>0.8.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-elasticsearch-rest</artifactId>
+      <artifactId>camel-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-bean</artifactId>
+      <artifactId>camel-aws2-ddb</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-gson</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-yaml-dsl</artifactId>
diff --git a/connectors/camel-aws-ddb-sink-kafka-connector/src/generated/descriptors/connector-sink.properties b/connectors/camel-aws-ddb-sink-kafka-connector/src/generated/descriptors/connector-sink.properties
new file mode 100644
index 000000000..0ae75fffa
--- /dev/null
+++ b/connectors/camel-aws-ddb-sink-kafka-connector/src/generated/descriptors/connector-sink.properties
@@ -0,0 +1 @@
+camel-aws-ddb-sink-sink
\ No newline at end of file
diff --git a/connectors/camel-aws-ddb-sink-kafka-connector/src/generated/resources/camel-aws-ddb-sink-sink.json b/connectors/camel-aws-ddb-sink-kafka-connector/src/generated/resources/camel-aws-ddb-sink-sink.json
new file mode 100644
index 000000000..7a5324a52
--- /dev/null
+++ b/connectors/camel-aws-ddb-sink-kafka-connector/src/generated/resources/camel-aws-ddb-sink-sink.json
@@ -0,0 +1,71 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.awsddbsink.CamelAwsddbsinkSinkConnector",
+		"artifactId": "camel-aws-ddb-sink-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-aws-ddb-sink-sink",
+		"type": "sink",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Send data to AWS DynamoDB service. The sent data will insert\/update\/delete an item on the given AWS DynamoDB table.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS DynamoDB service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the AWS DynamoDB client will load the credentials through this provider and won't use the static credential. This i [...]
+	},
+	"properties": {
+		"camel.kamelet.aws-ddb-sink.table": {
+			"name": "camel.kamelet.aws-ddb-sink.table",
+			"description": "Name of the DynamoDB table to look at",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.aws-ddb-sink.accessKey": {
+			"name": "camel.kamelet.aws-ddb-sink.accessKey",
+			"description": "The access key obtained from AWS",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ddb-sink.secretKey": {
+			"name": "camel.kamelet.aws-ddb-sink.secretKey",
+			"description": "The secret key obtained from AWS",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ddb-sink.region": {
+			"name": "camel.kamelet.aws-ddb-sink.region",
+			"description": "The AWS region to connect to Example: eu-west-1",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.aws-ddb-sink.operation": {
+			"name": "camel.kamelet.aws-ddb-sink.operation",
+			"description": "The operation to perform (one of PutItem, UpdateItem, DeleteItem) Example: PutItem",
+			"defaultValue": "\"PutItem\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ddb-sink.writeCapacity": {
+			"name": "camel.kamelet.aws-ddb-sink.writeCapacity",
+			"description": "The provisioned throughput to reserved for writing resources to your table",
+			"defaultValue": "1",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ddb-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-ddb-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the DynamoDB client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ddb-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-ddb-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ddb-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-ddb-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		}
+	}
+}
diff --git a/connectors/camel-github-source-kafka-connector/src/main/assembly/package.xml b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/assembly/package.xml
similarity index 100%
copy from connectors/camel-github-source-kafka-connector/src/main/assembly/package.xml
copy to connectors/camel-aws-ddb-sink-kafka-connector/src/main/assembly/package.xml
diff --git a/connectors/camel-cxfrs-kafka-connector/src/main/docs/examples/CamelCxfrsSinkConnector.properties b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/docs/examples/CamelAwsddbsinkSinkConnector.properties
similarity index 82%
copy from connectors/camel-cxfrs-kafka-connector/src/main/docs/examples/CamelCxfrsSinkConnector.properties
copy to connectors/camel-aws-ddb-sink-kafka-connector/src/main/docs/examples/CamelAwsddbsinkSinkConnector.properties
index d667498e0..51aaa5ac9 100644
--- a/connectors/camel-cxfrs-kafka-connector/src/main/docs/examples/CamelCxfrsSinkConnector.properties
+++ b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/docs/examples/CamelAwsddbsinkSinkConnector.properties
@@ -15,8 +15,8 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-name=CamelCxfrsSinkConnector
-connector.class=org.apache.camel.kafkaconnector.cxfrs.CamelCxfrsSinkConnector
+name=CamelAws-ddb-sinkSinkConnector
+connector.class=org.apache.camel.kafkaconnector.awsddbsink.CamelAwsddbsinkSinkConnector
 tasks.max=1
 
 # use the kafka converters that better suit your needs, these are just defaults:
@@ -28,4 +28,7 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-
+# The AWS region to connect to Example: eu-west-1
+camel.kamelet.aws-ddb-sink.region=
+# Name of the DynamoDB table to look at
+camel.kamelet.aws-ddb-sink.table=
diff --git a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceConnector.java b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkConnector.java
similarity index 79%
copy from connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceConnector.java
copy to connectors/camel-aws-ddb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkConnector.java
index d7c8a90e6..92c311311 100644
--- a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceConnector.java
+++ b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkConnector.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.kafkaconnector.githubsource;
+package org.apache.camel.kafkaconnector.awsddbsink;
 
 import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnector;
 import org.apache.kafka.common.config.ConfigDef;
 import org.apache.kafka.connect.connector.Task;
 
 @Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGithubsourceSourceConnector extends CamelSourceConnector {
+public class CamelAwsddbsinkSinkConnector extends CamelSinkConnector {
 
     @Override
     public ConfigDef config() {
-        return CamelGithubsourceSourceConnectorConfig.conf();
+        return CamelAwsddbsinkSinkConnectorConfig.conf();
     }
     @Override
     public Class<? extends Task> taskClass() {
-        return CamelGithubsourceSourceTask.class;
+        return CamelAwsddbsinkSinkTask.class;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-ddb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkConnectorConfig.java b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkConnectorConfig.java
new file mode 100644
index 000000000..edb6f35d7
--- /dev/null
+++ b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkConnectorConfig.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.awsddbsink;
+
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.kafka.common.config.ConfigDef;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelAwsddbsinkSinkConnectorConfig
+        extends
+            CamelSinkConnectorConfig {
+
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_TABLE_CONF = "camel.kamelet.aws-ddb-sink.table";
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_TABLE_DOC = "Name of the DynamoDB table to look at";
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_TABLE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_ACCESS_KEY_CONF = "camel.kamelet.aws-ddb-sink.accessKey";
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_ACCESS_KEY_DOC = "The access key obtained from AWS";
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_ACCESS_KEY_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_SECRET_KEY_CONF = "camel.kamelet.aws-ddb-sink.secretKey";
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_SECRET_KEY_DOC = "The secret key obtained from AWS";
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_SECRET_KEY_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_REGION_CONF = "camel.kamelet.aws-ddb-sink.region";
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_REGION_DOC = "The AWS region to connect to Example: eu-west-1";
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_REGION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_OPERATION_CONF = "camel.kamelet.aws-ddb-sink.operation";
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_OPERATION_DOC = "The operation to perform (one of PutItem, UpdateItem, DeleteItem) Example: PutItem";
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_OPERATION_DEFAULT = "PutItem";
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_WRITE_CAPACITY_CONF = "camel.kamelet.aws-ddb-sink.writeCapacity";
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_WRITE_CAPACITY_DOC = "The provisioned throughput to reserved for writing resources to your table";
+    public static final Integer CAMEL_SINK_AWSDDBSINK_KAMELET_WRITE_CAPACITY_DEFAULT = 1;
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-ddb-sink.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the DynamoDB client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWSDDBSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF = "camel.kamelet.aws-ddb-sink.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.";
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_OVERRIDE_ENDPOINT_CONF = "camel.kamelet.aws-ddb-sink.overrideEndpoint";
+    public static final String CAMEL_SINK_AWSDDBSINK_KAMELET_OVERRIDE_ENDPOINT_DOC = "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.";
+    public static final Boolean CAMEL_SINK_AWSDDBSINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT = false;
+
+    public CamelAwsddbsinkSinkConnectorConfig(
+            ConfigDef config,
+            Map<String, String> parsedConfig) {
+        super(config, parsedConfig);
+    }
+
+    public CamelAwsddbsinkSinkConnectorConfig(Map<String, String> parsedConfig) {
+        this(conf(), parsedConfig);
+    }
+
+    public static ConfigDef conf() {
+        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
+        conf.define(CAMEL_SINK_AWSDDBSINK_KAMELET_TABLE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDBSINK_KAMELET_TABLE_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSDDBSINK_KAMELET_TABLE_DOC);
+        conf.define(CAMEL_SINK_AWSDDBSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSDDBSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDBSINK_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSDDBSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSDDBSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDBSINK_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSDDBSINK_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDBSINK_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSDDBSINK_KAMELET_REGION_DOC);
+        conf.define(CAMEL_SINK_AWSDDBSINK_KAMELET_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDBSINK_KAMELET_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDBSINK_KAMELET_OPERATION_DOC);
+        conf.define(CAMEL_SINK_AWSDDBSINK_KAMELET_WRITE_CAPACITY_CONF, ConfigDef.Type.INT, CAMEL_SINK_AWSDDBSINK_KAMELET_WRITE_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDBSINK_KAMELET_WRITE_CAPACITY_DOC);
+        conf.define(CAMEL_SINK_AWSDDBSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSDDBSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDBSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        conf.define(CAMEL_SINK_AWSDDBSINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDBSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDBSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC);
+        conf.define(CAMEL_SINK_AWSDDBSINK_KAMELET_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSDDBSINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDBSINK_KAMELET_OVERRIDE_ENDPOINT_DOC);
+        return conf;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceTask.java b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkTask.java
similarity index 70%
copy from connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceTask.java
copy to connectors/camel-aws-ddb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkTask.java
index 3e55aed5a..bbf4741f6 100644
--- a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceTask.java
+++ b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkTask.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.kafkaconnector.githubsource;
+package org.apache.camel.kafkaconnector.awsddbsink;
 
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.camel.kafkaconnector.CamelSinkTask;
 
 @Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGithubsourceSourceTask extends CamelSourceTask {
+public class CamelAwsddbsinkSinkTask extends CamelSinkTask {
 
     @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
+    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
             Map<String, String> props) {
-        return new CamelGithubsourceSourceConnectorConfig(props);
+        return new CamelAwsddbsinkSinkConnectorConfig(props);
     }
     @Override
-    protected String getSourceKamelet() {
-        return "kamelet:github-source";
+    protected String getSinkKamelet() {
+        return "kamelet:aws-ddb-sink";
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
copy from connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/LICENSE.txt
copy to connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/META-INF/LICENSE.txt
diff --git a/connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
copy from connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/NOTICE.txt
copy to connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/META-INF/NOTICE.txt
diff --git a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/kamelets/aws-ddb-sink.kamelet.yaml
similarity index 53%
copy from connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml
copy to connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/kamelets/aws-ddb-sink.kamelet.yaml
index a869bb880..8d89b6034 100644
--- a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml
+++ b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/kamelets/aws-ddb-sink.kamelet.yaml
@@ -18,24 +18,32 @@
 apiVersion: camel.apache.org/v1alpha1
 kind: Kamelet
 metadata:
-  name: aws-ddb-streams-source
+  name: aws-ddb-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjEwMCIgd2lkdGg9IjEwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBmaWxsPSIjMkQ3MkI4IiBkPSJNNzQuMTc0IDMxLjgwN2w3LjQzNyA1LjM2N3YtNy42MDJsLTcuNDgtOC43NjV2MTAuOTU3bC4wNDMuMDE1eiIvPjxwYXRoIGZpbGw9IiM1Mjk0Q0YiIGQ9Ik01OS44MzggODUuNjY2bDE0LjI5My03LjE0NlYyMC43OTFsLTE0LjMwMy03LjEyNHoiLz48cGF0aCBmaWxsPSIjMjA1Qjk4IiBkPSJNMzkuNDk2IDg1LjY2NkwyNS4yMDMgNzguNTJWMjAuNzkxbDE0LjMwMy03LjEyNHoiLz48cGF0aCBmaWxsPSIjMkQ3Mk [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS DynamoDB Streams"
   labels:
-    camel.apache.org/kamelet.type: "source"
+    camel.apache.org/kamelet.type: "sink"
 spec:
   definition:
-    title: "AWS DynamoDB Streams Source"
+    title: "AWS DynamoDB Sink"
     description: |-
-      Receive events from AWS DynamoDB Streams.
+      Send data to AWS DynamoDB service. The sent data will insert/update/delete an item on the given AWS DynamoDB table.
+
+      Access Key/Secret Key are the basic method for authenticating to the AWS DynamoDB service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+
+      When using a default Credentials Provider the AWS DynamoDB client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
+
+      This Kamelet expects a JSON as body. The mapping between the JSON fields and table attribute values is done by key, so if you have the input:
+
+      '{"username":"oscerd", "city":"Rome"}'
+
+      The Kamelet will insert/update an item in the given AWS DynamoDB table and set the attributes 'username' and 'city' respectively. Please note that the JSON object must include the primary key values that define the item.
     required:
       - table
-      - accessKey
-      - secretKey
       - region
     type: object
     properties:
@@ -64,35 +72,64 @@ spec:
         description: The AWS region to connect to
         type: string
         example: eu-west-1
-      iteratorType:
-        title: Iterator Type
-        description: 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. There are 4 enums and the value can be one of TRIM_HORIZON, LATEST, AT_SEQUENCE_NUMBER, AFTER_SEQUENCE_NUMBER
+      operation:
+        title: Operation
+        description: The operation to perform (one of PutItem, UpdateItem, DeleteItem)
         type: string
-        default: LATEST
-      sequenceNumberProvider:
-        title: Sequence Number Provider
-        description: Provider for the sequence number when using one of the two ShardIteratorType AT_SEQUENCE_NUMBER or AFTER_SEQUENCE_NUMBER iterator types. Can be a registry reference or a literal sequence number.
+        default: PutItem
+        example: PutItem
+      writeCapacity:
+        title: Write Capacity
+        description: The provisioned throughput to reserved for writing resources to your table
+        type: integer
+        default: 1
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the DynamoDB client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwrite Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
         type: string
-        example: "900000000005745712447"
-        default: "000000000000000000000"
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
   types:
-    out:
+    in:
       mediaType: application/json
   dependencies:
-  - "camel:gson"
+  - mvn:org.apache.camel.kamelets:camel-kamelets-utils:0.8.0
+  - "camel:core"
+  - "camel:jackson"
   - "camel:aws2-ddb"
   - "camel:kamelet"
-  flow:
+  template:
     from:
-      uri: "aws2-ddbstream:{{table}}"
-      parameters:
-        secretKey: "{{secretKey}}"
-        accessKey: "{{accessKey}}"
-        region: "{{region}}"
-        iteratorType: "{{iteratorType}}"
-        sequenceNumberProvider: "{{sequenceNumberProvider}}"
+      uri: "kamelet:source"
       steps:
-      - marshal:
-          json: 
-            library: Gson
-      - to: "kamelet:sink"
\ No newline at end of file
+      - set-property:
+          name: operation
+          constant: "{{operation}}"
+      - unmarshal:
+          json:
+            library: Jackson
+            unmarshalType: com.fasterxml.jackson.databind.JsonNode
+      - bean: "org.apache.camel.kamelets.utils.transform.aws.ddb.JsonToDdbModelConverter"
+      - to:
+          uri: "aws2-ddb:{{table}}"
+          parameters:
+            secretKey: "{{?secretKey}}"
+            accessKey: "{{?accessKey}}"
+            region: "{{region}}"
+            operation: "{{operation}}"
+            writeCapacity: "{{?writeCapacity}}"
+            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+            uriEndpointOverride: "{{?uriEndpointOverride}}"
+            overrideEndpoint: "{{overrideEndpoint}}"
\ No newline at end of file
diff --git a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/generated/resources/camel-aws-ddb-streams-source-source.json b/connectors/camel-aws-ddb-streams-source-kafka-connector/src/generated/resources/camel-aws-ddb-streams-source-source.json
index af6f42a79..692c2342a 100644
--- a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/generated/resources/camel-aws-ddb-streams-source-source.json
+++ b/connectors/camel-aws-ddb-streams-source-kafka-connector/src/generated/resources/camel-aws-ddb-streams-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-ddb-streams-source-source",
 		"type": "source",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Receive events from AWS DynamoDB Streams."
+		"description": "Receive events from AWS DynamoDB Streams.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS DynamoDB Streams Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the AWS DynamoDB Streams client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as man [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-ddb-streams-source.table": {
@@ -18,14 +18,14 @@
 		"camel.kamelet.aws-ddb-streams-source.accessKey": {
 			"name": "camel.kamelet.aws-ddb-streams-source.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-ddb-streams-source.secretKey": {
 			"name": "camel.kamelet.aws-ddb-streams-source.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-ddb-streams-source.region": {
 			"name": "camel.kamelet.aws-ddb-streams-source.region",
@@ -46,6 +46,26 @@
 			"defaultValue": "\"000000000000000000000\"",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.aws-ddb-streams-source.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-ddb-streams-source.useDefaultCredentialsProvider",
+			"description": "Set whether the AWS DynamoDB Streams client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ddb-streams-source.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-ddb-streams-source.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ddb-streams-source.overrideEndpoint": {
+			"name": "camel.kamelet.aws-ddb-streams-source.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/docs/examples/CamelAwsddbstreamssourceSourceConnector.properties b/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/docs/examples/CamelAwsddbstreamssourceSourceConnector.properties
index 65c499dff..fdac09cbc 100644
--- a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/docs/examples/CamelAwsddbstreamssourceSourceConnector.properties
+++ b/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/docs/examples/CamelAwsddbstreamssourceSourceConnector.properties
@@ -28,12 +28,7 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The access key obtained from AWS
-camel.kamelet.aws-ddb-streams-source.accessKey=
 # The AWS region to connect to Example: eu-west-1
 camel.kamelet.aws-ddb-streams-source.region=
-# The secret key obtained from AWS
-camel.kamelet.aws-ddb-streams-source.secretKey=
 # Name of the DynamoDB table to look at
 camel.kamelet.aws-ddb-streams-source.table=
-
diff --git a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstreamssource/CamelAwsddbstreamssourceSourceConnectorConfig.java b/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstreamssource/CamelAwsddbstreamssourceSourceConnectorConfig.java
index f221bdb69..349372cef 100644
--- a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstreamssource/CamelAwsddbstreamssourceSourceConnectorConfig.java
+++ b/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstreamssource/CamelAwsddbstreamssourceSourceConnectorConfig.java
@@ -44,6 +44,15 @@ public class CamelAwsddbstreamssourceSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_SEQUENCE_NUMBER_PROVIDER_CONF = "camel.kamelet.aws-ddb-streams-source.sequenceNumberProvider";
     public static final String CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_SEQUENCE_NUMBER_PROVIDER_DOC = "Provider for the sequence number when using one of the two ShardIteratorType AT_SEQUENCE_NUMBER or AFTER_SEQUENCE_NUMBER iterator types. Can be a registry reference or a literal sequence number. Example: 900000000005745712447";
     public static final String CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_SEQUENCE_NUMBER_PROVIDER_DEFAULT = "000000000000000000000";
+    public static final String CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-ddb-streams-source.useDefaultCredentialsProvider";
+    public static final String CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the AWS DynamoDB Streams client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_CONF = "camel.kamelet.aws-ddb-streams-source.uriEndpointOverride";
+    public static final String CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.";
+    public static final String CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_OVERRIDE_ENDPOINT_CONF = "camel.kamelet.aws-ddb-streams-source.overrideEndpoint";
+    public static final String CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_OVERRIDE_ENDPOINT_DOC = "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.";
+    public static final Boolean CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_OVERRIDE_ENDPOINT_DEFAULT = false;
 
     public CamelAwsddbstreamssourceSourceConnectorConfig(
             ConfigDef config,
@@ -59,11 +68,14 @@ public class CamelAwsddbstreamssourceSourceConnectorConfig
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSourceConnectorConfig.conf());
         conf.define(CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_TABLE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_TABLE_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_TABLE_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_SECRET_KEY_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_REGION_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_ITERATOR_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_ITERATOR_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_ITERATOR_TYPE_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_SEQUENCE_NUMBER_PROVIDER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_SEQUENCE_NUMBER_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_SEQUENCE_NUMBER_PROVIDER_DOC);
+        conf.define(CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        conf.define(CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_DOC);
+        conf.define(CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAMSSOURCE_KAMELET_OVERRIDE_ENDPOINT_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml b/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml
index a869bb880..7805ef031 100644
--- a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml
+++ b/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-ddb-streams-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjEwMCIgd2lkdGg9IjEwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBmaWxsPSIjMkQ3MkI4IiBkPSJNNzQuMTc0IDMxLjgwN2w3LjQzNyA1LjM2N3YtNy42MDJsLTcuNDgtOC43NjV2MTAuOTU3bC4wNDMuMDE1eiIvPjxwYXRoIGZpbGw9IiM1Mjk0Q0YiIGQ9Ik01OS44MzggODUuNjY2bDE0LjI5My03LjE0NlYyMC43OTFsLTE0LjMwMy03LjEyNHoiLz48cGF0aCBmaWxsPSIjMjA1Qjk4IiBkPSJNMzkuNDk2IDg1LjY2NkwyNS4yMDMgNzguNTJWMjAuNzkxbDE0LjMwMy03LjEyNHoiLz48cGF0aCBmaWxsPSIjMkQ3Mk [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS DynamoDB Streams"
@@ -32,10 +32,12 @@ spec:
     title: "AWS DynamoDB Streams Source"
     description: |-
       Receive events from AWS DynamoDB Streams.
+
+      Access Key/Secret Key are the basic method for authenticating to the AWS DynamoDB Streams Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+
+      When using a default Credentials Provider the AWS DynamoDB Streams client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
     required:
       - table
-      - accessKey
-      - secretKey
       - region
     type: object
     properties:
@@ -75,6 +77,24 @@ spec:
         type: string
         example: "900000000005745712447"
         default: "000000000000000000000"
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the AWS DynamoDB Streams client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+        - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwrite Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
   types:
     out:
       mediaType: application/json
@@ -82,17 +102,20 @@ spec:
   - "camel:gson"
   - "camel:aws2-ddb"
   - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: "aws2-ddbstream:{{table}}"
       parameters:
-        secretKey: "{{secretKey}}"
-        accessKey: "{{accessKey}}"
+        secretKey: "{{?secretKey}}"
+        accessKey: "{{?accessKey}}"
         region: "{{region}}"
         iteratorType: "{{iteratorType}}"
         sequenceNumberProvider: "{{sequenceNumberProvider}}"
+        useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+        uriEndpointOverride: "{{?uriEndpointOverride}}"
+        overrideEndpoint: "{{overrideEndpoint}}"
       steps:
       - marshal:
-          json: 
+          json:
             library: Gson
       - to: "kamelet:sink"
\ No newline at end of file
diff --git a/connectors/camel-aws-ec2-sink-kafka-connector/pom.xml b/connectors/camel-aws-ec2-sink-kafka-connector/pom.xml
index 48f8633be..c9a34cd2d 100644
--- a/connectors/camel-aws-ec2-sink-kafka-connector/pom.xml
+++ b/connectors/camel-aws-ec2-sink-kafka-connector/pom.xml
@@ -45,6 +45,10 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-aws2-ec2</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
diff --git a/connectors/camel-aws-ec2-sink-kafka-connector/src/generated/resources/camel-aws-ec2-sink-sink.json b/connectors/camel-aws-ec2-sink-kafka-connector/src/generated/resources/camel-aws-ec2-sink-sink.json
index 056a9e234..0dbb9c9be 100644
--- a/connectors/camel-aws-ec2-sink-kafka-connector/src/generated/resources/camel-aws-ec2-sink-sink.json
+++ b/connectors/camel-aws-ec2-sink-kafka-connector/src/generated/resources/camel-aws-ec2-sink-sink.json
@@ -6,26 +6,46 @@
 		"id": "camel-aws-ec2-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Check the status of EC2 instances\n\nThe Kamelet expects the following headers to be set:\n\n- `instanceIds` \/ `ce-instanceids`: as a comma separated list of EC2 instance ids."
+		"description": "Check the status of EC2 instances\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS EC2 Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the EC2 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.\n\n [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-ec2-sink.accessKey": {
 			"name": "camel.kamelet.aws-ec2-sink.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-ec2-sink.secretKey": {
 			"name": "camel.kamelet.aws-ec2-sink.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-ec2-sink.region": {
 			"name": "camel.kamelet.aws-ec2-sink.region",
 			"description": "The AWS region to connect to Example: eu-west-1",
 			"priority": "HIGH",
 			"required": "true"
+		},
+		"camel.kamelet.aws-ec2-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-ec2-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the EC2 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ec2-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-ec2-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ec2-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-ec2-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-ec2-sink-kafka-connector/src/main/docs/examples/CamelAwsec2sinkSinkConnector.properties b/connectors/camel-aws-ec2-sink-kafka-connector/src/main/docs/examples/CamelAwsec2sinkSinkConnector.properties
index f675601ff..67c98ce88 100644
--- a/connectors/camel-aws-ec2-sink-kafka-connector/src/main/docs/examples/CamelAwsec2sinkSinkConnector.properties
+++ b/connectors/camel-aws-ec2-sink-kafka-connector/src/main/docs/examples/CamelAwsec2sinkSinkConnector.properties
@@ -28,10 +28,5 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The access key obtained from AWS
-camel.kamelet.aws-ec2-sink.accessKey=
 # The AWS region to connect to Example: eu-west-1
 camel.kamelet.aws-ec2-sink.region=
-# The secret key obtained from AWS
-camel.kamelet.aws-ec2-sink.secretKey=
-
diff --git a/connectors/camel-aws-ec2-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkConnectorConfig.java b/connectors/camel-aws-ec2-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkConnectorConfig.java
index 027b1f9f2..f11546d7e 100644
--- a/connectors/camel-aws-ec2-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkConnectorConfig.java
+++ b/connectors/camel-aws-ec2-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkConnectorConfig.java
@@ -35,6 +35,15 @@ public class CamelAwsec2sinkSinkConnectorConfig
     public static final String CAMEL_SINK_AWSEC2SINK_KAMELET_REGION_CONF = "camel.kamelet.aws-ec2-sink.region";
     public static final String CAMEL_SINK_AWSEC2SINK_KAMELET_REGION_DOC = "The AWS region to connect to Example: eu-west-1";
     public static final String CAMEL_SINK_AWSEC2SINK_KAMELET_REGION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSEC2SINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-ec2-sink.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWSEC2SINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the EC2 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWSEC2SINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSEC2SINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF = "camel.kamelet.aws-ec2-sink.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWSEC2SINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.";
+    public static final String CAMEL_SINK_AWSEC2SINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSEC2SINK_KAMELET_OVERRIDE_ENDPOINT_CONF = "camel.kamelet.aws-ec2-sink.overrideEndpoint";
+    public static final String CAMEL_SINK_AWSEC2SINK_KAMELET_OVERRIDE_ENDPOINT_DOC = "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.";
+    public static final Boolean CAMEL_SINK_AWSEC2SINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT = false;
 
     public CamelAwsec2sinkSinkConnectorConfig(
             ConfigDef config,
@@ -48,9 +57,12 @@ public class CamelAwsec2sinkSinkConnectorConfig
 
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
-        conf.define(CAMEL_SINK_AWSEC2SINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSEC2SINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSEC2SINK_KAMELET_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSEC2SINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSEC2SINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSEC2SINK_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSEC2SINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSEC2SINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2SINK_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSEC2SINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSEC2SINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2SINK_KAMELET_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWSEC2SINK_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2SINK_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSEC2SINK_KAMELET_REGION_DOC);
+        conf.define(CAMEL_SINK_AWSEC2SINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEC2SINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2SINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        conf.define(CAMEL_SINK_AWSEC2SINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2SINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2SINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC);
+        conf.define(CAMEL_SINK_AWSEC2SINK_KAMELET_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEC2SINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2SINK_KAMELET_OVERRIDE_ENDPOINT_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-ec2-sink-kafka-connector/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml b/connectors/camel-aws-ec2-sink-kafka-connector/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml
index e69646270..6f0560a8b 100644
--- a/connectors/camel-aws-ec2-sink-kafka-connector/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml
+++ b/connectors/camel-aws-ec2-sink-kafka-connector/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-ec2-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjA2NSIgaGVpZ2h0PSIyNTAwIiB2aWV3Qm94PSIwIDAgMjU2IDMxMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCI+PHBhdGggZD0iTTQyLjc1NCAyNDQuNDk1bC0yOS45MTggNi44MjZWNTcuNTY1bDI5LjkxOCA2LjgzOXYxODAuMDkxIiBmaWxsPSIjRjY4NTM2Ii8+PHBhdGggZD0iTTgwLjA4MiAyNTUuOTMxbC0zNy4zMjggMTAuNjA4VjQyLjYxMmwzNy4zMjggMTAuNTk1djIwMi43MjRNMTI3Ljk2NiAyNjcuNjgxbC00Ny44ODQgMTcuNTI0VjIzLjk0Nmw0Ny44ODQgMTcuNT [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS EC2"
@@ -33,12 +33,14 @@ spec:
     description: |-
       Check the status of EC2 instances
 
+      Access Key/Secret Key are the basic method for authenticating to the AWS EC2 Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+      
+      When using a default Credentials Provider the EC2 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
+
       The Kamelet expects the following headers to be set:
 
       - `instanceIds` / `ce-instanceids`: as a comma separated list of EC2 instance ids.
     required:
-      - accessKey
-      - secretKey
       - region
     type: object
     properties:
@@ -63,10 +65,29 @@ spec:
         description: The AWS region to connect to
         type: string
         example: eu-west-1
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the EC2 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+        - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwrite Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
   dependencies:
+    - "camel:core"
     - "camel:aws2-ec2"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: kamelet:source
       steps:
@@ -85,7 +106,10 @@ spec:
       - to:
           uri: "aws2-ec2:ec2-route"
           parameters:
-            accessKey: "{{accessKey}}"
-            secretKey: "{{secretKey}}"
+            accessKey: "{{?accessKey}}"
+            secretKey: "{{?secretKey}}"
             region: "{{region}}"
-            operation: "describeInstancesStatus"
\ No newline at end of file
+            operation: "describeInstancesStatus"
+            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+            uriEndpointOverride: "{{?uriEndpointOverride}}"
+            overrideEndpoint: "{{overrideEndpoint}}"
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-sink-sink.json b/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-sink-sink.json
index 90661ae5e..296093c98 100644
--- a/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-sink-sink.json
+++ b/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-kinesis-firehose-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Send message to an AWS Kinesis Firehose Stream"
+		"description": "Send message to an AWS Kinesis Firehose Stream\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS Kinesis Firehose Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the Kinesis Firehose client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as ma [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-kinesis-firehose-sink.streamName": {
@@ -18,20 +18,40 @@
 		"camel.kamelet.aws-kinesis-firehose-sink.accessKey": {
 			"name": "camel.kamelet.aws-kinesis-firehose-sink.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-kinesis-firehose-sink.secretKey": {
 			"name": "camel.kamelet.aws-kinesis-firehose-sink.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-kinesis-firehose-sink.region": {
 			"name": "camel.kamelet.aws-kinesis-firehose-sink.region",
 			"description": "The AWS region to connect to Example: eu-west-1",
 			"priority": "HIGH",
 			"required": "true"
+		},
+		"camel.kamelet.aws-kinesis-firehose-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-kinesis-firehose-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the Kinesis Firehose client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-kinesis-firehose-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-kinesis-firehose-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-kinesis-firehose-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-kinesis-firehose-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/docs/examples/CamelAwskinesisfirehosesinkSinkConnector.properties b/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/docs/examples/CamelAwskinesisfirehosesinkSinkConnector.properties
index 1cf784359..1a6def18e 100644
--- a/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/docs/examples/CamelAwskinesisfirehosesinkSinkConnector.properties
+++ b/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/docs/examples/CamelAwskinesisfirehosesinkSinkConnector.properties
@@ -28,12 +28,7 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The access key obtained from AWS
-camel.kamelet.aws-kinesis-firehose-sink.accessKey=
 # The AWS region to connect to Example: eu-west-1
 camel.kamelet.aws-kinesis-firehose-sink.region=
-# The secret key obtained from AWS
-camel.kamelet.aws-kinesis-firehose-sink.secretKey=
 # The name of the stream we want to send to data to
 camel.kamelet.aws-kinesis-firehose-sink.streamName=
-
diff --git a/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehosesink/CamelAwskinesisfirehosesinkSinkConnectorConfig.java b/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehosesink/CamelAwskinesisfirehosesinkSinkConnectorConfig.java
index 9f9e25111..3bca2d81e 100644
--- a/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehosesink/CamelAwskinesisfirehosesinkSinkConnectorConfig.java
+++ b/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehosesink/CamelAwskinesisfirehosesinkSinkConnectorConfig.java
@@ -38,6 +38,15 @@ public class CamelAwskinesisfirehosesinkSinkConnectorConfig
     public static final String CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_REGION_CONF = "camel.kamelet.aws-kinesis-firehose-sink.region";
     public static final String CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_REGION_DOC = "The AWS region to connect to Example: eu-west-1";
     public static final String CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_REGION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-kinesis-firehose-sink.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the Kinesis Firehose client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF = "camel.kamelet.aws-kinesis-firehose-sink.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.";
+    public static final String CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_OVERRIDE_ENDPOINT_CONF = "camel.kamelet.aws-kinesis-firehose-sink.overrideEndpoint";
+    public static final String CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_OVERRIDE_ENDPOINT_DOC = "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.";
+    public static final Boolean CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT = false;
 
     public CamelAwskinesisfirehosesinkSinkConnectorConfig(
             ConfigDef config,
@@ -53,9 +62,12 @@ public class CamelAwskinesisfirehosesinkSinkConnectorConfig
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_STREAM_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_STREAM_NAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_STREAM_NAME_DOC);
-        conf.define(CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_REGION_DOC);
+        conf.define(CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        conf.define(CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC);
+        conf.define(CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSESINK_KAMELET_OVERRIDE_ENDPOINT_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml b/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml
index 3d0d191fe..553d1e4ad 100644
--- a/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml
+++ b/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-kinesis-firehose-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgODUgODUiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI0EiIHg9IjIuNSIgeT0iMi41Ii8+PHN5bWJvbCBpZD0iQSIgb3ZlcmZsb3c9InZpc2libGUiPjxnIHN0cm9rZT0ibm9uZSI+PHBhdGggZD0iTTEzLjc2NiAzLjEyaDUyLjQ2OGMzLjY1MSAwID [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS Kinesis Firehose"
@@ -32,10 +32,12 @@ spec:
     title: AWS Kinesis Firehose Sink
     description: |-
       Send message to an AWS Kinesis Firehose Stream
+
+      Access Key/Secret Key are the basic method for authenticating to the AWS Kinesis Firehose Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+      
+      When using a default Credentials Provider the Kinesis Firehose client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
     required:
       - streamName
-      - accessKey
-      - secretKey
       - region
     type: object
     properties:
@@ -64,16 +66,37 @@ spec:
         description: The AWS region to connect to
         type: string
         example: eu-west-1
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the Kinesis Firehose client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+        - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwrite Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
   dependencies:
     - "camel:aws2-kinesis"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: kamelet:source
       steps:
       - to:
           uri: "aws2-kinesis-firehose:{{streamName}}"
           parameters:
-            accessKey: "{{accessKey}}"
-            secretKey: "{{secretKey}}"
-            region: "{{region}}"
\ No newline at end of file
+            accessKey: "{{?accessKey}}"
+            secretKey: "{{?secretKey}}"
+            region: "{{region}}"
+            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+            uriEndpointOverride: "{{?uriEndpointOverride}}"
+            overrideEndpoint: "{{overrideEndpoint}}"
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-sink-kafka-connector/pom.xml b/connectors/camel-aws-kinesis-sink-kafka-connector/pom.xml
index 61c3f2210..13a9419e4 100644
--- a/connectors/camel-aws-kinesis-sink-kafka-connector/pom.xml
+++ b/connectors/camel-aws-kinesis-sink-kafka-connector/pom.xml
@@ -41,6 +41,10 @@
     </dependency>
     <!-- Camel -->
     <!--START OF GENERATED CODE-->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
diff --git a/connectors/camel-aws-kinesis-sink-kafka-connector/src/generated/resources/camel-aws-kinesis-sink-sink.json b/connectors/camel-aws-kinesis-sink-kafka-connector/src/generated/resources/camel-aws-kinesis-sink-sink.json
index bb31afa4a..fae42d944 100644
--- a/connectors/camel-aws-kinesis-sink-kafka-connector/src/generated/resources/camel-aws-kinesis-sink-sink.json
+++ b/connectors/camel-aws-kinesis-sink-kafka-connector/src/generated/resources/camel-aws-kinesis-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-kinesis-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Send data to AWS Kinesis.\n\nThe Kamelet expects the following header:\n\n- `partition` \/ `ce-partition`: to set the Kinesis partition key\n\nIf the header won't be set the exchange ID will be used.\n\nThe Kamelet is also able to recognize the following header:\n\n- `sequence-number` \/ `ce-sequencenumber`: to set the Sequence number\n\nThis header is optional."
+		"description": "Send data to AWS Kinesis.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS Kinesis Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the Kinesis client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.\n\n [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-kinesis-sink.stream": {
@@ -18,20 +18,40 @@
 		"camel.kamelet.aws-kinesis-sink.accessKey": {
 			"name": "camel.kamelet.aws-kinesis-sink.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-kinesis-sink.secretKey": {
 			"name": "camel.kamelet.aws-kinesis-sink.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-kinesis-sink.region": {
 			"name": "camel.kamelet.aws-kinesis-sink.region",
 			"description": "The AWS region to connect to Example: eu-west-1",
 			"priority": "HIGH",
 			"required": "true"
+		},
+		"camel.kamelet.aws-kinesis-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-kinesis-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the Kinesis client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-kinesis-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-kinesis-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-kinesis-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-kinesis-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/docs/examples/CamelAwskinesissinkSinkConnector.properties b/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/docs/examples/CamelAwskinesissinkSinkConnector.properties
index 1470c1d6d..dd51d37fd 100644
--- a/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/docs/examples/CamelAwskinesissinkSinkConnector.properties
+++ b/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/docs/examples/CamelAwskinesissinkSinkConnector.properties
@@ -28,12 +28,7 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The access key obtained from AWS
-camel.kamelet.aws-kinesis-sink.accessKey=
 # The AWS region to connect to Example: eu-west-1
 camel.kamelet.aws-kinesis-sink.region=
-# The secret key obtained from AWS
-camel.kamelet.aws-kinesis-sink.secretKey=
 # The Kinesis stream that you want to access (needs to be created in advance)
 camel.kamelet.aws-kinesis-sink.stream=
-
diff --git a/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissink/CamelAwskinesissinkSinkConnectorConfig.java b/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissink/CamelAwskinesissinkSinkConnectorConfig.java
index 6808a3066..e7d0561a6 100644
--- a/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissink/CamelAwskinesissinkSinkConnectorConfig.java
+++ b/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissink/CamelAwskinesissinkSinkConnectorConfig.java
@@ -38,6 +38,15 @@ public class CamelAwskinesissinkSinkConnectorConfig
     public static final String CAMEL_SINK_AWSKINESISSINK_KAMELET_REGION_CONF = "camel.kamelet.aws-kinesis-sink.region";
     public static final String CAMEL_SINK_AWSKINESISSINK_KAMELET_REGION_DOC = "The AWS region to connect to Example: eu-west-1";
     public static final String CAMEL_SINK_AWSKINESISSINK_KAMELET_REGION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSKINESISSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-kinesis-sink.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWSKINESISSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the Kinesis client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWSKINESISSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSKINESISSINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF = "camel.kamelet.aws-kinesis-sink.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWSKINESISSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.";
+    public static final String CAMEL_SINK_AWSKINESISSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSKINESISSINK_KAMELET_OVERRIDE_ENDPOINT_CONF = "camel.kamelet.aws-kinesis-sink.overrideEndpoint";
+    public static final String CAMEL_SINK_AWSKINESISSINK_KAMELET_OVERRIDE_ENDPOINT_DOC = "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.";
+    public static final Boolean CAMEL_SINK_AWSKINESISSINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT = false;
 
     public CamelAwskinesissinkSinkConnectorConfig(
             ConfigDef config,
@@ -53,9 +62,12 @@ public class CamelAwskinesissinkSinkConnectorConfig
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_AWSKINESISSINK_KAMELET_STREAM_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISSINK_KAMELET_STREAM_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSKINESISSINK_KAMELET_STREAM_DOC);
-        conf.define(CAMEL_SINK_AWSKINESISSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSKINESISSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSKINESISSINK_KAMELET_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSKINESISSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSKINESISSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSKINESISSINK_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSKINESISSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSKINESISSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISSINK_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSKINESISSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSKINESISSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISSINK_KAMELET_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWSKINESISSINK_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISSINK_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSKINESISSINK_KAMELET_REGION_DOC);
+        conf.define(CAMEL_SINK_AWSKINESISSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESISSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        conf.define(CAMEL_SINK_AWSKINESISSINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC);
+        conf.define(CAMEL_SINK_AWSKINESISSINK_KAMELET_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESISSINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISSINK_KAMELET_OVERRIDE_ENDPOINT_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml b/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml
index 73703ca4e..dfec32275 100644
--- a/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml
+++ b/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-kinesis-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTYgMzA4LjIzNDAxIj48dGl0bGU+YXdzLWtpbmVzaXM8L3RpdGxlPjxwYXRoIGQ9Ik0wLDE3Mi4wODdsMTI3Ljc1NCw1OC44MSwxMjcuNzUyLTU4LjgxLTEyNy43NTItNS4yOTNaIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwIDAuMDAwMDUpIiBmaWxsPSIjZmNiZjkyIi8+PHBhdGggZD0iTTEyOC4xNDcsMCwuMDU5LDYzLjg4MXY5MC4xMzZIMTUzLjY0OFYxMi43NTFaIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwIDAuMD [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS Kinesis"
@@ -33,6 +33,10 @@ spec:
     description: |-
       Send data to AWS Kinesis.
 
+      Access Key/Secret Key are the basic method for authenticating to the AWS Kinesis Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+      
+      When using a default Credentials Provider the Kinesis client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
+
       The Kamelet expects the following header:
 
       - `partition` / `ce-partition`: to set the Kinesis partition key
@@ -46,8 +50,6 @@ spec:
       This header is optional.
     required:
       - stream
-      - accessKey
-      - secretKey
       - region
     type: object
     properties:
@@ -76,10 +78,32 @@ spec:
         description: The AWS region to connect to
         type: string
         example: eu-west-1
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the Kinesis client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+        - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwrite Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+  types:
+    in:
+      mediaType: application/octet-stream
   dependencies:
+    - "camel:core"
     - "camel:aws2-kinesis"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: kamelet:source
       steps:
@@ -115,6 +139,9 @@ spec:
       - to:
           uri: "aws2-kinesis:{{stream}}"
           parameters:
-            secretKey: "{{secretKey}}"
-            accessKey: "{{accessKey}}"
-            region: "{{region}}"
\ No newline at end of file
+            secretKey: "{{?secretKey}}"
+            accessKey: "{{?accessKey}}"
+            region: "{{region}}"
+            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+            uriEndpointOverride: "{{?uriEndpointOverride}}"
+            overrideEndpoint: "{{overrideEndpoint}}"
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-source-kafka-connector/pom.xml b/connectors/camel-aws-kinesis-source-kafka-connector/pom.xml
index b6821042e..86c2b77e8 100644
--- a/connectors/camel-aws-kinesis-source-kafka-connector/pom.xml
+++ b/connectors/camel-aws-kinesis-source-kafka-connector/pom.xml
@@ -42,12 +42,12 @@
     <!-- Camel -->
     <!--START OF GENERATED CODE-->
     <dependency>
-      <groupId>org.apache.camel.kafkaconnector</groupId>
-      <artifactId>camel-kafka-connector</artifactId>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-gson</artifactId>
+      <groupId>org.apache.camel.kafkaconnector</groupId>
+      <artifactId>camel-kafka-connector</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
diff --git a/connectors/camel-aws-kinesis-source-kafka-connector/src/generated/resources/camel-aws-kinesis-source-source.json b/connectors/camel-aws-kinesis-source-kafka-connector/src/generated/resources/camel-aws-kinesis-source-source.json
index ad416dc31..2bc4cfb7e 100644
--- a/connectors/camel-aws-kinesis-source-kafka-connector/src/generated/resources/camel-aws-kinesis-source-source.json
+++ b/connectors/camel-aws-kinesis-source-kafka-connector/src/generated/resources/camel-aws-kinesis-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-kinesis-source-source",
 		"type": "source",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Receive data from AWS Kinesis."
+		"description": "Receive data from AWS Kinesis.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS Kinesis Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the Kinesis client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
 	},
 	"properties": {
 		"camel.kamelet.aws-kinesis-source.stream": {
@@ -18,20 +18,40 @@
 		"camel.kamelet.aws-kinesis-source.accessKey": {
 			"name": "camel.kamelet.aws-kinesis-source.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-kinesis-source.secretKey": {
 			"name": "camel.kamelet.aws-kinesis-source.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-kinesis-source.region": {
 			"name": "camel.kamelet.aws-kinesis-source.region",
 			"description": "The AWS region to connect to Example: eu-west-1",
 			"priority": "HIGH",
 			"required": "true"
+		},
+		"camel.kamelet.aws-kinesis-source.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-kinesis-source.useDefaultCredentialsProvider",
+			"description": "Set whether the Kinesis client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-kinesis-source.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-kinesis-source.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-kinesis-source.overrideEndpoint": {
+			"name": "camel.kamelet.aws-kinesis-source.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-source-kafka-connector/src/main/docs/examples/CamelAwskinesissourceSourceConnector.properties b/connectors/camel-aws-kinesis-source-kafka-connector/src/main/docs/examples/CamelAwskinesissourceSourceConnector.properties
index 8f3e0165c..016667bef 100644
--- a/connectors/camel-aws-kinesis-source-kafka-connector/src/main/docs/examples/CamelAwskinesissourceSourceConnector.properties
+++ b/connectors/camel-aws-kinesis-source-kafka-connector/src/main/docs/examples/CamelAwskinesissourceSourceConnector.properties
@@ -28,12 +28,7 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The access key obtained from AWS
-camel.kamelet.aws-kinesis-source.accessKey=
 # The AWS region to connect to Example: eu-west-1
 camel.kamelet.aws-kinesis-source.region=
-# The secret key obtained from AWS
-camel.kamelet.aws-kinesis-source.secretKey=
 # The Kinesis stream that you want to access (needs to be created in advance)
 camel.kamelet.aws-kinesis-source.stream=
-
diff --git a/connectors/camel-aws-kinesis-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissource/CamelAwskinesissourceSourceConnectorConfig.java b/connectors/camel-aws-kinesis-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissource/CamelAwskinesissourceSourceConnectorConfig.java
index c6810c50f..2937c5525 100644
--- a/connectors/camel-aws-kinesis-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissource/CamelAwskinesissourceSourceConnectorConfig.java
+++ b/connectors/camel-aws-kinesis-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissource/CamelAwskinesissourceSourceConnectorConfig.java
@@ -38,6 +38,15 @@ public class CamelAwskinesissourceSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_REGION_CONF = "camel.kamelet.aws-kinesis-source.region";
     public static final String CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_REGION_DOC = "The AWS region to connect to Example: eu-west-1";
     public static final String CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_REGION_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-kinesis-source.useDefaultCredentialsProvider";
+    public static final String CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the Kinesis client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_CONF = "camel.kamelet.aws-kinesis-source.uriEndpointOverride";
+    public static final String CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.";
+    public static final String CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_OVERRIDE_ENDPOINT_CONF = "camel.kamelet.aws-kinesis-source.overrideEndpoint";
+    public static final String CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_OVERRIDE_ENDPOINT_DOC = "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.";
+    public static final Boolean CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_OVERRIDE_ENDPOINT_DEFAULT = false;
 
     public CamelAwskinesissourceSourceConnectorConfig(
             ConfigDef config,
@@ -53,9 +62,12 @@ public class CamelAwskinesissourceSourceConnectorConfig
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSourceConnectorConfig.conf());
         conf.define(CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_STREAM_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_STREAM_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_STREAM_DOC);
-        conf.define(CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_SECRET_KEY_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_REGION_DOC);
+        conf.define(CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        conf.define(CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_DOC);
+        conf.define(CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESISSOURCE_KAMELET_OVERRIDE_ENDPOINT_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-source-kafka-connector/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml b/connectors/camel-aws-kinesis-source-kafka-connector/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml
index 1cd80d186..655ce1812 100644
--- a/connectors/camel-aws-kinesis-source-kafka-connector/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml
+++ b/connectors/camel-aws-kinesis-source-kafka-connector/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-kinesis-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTYgMzA4LjIzNDAxIj48dGl0bGU+YXdzLWtpbmVzaXM8L3RpdGxlPjxwYXRoIGQ9Ik0wLDE3Mi4wODdsMTI3Ljc1NCw1OC44MSwxMjcuNzUyLTU4LjgxLTEyNy43NTItNS4yOTNaIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwIDAuMDAwMDUpIiBmaWxsPSIjZmNiZjkyIi8+PHBhdGggZD0iTTEyOC4xNDcsMCwuMDU5LDYzLjg4MXY5MC4xMzZIMTUzLjY0OFYxMi43NTFaIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwIDAuMD [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS Kinesis"
@@ -32,10 +32,12 @@ spec:
     title: "AWS Kinesis Source"
     description: |-
       Receive data from AWS Kinesis.
+
+      Access Key/Secret Key are the basic method for authenticating to the AWS Kinesis Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+      
+      When using a default Credentials Provider the Kinesis client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
     required:
       - stream
-      - accessKey
-      - secretKey
       - region
     type: object
     properties:
@@ -64,22 +66,42 @@ spec:
         description: The AWS region to connect to
         type: string
         example: eu-west-1
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the Kinesis client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+        - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwrite Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
   types:
     out:
-      mediaType: application/json
+      mediaType: application/octet-stream
   dependencies:
     - "camel:aws2-kinesis"
     - "camel:kamelet"
-    - "camel:gson"
-  flow:
+    - "camel:core"
+  template:
     from:
       uri: aws2-kinesis:{{stream}}
       parameters:
-        secretKey: "{{secretKey}}"
-        accessKey: "{{accessKey}}"
+        secretKey: "{{?secretKey}}"
+        accessKey: "{{?accessKey}}"
         region: "{{region}}"
+        useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+        uriEndpointOverride: "{{?uriEndpointOverride}}"
+        overrideEndpoint: "{{overrideEndpoint}}"
       steps:
-      - marshal:
-          json: 
-            library: Gson
+      - set-body:
+          simple: "${body.data().asInputStream()}"
       - to: "kamelet:sink"
\ No newline at end of file
diff --git a/connectors/camel-aws-lambda-sink-kafka-connector/src/generated/resources/camel-aws-lambda-sink-sink.json b/connectors/camel-aws-lambda-sink-kafka-connector/src/generated/resources/camel-aws-lambda-sink-sink.json
index fa801b0b6..4f4eaec71 100644
--- a/connectors/camel-aws-lambda-sink-kafka-connector/src/generated/resources/camel-aws-lambda-sink-sink.json
+++ b/connectors/camel-aws-lambda-sink-kafka-connector/src/generated/resources/camel-aws-lambda-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-lambda-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Send a payload to an AWS Lambda function"
+		"description": "Send a payload to an AWS Lambda function.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS Lambda Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the Lambda client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for thi [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-lambda-sink.function": {
@@ -18,20 +18,27 @@
 		"camel.kamelet.aws-lambda-sink.accessKey": {
 			"name": "camel.kamelet.aws-lambda-sink.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-lambda-sink.secretKey": {
 			"name": "camel.kamelet.aws-lambda-sink.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-lambda-sink.region": {
 			"name": "camel.kamelet.aws-lambda-sink.region",
 			"description": "The AWS region to connect to Example: eu-west-1",
 			"priority": "HIGH",
 			"required": "true"
+		},
+		"camel.kamelet.aws-lambda-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-lambda-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the Lambda client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-lambda-sink-kafka-connector/src/main/docs/examples/CamelAwslambdasinkSinkConnector.properties b/connectors/camel-aws-lambda-sink-kafka-connector/src/main/docs/examples/CamelAwslambdasinkSinkConnector.properties
index db54755a4..d7afdb887 100644
--- a/connectors/camel-aws-lambda-sink-kafka-connector/src/main/docs/examples/CamelAwslambdasinkSinkConnector.properties
+++ b/connectors/camel-aws-lambda-sink-kafka-connector/src/main/docs/examples/CamelAwslambdasinkSinkConnector.properties
@@ -28,12 +28,7 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The access key obtained from AWS
-camel.kamelet.aws-lambda-sink.accessKey=
 # The Lambda Function name
 camel.kamelet.aws-lambda-sink.function=
 # The AWS region to connect to Example: eu-west-1
 camel.kamelet.aws-lambda-sink.region=
-# The secret key obtained from AWS
-camel.kamelet.aws-lambda-sink.secretKey=
-
diff --git a/connectors/camel-aws-lambda-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambdasink/CamelAwslambdasinkSinkConnectorConfig.java b/connectors/camel-aws-lambda-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambdasink/CamelAwslambdasinkSinkConnectorConfig.java
index b44a2a030..7f8df4903 100644
--- a/connectors/camel-aws-lambda-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambdasink/CamelAwslambdasinkSinkConnectorConfig.java
+++ b/connectors/camel-aws-lambda-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambdasink/CamelAwslambdasinkSinkConnectorConfig.java
@@ -38,6 +38,9 @@ public class CamelAwslambdasinkSinkConnectorConfig
     public static final String CAMEL_SINK_AWSLAMBDASINK_KAMELET_REGION_CONF = "camel.kamelet.aws-lambda-sink.region";
     public static final String CAMEL_SINK_AWSLAMBDASINK_KAMELET_REGION_DOC = "The AWS region to connect to Example: eu-west-1";
     public static final String CAMEL_SINK_AWSLAMBDASINK_KAMELET_REGION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSLAMBDASINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-lambda-sink.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWSLAMBDASINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the Lambda client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWSLAMBDASINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
 
     public CamelAwslambdasinkSinkConnectorConfig(
             ConfigDef config,
@@ -53,9 +56,10 @@ public class CamelAwslambdasinkSinkConnectorConfig
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_AWSLAMBDASINK_KAMELET_FUNCTION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDASINK_KAMELET_FUNCTION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSLAMBDASINK_KAMELET_FUNCTION_DOC);
-        conf.define(CAMEL_SINK_AWSLAMBDASINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSLAMBDASINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSLAMBDASINK_KAMELET_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSLAMBDASINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSLAMBDASINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSLAMBDASINK_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSLAMBDASINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSLAMBDASINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDASINK_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSLAMBDASINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSLAMBDASINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDASINK_KAMELET_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDASINK_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDASINK_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSLAMBDASINK_KAMELET_REGION_DOC);
+        conf.define(CAMEL_SINK_AWSLAMBDASINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSLAMBDASINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDASINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-lambda-sink-kafka-connector/src/main/resources/kamelets/aws-lambda-sink.kamelet.yaml b/connectors/camel-aws-lambda-sink-kafka-connector/src/main/resources/kamelets/aws-lambda-sink.kamelet.yaml
index 48a3cd235..bf37b3ab6 100644
--- a/connectors/camel-aws-lambda-sink-kafka-connector/src/main/resources/kamelets/aws-lambda-sink.kamelet.yaml
+++ b/connectors/camel-aws-lambda-sink-kafka-connector/src/main/resources/kamelets/aws-lambda-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-lambda-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjA2NSIgaGVpZ2h0PSIyNTAwIiB2aWV3Qm94PSIwIDAgMjU2IDMxMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCI+PHBhdGggZD0iTTAgMjQ1LjI2MmwxNi4zMjIgOC4xNjFMMTkgMjQ4LjY2OFY1OS4zMzNsLTIuNjc4LTMuNDk0TDAgNjR2MTgxLjI2MiIgZmlsbD0iIzlENTAyNSIvPjxwYXRoIGQ9Ik00Ny42NzggNjMuNTdsLTMxLjM1Ni03LjczMXYxOTcuNTg0bDMxLjM1Ni03LjMwMlY2My41NyIgZmlsbD0iI0Y2ODUzNiIvPjxwYXRoIGQ9Ik0xNDMuODkzIDc4LjYwNGwyMi [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS Lambda"
@@ -31,11 +31,13 @@ spec:
   definition:
     title: AWS Lambda Sink
     description: |-
-      Send a payload to an AWS Lambda function
+      Send a payload to an AWS Lambda function.
+
+      Access Key/Secret Key are the basic method for authenticating to the AWS Lambda Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+      
+      When using a default Credentials Provider the Lambda client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
     required:
       - function
-      - accessKey
-      - secretKey
       - region
     type: object
     properties:
@@ -64,16 +66,24 @@ spec:
         description: The AWS region to connect to
         type: string
         example: eu-west-1
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the Lambda client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+        - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
   dependencies:
     - "camel:aws2-lambda"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: kamelet:source
       steps:
       - to:
           uri: "aws2-lambda:{{function}}"
           parameters:
-            accessKey: "{{accessKey}}"
-            secretKey: "{{secretKey}}"
-            region: "{{region}}"
\ No newline at end of file
+            accessKey: "{{?accessKey}}"
+            secretKey: "{{?secretKey}}"
+            region: "{{region}}"
+            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
\ No newline at end of file
diff --git a/connectors/camel-aws-redshift-sink-kafka-connector/pom.xml b/connectors/camel-aws-redshift-sink-kafka-connector/pom.xml
index c9962015f..b06278bc8 100644
--- a/connectors/camel-aws-redshift-sink-kafka-connector/pom.xml
+++ b/connectors/camel-aws-redshift-sink-kafka-connector/pom.xml
@@ -48,12 +48,12 @@
     <dependency>
       <groupId>com.amazon.redshift</groupId>
       <artifactId>redshift-jdbc42</artifactId>
-      <version>2.1.0.3</version>
+      <version>2.1.0.5</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-dbcp2</artifactId>
-      <version>2.8.0</version>
+      <version>2.9.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
diff --git a/connectors/camel-aws-redshift-sink-kafka-connector/src/main/docs/examples/CamelAwsredshiftsinkSinkConnector.properties b/connectors/camel-aws-redshift-sink-kafka-connector/src/main/docs/examples/CamelAwsredshiftsinkSinkConnector.properties
index 425e49c08..b779bda71 100644
--- a/connectors/camel-aws-redshift-sink-kafka-connector/src/main/docs/examples/CamelAwsredshiftsinkSinkConnector.properties
+++ b/connectors/camel-aws-redshift-sink-kafka-connector/src/main/docs/examples/CamelAwsredshiftsinkSinkConnector.properties
@@ -38,4 +38,3 @@ camel.kamelet.aws-redshift-sink.query=
 camel.kamelet.aws-redshift-sink.serverName=
 # The username to use for accessing a secured AWS Redshift Database
 camel.kamelet.aws-redshift-sink.username=
-
diff --git a/connectors/camel-aws-redshift-sink-kafka-connector/src/main/resources/kamelets/aws-redshift-sink.kamelet.yaml b/connectors/camel-aws-redshift-sink-kafka-connector/src/main/resources/kamelets/aws-redshift-sink.kamelet.yaml
index 6f6905806..8a3f88293 100644
--- a/connectors/camel-aws-redshift-sink-kafka-connector/src/main/resources/kamelets/aws-redshift-sink.kamelet.yaml
+++ b/connectors/camel-aws-redshift-sink-kafka-connector/src/main/resources/kamelets/aws-redshift-sink.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: aws-redshift-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAxNjE1IDE3ODMuNyIgdmlld0JveD0iMCAwIDE2MTUgMTc4My43IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxwYXRoIGQ9Im04MDcuNSAxMzYzLjggNjc4LjMgMTYxLjV2LTEyNzAuNWwtNjc4LjMgMTYxLjV6IiBmaWxsPSIjMjA1Yjk3Ii8+PHBhdGggZD0ibTE0ODUuOCAyNTQuOCAxMjkuMiA2NC42djExNDEuM2wtMTI5LjIgNjQuNnptLTY3OC4zIDExMDktNjc4LjMgMTYxLjV2LTEyNzAuNWw2NzguMyAxNjEuNXoiIGZpbGw9IiM1MTkzY2UiLz48cGF0aCBkPSJtMTI5LjIgMjU0LjgtMTI5Lj [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS Redshift"
@@ -87,9 +87,9 @@ spec:
   - "camel:jackson"
   - "camel:kamelet"
   - "camel:sql"
-  - "mvn:com.amazon.redshift:redshift-jdbc42:2.1.0.3"
-  - "mvn:org.apache.commons:commons-dbcp2:2.8.0"
-  flow:
+  - "mvn:com.amazon.redshift:redshift-jdbc42:2.1.0.5"
+  - "mvn:org.apache.commons:commons-dbcp2:2.9.0"
+  template:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
diff --git a/connectors/camel-aws-redshift-source-kafka-connector/pom.xml b/connectors/camel-aws-redshift-source-kafka-connector/pom.xml
index 3ad87afc7..03e58647f 100644
--- a/connectors/camel-aws-redshift-source-kafka-connector/pom.xml
+++ b/connectors/camel-aws-redshift-source-kafka-connector/pom.xml
@@ -48,12 +48,12 @@
     <dependency>
       <groupId>com.amazon.redshift</groupId>
       <artifactId>redshift-jdbc42</artifactId>
-      <version>2.1.0.3</version>
+      <version>2.1.0.5</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-dbcp2</artifactId>
-      <version>2.8.0</version>
+      <version>2.9.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
diff --git a/connectors/camel-aws-redshift-source-kafka-connector/src/main/docs/examples/CamelAwsredshiftsourceSourceConnector.properties b/connectors/camel-aws-redshift-source-kafka-connector/src/main/docs/examples/CamelAwsredshiftsourceSourceConnector.properties
index e252b133b..bd19a728c 100644
--- a/connectors/camel-aws-redshift-source-kafka-connector/src/main/docs/examples/CamelAwsredshiftsourceSourceConnector.properties
+++ b/connectors/camel-aws-redshift-source-kafka-connector/src/main/docs/examples/CamelAwsredshiftsourceSourceConnector.properties
@@ -38,4 +38,3 @@ camel.kamelet.aws-redshift-source.query=
 camel.kamelet.aws-redshift-source.serverName=
 # The username to use for accessing a secured AWS Redshift Database
 camel.kamelet.aws-redshift-source.username=
-
diff --git a/connectors/camel-aws-redshift-source-kafka-connector/src/main/resources/kamelets/aws-redshift-source.kamelet.yaml b/connectors/camel-aws-redshift-source-kafka-connector/src/main/resources/kamelets/aws-redshift-source.kamelet.yaml
index 24a7381bf..e4c1181ad 100644
--- a/connectors/camel-aws-redshift-source-kafka-connector/src/main/resources/kamelets/aws-redshift-source.kamelet.yaml
+++ b/connectors/camel-aws-redshift-source-kafka-connector/src/main/resources/kamelets/aws-redshift-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: aws-redshift-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAxNjE1IDE3ODMuNyIgdmlld0JveD0iMCAwIDE2MTUgMTc4My43IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxwYXRoIGQ9Im04MDcuNSAxMzYzLjggNjc4LjMgMTYxLjV2LTEyNzAuNWwtNjc4LjMgMTYxLjV6IiBmaWxsPSIjMjA1Yjk3Ii8+PHBhdGggZD0ibTE0ODUuOCAyNTQuOCAxMjkuMiA2NC42djExNDEuM2wtMTI5LjIgNjQuNnptLTY3OC4zIDExMDktNjc4LjMgMTYxLjV2LTEyNzAuNWw2NzguMyAxNjEuNXoiIGZpbGw9IiM1MTkzY2UiLz48cGF0aCBkPSJtMTI5LjIgMjU0LjgtMTI5Lj [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS Redshift"
@@ -84,9 +84,9 @@ spec:
   - "camel:jackson"
   - "camel:kamelet"
   - "camel:sql"
-  - "mvn:com.amazon.redshift:redshift-jdbc42:2.1.0.3"
-  - "mvn:org.apache.commons:commons-dbcp2:2.8.0"
-  flow:
+  - "mvn:com.amazon.redshift:redshift-jdbc42:2.1.0.5"
+  - "mvn:org.apache.commons:commons-dbcp2:2.9.0"
+  template:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
diff --git a/connectors/camel-aws-s3-sink-kafka-connector/pom.xml b/connectors/camel-aws-s3-sink-kafka-connector/pom.xml
index 78b774cd9..d3efd322f 100644
--- a/connectors/camel-aws-s3-sink-kafka-connector/pom.xml
+++ b/connectors/camel-aws-s3-sink-kafka-connector/pom.xml
@@ -41,6 +41,10 @@
     </dependency>
     <!-- Camel -->
     <!--START OF GENERATED CODE-->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
diff --git a/connectors/camel-aws-s3-sink-kafka-connector/src/generated/resources/camel-aws-s3-sink-sink.json b/connectors/camel-aws-s3-sink-kafka-connector/src/generated/resources/camel-aws-s3-sink-sink.json
index 7ce9d0126..478ce38de 100644
--- a/connectors/camel-aws-s3-sink-kafka-connector/src/generated/resources/camel-aws-s3-sink-sink.json
+++ b/connectors/camel-aws-s3-sink-kafka-connector/src/generated/resources/camel-aws-s3-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-s3-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Upload data to AWS S3.\n\nThe Kamelet expects the following headers to be set:\n\n- `file` \/ `ce-file`: as the file name to upload\n\nIf the header won't be set the exchange ID will be used as file name."
+		"description": "Upload data to AWS S3 Bucket.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS S3 Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the S3 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.\n\nThe Ka [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-s3-sink.bucketNameOrArn": {
@@ -18,14 +18,14 @@
 		"camel.kamelet.aws-s3-sink.accessKey": {
 			"name": "camel.kamelet.aws-s3-sink.accessKey",
 			"description": "The access key obtained from AWS.",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-s3-sink.secretKey": {
 			"name": "camel.kamelet.aws-s3-sink.secretKey",
 			"description": "The secret key obtained from AWS.",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-s3-sink.region": {
 			"name": "camel.kamelet.aws-s3-sink.region",
@@ -39,6 +39,32 @@
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.aws-s3-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-s3-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-s3-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-s3-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-s3-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-s3-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-s3-sink.keyName": {
+			"name": "camel.kamelet.aws-s3-sink.keyName",
+			"description": "The key name for saving an element in the bucket.",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-s3-sink-kafka-connector/src/main/docs/examples/CamelAwss3sinkSinkConnector.properties b/connectors/camel-aws-s3-sink-kafka-connector/src/main/docs/examples/CamelAwss3sinkSinkConnector.properties
index 524166885..b80b87693 100644
--- a/connectors/camel-aws-s3-sink-kafka-connector/src/main/docs/examples/CamelAwss3sinkSinkConnector.properties
+++ b/connectors/camel-aws-s3-sink-kafka-connector/src/main/docs/examples/CamelAwss3sinkSinkConnector.properties
@@ -28,12 +28,7 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The access key obtained from AWS.
-camel.kamelet.aws-s3-sink.accessKey=
 # The S3 Bucket name or ARN.
 camel.kamelet.aws-s3-sink.bucketNameOrArn=
 # The AWS region to connect to. Example: eu-west-1
 camel.kamelet.aws-s3-sink.region=
-# The secret key obtained from AWS.
-camel.kamelet.aws-s3-sink.secretKey=
-
diff --git a/connectors/camel-aws-s3-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkConnectorConfig.java b/connectors/camel-aws-s3-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkConnectorConfig.java
index 0df9f5ee3..12f4fdf57 100644
--- a/connectors/camel-aws-s3-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkConnectorConfig.java
+++ b/connectors/camel-aws-s3-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkConnectorConfig.java
@@ -41,6 +41,18 @@ public class CamelAwss3sinkSinkConnectorConfig
     public static final String CAMEL_SINK_AWSS3SINK_KAMELET_AUTO_CREATE_BUCKET_CONF = "camel.kamelet.aws-s3-sink.autoCreateBucket";
     public static final String CAMEL_SINK_AWSS3SINK_KAMELET_AUTO_CREATE_BUCKET_DOC = "Setting the autocreation of the S3 bucket bucketName.";
     public static final Boolean CAMEL_SINK_AWSS3SINK_KAMELET_AUTO_CREATE_BUCKET_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSS3SINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-s3-sink.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWSS3SINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWSS3SINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSS3SINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF = "camel.kamelet.aws-s3-sink.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWSS3SINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.";
+    public static final String CAMEL_SINK_AWSS3SINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSS3SINK_KAMELET_OVERRIDE_ENDPOINT_CONF = "camel.kamelet.aws-s3-sink.overrideEndpoint";
+    public static final String CAMEL_SINK_AWSS3SINK_KAMELET_OVERRIDE_ENDPOINT_DOC = "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.";
+    public static final Boolean CAMEL_SINK_AWSS3SINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSS3SINK_KAMELET_KEY_NAME_CONF = "camel.kamelet.aws-s3-sink.keyName";
+    public static final String CAMEL_SINK_AWSS3SINK_KAMELET_KEY_NAME_DOC = "The key name for saving an element in the bucket.";
+    public static final String CAMEL_SINK_AWSS3SINK_KAMELET_KEY_NAME_DEFAULT = null;
 
     public CamelAwss3sinkSinkConnectorConfig(
             ConfigDef config,
@@ -55,10 +67,14 @@ public class CamelAwss3sinkSinkConnectorConfig
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_AWSS3SINK_KAMELET_BUCKET_NAME_OR_ARN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSS3SINK_KAMELET_BUCKET_NAME_OR_ARN_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSS3SINK_KAMELET_BUCKET_NAME_OR_ARN_DOC);
-        conf.define(CAMEL_SINK_AWSS3SINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSS3SINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSS3SINK_KAMELET_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSS3SINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSS3SINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSS3SINK_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSS3SINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSS3SINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3SINK_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSS3SINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSS3SINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3SINK_KAMELET_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWSS3SINK_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSS3SINK_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSS3SINK_KAMELET_REGION_DOC);
         conf.define(CAMEL_SINK_AWSS3SINK_KAMELET_AUTO_CREATE_BUCKET_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3SINK_KAMELET_AUTO_CREATE_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3SINK_KAMELET_AUTO_CREATE_BUCKET_DOC);
+        conf.define(CAMEL_SINK_AWSS3SINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3SINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3SINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        conf.define(CAMEL_SINK_AWSS3SINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSS3SINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3SINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC);
+        conf.define(CAMEL_SINK_AWSS3SINK_KAMELET_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3SINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3SINK_KAMELET_OVERRIDE_ENDPOINT_DOC);
+        conf.define(CAMEL_SINK_AWSS3SINK_KAMELET_KEY_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSS3SINK_KAMELET_KEY_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3SINK_KAMELET_KEY_NAME_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-s3-sink-kafka-connector/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml b/connectors/camel-aws-s3-sink-kafka-connector/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
index 0454ac8c4..0c461f9d0 100644
--- a/connectors/camel-aws-s3-sink-kafka-connector/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
+++ b/connectors/camel-aws-s3-sink-kafka-connector/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-s3-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJMYXllcl8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAyNDguMiAzMDAiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxzdHlsZT4uc3QyOHtmaWxsOiM4YzMxMjN9LnN0Mjl7ZmlsbDojZTA1MjQzfTwvc3R5bGU+PHBhdGggY2xhc3M9InN0MjgiIGQ9Ik0yMCA1Mi4xTDAgNjJ2MTc1LjVsMjAgOS45LjEtLjFWNTIuMmwtLjEtLjEiLz48cGF0aCBjbGFzcz0ic3QyOSIgZD0iTTEyNyAyMjJMMjAgMjQ3LjVWNTIuMUwxMjcgNzd2MTQ1Ii8+PHBhdGggY2xhc3M9InN0MjgiIG [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS S3"
@@ -31,17 +31,19 @@ spec:
   definition:
     title: "AWS S3 Sink"
     description: |-
-      Upload data to AWS S3.
+      Upload data to AWS S3 Bucket.
 
-      The Kamelet expects the following headers to be set:
+      Access Key/Secret Key are the basic method for authenticating to the AWS S3 Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+      
+      When using a default Credentials Provider the S3 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
+
+      The Kamelet can use the following header to be set:
 
       - `file` / `ce-file`: as the file name to upload
 
-      If the header won't be set the exchange ID will be used as file name.
+      If the header won't be set, the Kamelet parameter `keyName` should be populated. The `keyName` parameter could be a simple value language from the Apache Camel.
     required:
       - bucketNameOrArn
-      - accessKey
-      - secretKey
       - region
     type: object
     properties:
@@ -77,10 +79,33 @@ spec:
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
         default: false
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+        - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwrite Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      keyName:
+        title: Key Name
+        description: The key name for saving an element in the bucket.
+        type: string
   dependencies:
+    - "camel:core"
     - "camel:aws2-s3"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: "kamelet:source"
       steps:
@@ -96,15 +121,14 @@ spec:
             - set-header:
                 name: CamelAwsS3Key
                 simple: "${header[ce-file]}"
-          otherwise:
-            steps:
-            - set-header:
-                name: CamelAwsS3Key
-                simple: "${exchangeId}"
       - to:
           uri: "aws2-s3:{{bucketNameOrArn}}"
           parameters:
-            secretKey: "{{secretKey}}"
-            accessKey: "{{accessKey}}"
+            secretKey: "{{?secretKey}}"
+            accessKey: "{{?accessKey}}"
             region: "{{region}}"
-            autoCreateBucket: "{{autoCreateBucket}}"
\ No newline at end of file
+            autoCreateBucket: "{{autoCreateBucket}}"
+            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+            uriEndpointOverride: "{{?uriEndpointOverride}}"
+            overrideEndpoint: "{{overrideEndpoint}}"
+            keyName: "{{?keyName}}"
\ No newline at end of file
diff --git a/connectors/camel-aws-s3-source-kafka-connector/src/generated/resources/camel-aws-s3-source-source.json b/connectors/camel-aws-s3-source-kafka-connector/src/generated/resources/camel-aws-s3-source-source.json
index 475b515fb..58199abb4 100644
--- a/connectors/camel-aws-s3-source-kafka-connector/src/generated/resources/camel-aws-s3-source-source.json
+++ b/connectors/camel-aws-s3-source-kafka-connector/src/generated/resources/camel-aws-s3-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-s3-source-source",
 		"type": "source",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Receive data from AWS S3."
+		"description": "Receive data from AWS S3 Bucket.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS S3 Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the S3 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
 	},
 	"properties": {
 		"camel.kamelet.aws-s3-source.bucketNameOrArn": {
@@ -25,14 +25,14 @@
 		"camel.kamelet.aws-s3-source.accessKey": {
 			"name": "camel.kamelet.aws-s3-source.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-s3-source.secretKey": {
 			"name": "camel.kamelet.aws-s3-source.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-s3-source.region": {
 			"name": "camel.kamelet.aws-s3-source.region",
@@ -66,6 +66,26 @@
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.aws-s3-source.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-s3-source.useDefaultCredentialsProvider",
+			"description": "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-s3-source.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-s3-source.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-s3-source.overrideEndpoint": {
+			"name": "camel.kamelet.aws-s3-source.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-s3-source-kafka-connector/src/main/docs/examples/CamelAwss3sourceSourceConnector.properties b/connectors/camel-aws-s3-source-kafka-connector/src/main/docs/examples/CamelAwss3sourceSourceConnector.properties
index be727e5c0..8ef223762 100644
--- a/connectors/camel-aws-s3-source-kafka-connector/src/main/docs/examples/CamelAwss3sourceSourceConnector.properties
+++ b/connectors/camel-aws-s3-source-kafka-connector/src/main/docs/examples/CamelAwss3sourceSourceConnector.properties
@@ -28,12 +28,7 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The access key obtained from AWS
-camel.kamelet.aws-s3-source.accessKey=
 # The S3 Bucket name or ARN
 camel.kamelet.aws-s3-source.bucketNameOrArn=
 # The AWS region to connect to Example: eu-west-1
 camel.kamelet.aws-s3-source.region=
-# The secret key obtained from AWS
-camel.kamelet.aws-s3-source.secretKey=
-
diff --git a/connectors/camel-aws-s3-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3source/CamelAwss3sourceSourceConnectorConfig.java b/connectors/camel-aws-s3-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3source/CamelAwss3sourceSourceConnectorConfig.java
index 413fd8be4..15311a7d7 100644
--- a/connectors/camel-aws-s3-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3source/CamelAwss3sourceSourceConnectorConfig.java
+++ b/connectors/camel-aws-s3-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3source/CamelAwss3sourceSourceConnectorConfig.java
@@ -53,6 +53,15 @@ public class CamelAwss3sourceSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSS3SOURCE_KAMELET_IGNORE_BODY_CONF = "camel.kamelet.aws-s3-source.ignoreBody";
     public static final String CAMEL_SOURCE_AWSS3SOURCE_KAMELET_IGNORE_BODY_DOC = "If it is true, the S3 Object Body will be ignored completely, if it is set to false the S3 Object will be put in the body. Setting this to true, will override any behavior defined by includeBody option.";
     public static final Boolean CAMEL_SOURCE_AWSS3SOURCE_KAMELET_IGNORE_BODY_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWSS3SOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-s3-source.useDefaultCredentialsProvider";
+    public static final String CAMEL_SOURCE_AWSS3SOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SOURCE_AWSS3SOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWSS3SOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_CONF = "camel.kamelet.aws-s3-source.uriEndpointOverride";
+    public static final String CAMEL_SOURCE_AWSS3SOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.";
+    public static final String CAMEL_SOURCE_AWSS3SOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AWSS3SOURCE_KAMELET_OVERRIDE_ENDPOINT_CONF = "camel.kamelet.aws-s3-source.overrideEndpoint";
+    public static final String CAMEL_SOURCE_AWSS3SOURCE_KAMELET_OVERRIDE_ENDPOINT_DOC = "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.";
+    public static final Boolean CAMEL_SOURCE_AWSS3SOURCE_KAMELET_OVERRIDE_ENDPOINT_DEFAULT = false;
 
     public CamelAwss3sourceSourceConnectorConfig(
             ConfigDef config,
@@ -69,13 +78,16 @@ public class CamelAwss3sourceSourceConnectorConfig
         ConfigDef conf = new ConfigDef(CamelSourceConnectorConfig.conf());
         conf.define(CAMEL_SOURCE_AWSS3SOURCE_KAMELET_BUCKET_NAME_OR_ARN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_BUCKET_NAME_OR_ARN_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_BUCKET_NAME_OR_ARN_DOC);
         conf.define(CAMEL_SOURCE_AWSS3SOURCE_KAMELET_DELETE_AFTER_READ_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_DELETE_AFTER_READ_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_DELETE_AFTER_READ_DOC);
-        conf.define(CAMEL_SOURCE_AWSS3SOURCE_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SOURCE_AWSS3SOURCE_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SOURCE_AWSS3SOURCE_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SOURCE_AWSS3SOURCE_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_SECRET_KEY_DOC);
         conf.define(CAMEL_SOURCE_AWSS3SOURCE_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_REGION_DOC);
         conf.define(CAMEL_SOURCE_AWSS3SOURCE_KAMELET_AUTO_CREATE_BUCKET_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_AUTO_CREATE_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_AUTO_CREATE_BUCKET_DOC);
         conf.define(CAMEL_SOURCE_AWSS3SOURCE_KAMELET_INCLUDE_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_INCLUDE_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_INCLUDE_BODY_DOC);
         conf.define(CAMEL_SOURCE_AWSS3SOURCE_KAMELET_PREFIX_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_PREFIX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_PREFIX_DOC);
         conf.define(CAMEL_SOURCE_AWSS3SOURCE_KAMELET_IGNORE_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_IGNORE_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_IGNORE_BODY_DOC);
+        conf.define(CAMEL_SOURCE_AWSS3SOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        conf.define(CAMEL_SOURCE_AWSS3SOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_DOC);
+        conf.define(CAMEL_SOURCE_AWSS3SOURCE_KAMELET_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3SOURCE_KAMELET_OVERRIDE_ENDPOINT_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-s3-source-kafka-connector/src/main/resources/kamelets/aws-s3-source.kamelet.yaml b/connectors/camel-aws-s3-source-kafka-connector/src/main/resources/kamelets/aws-s3-source.kamelet.yaml
index f9edf0395..7e4f42927 100644
--- a/connectors/camel-aws-s3-source-kafka-connector/src/main/resources/kamelets/aws-s3-source.kamelet.yaml
+++ b/connectors/camel-aws-s3-source-kafka-connector/src/main/resources/kamelets/aws-s3-source.kamelet.yaml
@@ -4,7 +4,7 @@ metadata:
   name: aws-s3-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJMYXllcl8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAyNDguMiAzMDAiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxzdHlsZT4uc3QyOHtmaWxsOiM4YzMxMjN9LnN0Mjl7ZmlsbDojZTA1MjQzfTwvc3R5bGU+PHBhdGggY2xhc3M9InN0MjgiIGQ9Ik0yMCA1Mi4xTDAgNjJ2MTc1LjVsMjAgOS45LjEtLjFWNTIuMmwtLjEtLjEiLz48cGF0aCBjbGFzcz0ic3QyOSIgZD0iTTEyNyAyMjJMMjAgMjQ3LjVWNTIuMUwxMjcgNzd2MTQ1Ii8+PHBhdGggY2xhc3M9InN0MjgiIG [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS S3"
@@ -14,11 +14,13 @@ spec:
   definition:
     title: "AWS S3 Source"
     description: |-
-      Receive data from AWS S3.
+      Receive data from AWS S3 Bucket.
+
+      Access Key/Secret Key are the basic method for authenticating to the AWS S3 Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+
+      When using a default Credentials Provider the S3 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
     required:
       - bucketNameOrArn
-      - accessKey
-      - secretKey
       - region
     type: object
     properties:
@@ -56,14 +58,14 @@ spec:
         example: eu-west-1
       autoCreateBucket:
         title: Autocreate Bucket
-        description: Setting the autocreation of the S3 bucket bucketName. 
+        description: Setting the autocreation of the S3 bucket bucketName.
         type: boolean
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
         default: false
       includeBody:
         title: Include Body
-        description: If it is true, the exchange will be consumed and put into the body and closed. If false the S3Object stream will be put raw into the body and the headers will be set with the S3 object metadata. 
+        description: If it is true, the exchange will be consumed and put into the body and closed. If false the S3Object stream will be put raw into the body and the headers will be set with the S3 object metadata.
         type: boolean
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
@@ -80,20 +82,41 @@ spec:
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
         default: false
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+        - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwrite Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
   dependencies:
     - "camel:aws2-s3"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: "aws2-s3:{{bucketNameOrArn}}"
       parameters:
         autoCreateBucket: "{{autoCreateBucket}}"
-        secretKey: "{{secretKey}}"
-        accessKey: "{{accessKey}}"
+        secretKey: "{{?secretKey}}"
+        accessKey: "{{?accessKey}}"
         region: "{{region}}"
         includeBody: "{{includeBody}}"
         ignoreBody: "{{ignoreBody}}"
         deleteAfterRead: "{{deleteAfterRead}}"
         prefix: "{{?prefix}}"
+        useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+        uriEndpointOverride: "{{?uriEndpointOverride}}"
+        overrideEndpoint: "{{overrideEndpoint}}"
       steps:
       - to: "kamelet:sink"
\ No newline at end of file
diff --git a/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/generated/resources/camel-aws-s3-streaming-upload-sink-sink.json b/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/generated/resources/camel-aws-s3-streaming-upload-sink-sink.json
index 5a41c6a39..539ca5d7e 100644
--- a/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/generated/resources/camel-aws-s3-streaming-upload-sink-sink.json
+++ b/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/generated/resources/camel-aws-s3-streaming-upload-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-s3-streaming-upload-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Upload data to AWS S3 in streaming upload mode."
+		"description": "Upload data to AWS S3 in streaming upload mode.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS S3 Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the S3 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this  [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-s3-streaming-upload-sink.bucketNameOrArn": {
@@ -18,14 +18,14 @@
 		"camel.kamelet.aws-s3-streaming-upload-sink.accessKey": {
 			"name": "camel.kamelet.aws-s3-streaming-upload-sink.accessKey",
 			"description": "The access key obtained from AWS.",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-s3-streaming-upload-sink.secretKey": {
 			"name": "camel.kamelet.aws-s3-streaming-upload-sink.secretKey",
 			"description": "The secret key obtained from AWS.",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-s3-streaming-upload-sink.region": {
 			"name": "camel.kamelet.aws-s3-streaming-upload-sink.region",
@@ -86,6 +86,26 @@
 			"description": "Setting the key name for an element in the bucket through endpoint parameter. In Streaming Upload, with the default configuration, this will be the base for the progressive creation of files.",
 			"priority": "HIGH",
 			"required": "true"
+		},
+		"camel.kamelet.aws-s3-streaming-upload-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-s3-streaming-upload-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-s3-streaming-upload-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-s3-streaming-upload-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-s3-streaming-upload-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-s3-streaming-upload-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/docs/examples/CamelAwss3streaminguploadsinkSinkConnector.properties b/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/docs/examples/CamelAwss3streaminguploadsinkSinkConnector.properties
index 0b9fdc0d6..4da842d44 100644
--- a/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/docs/examples/CamelAwss3streaminguploadsinkSinkConnector.properties
+++ b/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/docs/examples/CamelAwss3streaminguploadsinkSinkConnector.properties
@@ -28,14 +28,9 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The access key obtained from AWS.
-camel.kamelet.aws-s3-streaming-upload-sink.accessKey=
 # The S3 Bucket name or ARN.
 camel.kamelet.aws-s3-streaming-upload-sink.bucketNameOrArn=
 # Setting the key name for an element in the bucket through endpoint parameter. In Streaming Upload, with the default configuration, this will be the base for the progressive creation of files.
 camel.kamelet.aws-s3-streaming-upload-sink.keyName=
 # The AWS region to connect to. Example: eu-west-1
 camel.kamelet.aws-s3-streaming-upload-sink.region=
-# The secret key obtained from AWS.
-camel.kamelet.aws-s3-streaming-upload-sink.secretKey=
-
diff --git a/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3streaminguploadsink/CamelAwss3streaminguploadsinkSinkConnectorConfig.java b/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3streaminguploadsink/CamelAwss3streaminguploadsinkSinkConnectorConfig.java
index 0145f6b6d..fcd359594 100644
--- a/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3streaminguploadsink/CamelAwss3streaminguploadsinkSinkConnectorConfig.java
+++ b/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3streaminguploadsink/CamelAwss3streaminguploadsinkSinkConnectorConfig.java
@@ -62,6 +62,15 @@ public class CamelAwss3streaminguploadsinkSinkConnectorConfig
     public static final String CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_KEY_NAME_CONF = "camel.kamelet.aws-s3-streaming-upload-sink.keyName";
     public static final String CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_KEY_NAME_DOC = "Setting the key name for an element in the bucket through endpoint parameter. In Streaming Upload, with the default configuration, this will be the base for the progressive creation of files.";
     public static final String CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_KEY_NAME_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-s3-streaming-upload-sink.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF = "camel.kamelet.aws-s3-streaming-upload-sink.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.";
+    public static final String CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_OVERRIDE_ENDPOINT_CONF = "camel.kamelet.aws-s3-streaming-upload-sink.overrideEndpoint";
+    public static final String CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_OVERRIDE_ENDPOINT_DOC = "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.";
+    public static final Boolean CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT = false;
 
     public CamelAwss3streaminguploadsinkSinkConnectorConfig(
             ConfigDef config,
@@ -77,8 +86,8 @@ public class CamelAwss3streaminguploadsinkSinkConnectorConfig
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_BUCKET_NAME_OR_ARN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_BUCKET_NAME_OR_ARN_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_BUCKET_NAME_OR_ARN_DOC);
-        conf.define(CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_REGION_DOC);
         conf.define(CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_AUTO_CREATE_BUCKET_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_AUTO_CREATE_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_AUTO_CREATE_BUCKET_DOC);
         conf.define(CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_STREAMING_UPLOAD_MODE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_STREAMING_UPLOAD_MODE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_STREAMING_UPLOAD_MODE_DOC);
@@ -88,6 +97,9 @@ public class CamelAwss3streaminguploadsinkSinkConnectorConfig
         conf.define(CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_STREAMING_UPLOAD_TIMEOUT_CONF, ConfigDef.Type.LONG, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_STREAMING_UPLOAD_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_STREAMING_UPLOAD_TIMEOUT_DOC);
         conf.define(CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_NAMING_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_NAMING_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_NAMING_STRATEGY_DOC);
         conf.define(CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_KEY_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_KEY_NAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_KEY_NAME_DOC);
+        conf.define(CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        conf.define(CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC);
+        conf.define(CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3STREAMINGUPLOADSINK_KAMELET_OVERRIDE_ENDPOINT_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml b/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml
index 1395be856..8136f7502 100644
--- a/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml
+++ b/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-s3-streaming-upload-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJMYXllcl8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAyNDguMiAzMDAiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxzdHlsZT4uc3QyOHtmaWxsOiM4YzMxMjN9LnN0Mjl7ZmlsbDojZTA1MjQzfTwvc3R5bGU+PHBhdGggY2xhc3M9InN0MjgiIGQ9Ik0yMCA1Mi4xTDAgNjJ2MTc1LjVsMjAgOS45LjEtLjFWNTIuMmwtLjEtLjEiLz48cGF0aCBjbGFzcz0ic3QyOSIgZD0iTTEyNyAyMjJMMjAgMjQ3LjVWNTIuMUwxMjcgNzd2MTQ1Ii8+PHBhdGggY2xhc3M9InN0MjgiIG [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS S3"
@@ -32,10 +32,12 @@ spec:
     title: "AWS S3 Streaming upload Sink"
     description: |-
       Upload data to AWS S3 in streaming upload mode.
+
+      Access Key/Secret Key are the basic method for authenticating to the AWS S3 Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+      
+      When using a default Credentials Provider the S3 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
     required:
       - bucketNameOrArn
-      - accessKey
-      - secretKey
       - region
       - keyName
     type: object
@@ -107,18 +109,36 @@ spec:
         title: Key Name
         description: Setting the key name for an element in the bucket through endpoint parameter. In Streaming Upload, with the default configuration, this will be the base for the progressive creation of files.
         type: string
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+        - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwrite Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
   dependencies:
     - "camel:aws2-s3"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: "kamelet:source"
       steps:
       - to:
           uri: "aws2-s3:{{bucketNameOrArn}}"
           parameters:
-            secretKey: "{{secretKey}}"
-            accessKey: "{{accessKey}}"
+            secretKey: "{{?secretKey}}"
+            accessKey: "{{?accessKey}}"
             region: "{{region}}"
             autoCreateBucket: "{{autoCreateBucket}}"
             streamingUploadMode: "{{streamingUploadMode}}"
@@ -127,4 +147,7 @@ spec:
             batchSize: "{{batchSize}}"
             namingStrategy: "{{namingStrategy}}"
             keyName: "{{keyName}}"
-            streamingUploadTimeout: "{{?streamingUploadTimeout}}"
\ No newline at end of file
+            streamingUploadTimeout: "{{?streamingUploadTimeout}}"
+            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+            uriEndpointOverride: "{{?uriEndpointOverride}}"
+            overrideEndpoint: "{{overrideEndpoint}}"
\ No newline at end of file
diff --git a/connectors/camel-aws-secrets-manager-sink-kafka-connector/pom.xml b/connectors/camel-aws-secrets-manager-sink-kafka-connector/pom.xml
index 8130101a7..2942a8cee 100644
--- a/connectors/camel-aws-secrets-manager-sink-kafka-connector/pom.xml
+++ b/connectors/camel-aws-secrets-manager-sink-kafka-connector/pom.xml
@@ -41,6 +41,10 @@
     </dependency>
     <!-- Camel -->
     <!--START OF GENERATED CODE-->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-aws-secrets-manager</artifactId>
diff --git a/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/generated/resources/camel-aws-secrets-manager-sink-sink.json b/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/generated/resources/camel-aws-secrets-manager-sink-sink.json
index 9c44ad61e..fb41b805f 100644
--- a/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/generated/resources/camel-aws-secrets-manager-sink-sink.json
+++ b/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/generated/resources/camel-aws-secrets-manager-sink-sink.json
@@ -6,26 +6,33 @@
 		"id": "camel-aws-secrets-manager-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Create a secret in AWS Secrets Manager\n\nThe Kamelet expects the following headers to be set:\n\n- `secret-name` \/ `ce-secret-name`: as the secret name to create.\n\nIf the header won't be set the exchange ID will be used as secret name."
+		"description": "Create a secret in AWS Secrets Manager.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS Secrets Manager Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the Secrets Manager client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory p [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-secrets-manager-sink.accessKey": {
 			"name": "camel.kamelet.aws-secrets-manager-sink.accessKey",
 			"description": "The access key obtained from AWS.",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-secrets-manager-sink.secretKey": {
 			"name": "camel.kamelet.aws-secrets-manager-sink.secretKey",
 			"description": "The secret key obtained from AWS.",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-secrets-manager-sink.region": {
 			"name": "camel.kamelet.aws-secrets-manager-sink.region",
 			"description": "The AWS region to connect to. Example: eu-west-1",
 			"priority": "HIGH",
 			"required": "true"
+		},
+		"camel.kamelet.aws-secrets-manager-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-secrets-manager-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the Secrets Manager client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/docs/examples/CamelAwssecretsmanagersinkSinkConnector.properties b/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/docs/examples/CamelAwssecretsmanagersinkSinkConnector.properties
index 44293481d..6917f6bf4 100644
--- a/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/docs/examples/CamelAwssecretsmanagersinkSinkConnector.properties
+++ b/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/docs/examples/CamelAwssecretsmanagersinkSinkConnector.properties
@@ -28,10 +28,5 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The access key obtained from AWS.
-camel.kamelet.aws-secrets-manager-sink.accessKey=
 # The AWS region to connect to. Example: eu-west-1
 camel.kamelet.aws-secrets-manager-sink.region=
-# The secret key obtained from AWS.
-camel.kamelet.aws-secrets-manager-sink.secretKey=
-
diff --git a/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanagersink/CamelAwssecretsmanagersinkSinkConnectorConfig.java b/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanagersink/CamelAwssecretsmanagersinkSinkConnectorConfig.java
index 82b7c47e1..615e90fea 100644
--- a/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanagersink/CamelAwssecretsmanagersinkSinkConnectorConfig.java
+++ b/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanagersink/CamelAwssecretsmanagersinkSinkConnectorConfig.java
@@ -35,6 +35,9 @@ public class CamelAwssecretsmanagersinkSinkConnectorConfig
     public static final String CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_REGION_CONF = "camel.kamelet.aws-secrets-manager-sink.region";
     public static final String CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_REGION_DOC = "The AWS region to connect to. Example: eu-west-1";
     public static final String CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_REGION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-secrets-manager-sink.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the Secrets Manager client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
 
     public CamelAwssecretsmanagersinkSinkConnectorConfig(
             ConfigDef config,
@@ -49,9 +52,10 @@ public class CamelAwssecretsmanagersinkSinkConnectorConfig
 
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
-        conf.define(CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_REGION_DOC);
+        conf.define(CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSECRETSMANAGERSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/resources/kamelets/aws-secrets-manager-sink.kamelet.yaml b/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/resources/kamelets/aws-secrets-manager-sink.kamelet.yaml
index 34af2813d..abf015433 100644
--- a/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/resources/kamelets/aws-secrets-manager-sink.kamelet.yaml
+++ b/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/resources/kamelets/aws-secrets-manager-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-secrets-manager-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNzUgNzUiIHdpZHRoPSIyNTYiIGhlaWdodD0iMjU2Ij48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6dXJsKCNSZWRHcmFkaWVudCk7fS5jbHMtMntmaWxsOiNmZmY7fTwvc3R5bGU+PGxpbmVhckdyYWRpZW50IGlkPSJSZWRHcmFkaWVudCIgeDE9Ii0yMDQyLjU0IiB5MT0iMTk4NS40NyIgeDI9Ii0xOTM2LjQ3IiB5Mj0iMjA5MS41NCIgZ3JhZGllbnRUcmFuc2Zvcm09InRyYW5zbGF0ZSgtMjAwMSAtMT [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS Secrets Manager"
@@ -31,7 +31,11 @@ spec:
   definition:
     title: "AWS Secrets Manager Sink"
     description: |-
-      Create a secret in AWS Secrets Manager
+      Create a secret in AWS Secrets Manager.
+
+      Access Key/Secret Key are the basic method for authenticating to the AWS Secrets Manager Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+      
+      When using a default Credentials Provider the Secrets Manager client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
 
       The Kamelet expects the following headers to be set:
 
@@ -39,8 +43,6 @@ spec:
 
       If the header won't be set the exchange ID will be used as secret name.
     required:
-      - accessKey
-      - secretKey
       - region
     type: object
     properties:
@@ -65,10 +67,18 @@ spec:
         description: The AWS region to connect to.
         type: string
         example: eu-west-1
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the Secrets Manager client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+        - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
   dependencies:
+    - "camel:core"
     - "camel:aws-secrets-manager"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: "kamelet:source"
       steps:
@@ -92,7 +102,8 @@ spec:
       - to:
           uri: "aws-secrets-manager:kamelet"
           parameters:
-            secretKey: "{{secretKey}}"
-            accessKey: "{{accessKey}}"
+            secretKey: "{{?secretKey}}"
+            accessKey: "{{?accessKey}}"
             region: "{{region}}"
+            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
             operation: "createSecret"
\ No newline at end of file
diff --git a/connectors/camel-slack-source-kafka-connector/pom.xml b/connectors/camel-aws-ses-sink-kafka-connector/pom.xml
similarity index 94%
copy from connectors/camel-slack-source-kafka-connector/pom.xml
copy to connectors/camel-aws-ses-sink-kafka-connector/pom.xml
index 3bd3bf68a..983634282 100644
--- a/connectors/camel-slack-source-kafka-connector/pom.xml
+++ b/connectors/camel-aws-ses-sink-kafka-connector/pom.xml
@@ -24,9 +24,9 @@
     <artifactId>connectors</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>camel-slack-source-kafka-connector</artifactId>
-  <name>Camel-Kafka-Connector :: slack-source</name>
-  <description>Camel Kafka Connector for slack-source</description>
+  <artifactId>camel-aws-ses-sink-kafka-connector</artifactId>
+  <name>Camel-Kafka-Connector :: aws-ses-sink</name>
+  <description>Camel Kafka Connector for aws-ses-sink</description>
   <dependencies>
     <!-- Kafka -->
     <dependency>
@@ -43,11 +43,11 @@
     <!--START OF GENERATED CODE-->
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-slack</artifactId>
+      <artifactId>camel-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jackson</artifactId>
+      <artifactId>camel-aws2-ses</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
diff --git a/connectors/camel-aws-ses-sink-kafka-connector/src/generated/descriptors/connector-sink.properties b/connectors/camel-aws-ses-sink-kafka-connector/src/generated/descriptors/connector-sink.properties
new file mode 100644
index 000000000..7ee0fc901
--- /dev/null
+++ b/connectors/camel-aws-ses-sink-kafka-connector/src/generated/descriptors/connector-sink.properties
@@ -0,0 +1 @@
+camel-aws-ses-sink-sink
\ No newline at end of file
diff --git a/connectors/camel-aws-ses-sink-kafka-connector/src/generated/resources/camel-aws-ses-sink-sink.json b/connectors/camel-aws-ses-sink-kafka-connector/src/generated/resources/camel-aws-ses-sink-sink.json
new file mode 100644
index 000000000..d863069a3
--- /dev/null
+++ b/connectors/camel-aws-ses-sink-kafka-connector/src/generated/resources/camel-aws-ses-sink-sink.json
@@ -0,0 +1,44 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.awssessink.CamelAwssessinkSinkConnector",
+		"artifactId": "camel-aws-ses-sink-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-aws-ses-sink-sink",
+		"type": "sink",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Send Email through AWS SES Service.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SES Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SES client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.\n [...]
+	},
+	"properties": {
+		"camel.kamelet.aws-ses-sink.from": {
+			"name": "camel.kamelet.aws-ses-sink.from",
+			"description": "From address Example: user@example.com",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.aws-ses-sink.accessKey": {
+			"name": "camel.kamelet.aws-ses-sink.accessKey",
+			"description": "The access key obtained from AWS.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ses-sink.secretKey": {
+			"name": "camel.kamelet.aws-ses-sink.secretKey",
+			"description": "The secret key obtained from AWS.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-ses-sink.region": {
+			"name": "camel.kamelet.aws-ses-sink.region",
+			"description": "The AWS region to connect to. Example: eu-west-1",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.aws-ses-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-ses-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the SES client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		}
+	}
+}
diff --git a/connectors/camel-github-source-kafka-connector/src/main/assembly/package.xml b/connectors/camel-aws-ses-sink-kafka-connector/src/main/assembly/package.xml
similarity index 100%
copy from connectors/camel-github-source-kafka-connector/src/main/assembly/package.xml
copy to connectors/camel-aws-ses-sink-kafka-connector/src/main/assembly/package.xml
diff --git a/connectors/camel-aws2-iam-kafka-connector/src/main/docs/examples/CamelAws2iamSinkConnector.properties b/connectors/camel-aws-ses-sink-kafka-connector/src/main/docs/examples/CamelAwssessinkSinkConnector.properties
similarity index 82%
copy from connectors/camel-aws2-iam-kafka-connector/src/main/docs/examples/CamelAws2iamSinkConnector.properties
copy to connectors/camel-aws-ses-sink-kafka-connector/src/main/docs/examples/CamelAwssessinkSinkConnector.properties
index 46557852c..eb4d23475 100644
--- a/connectors/camel-aws2-iam-kafka-connector/src/main/docs/examples/CamelAws2iamSinkConnector.properties
+++ b/connectors/camel-aws-ses-sink-kafka-connector/src/main/docs/examples/CamelAwssessinkSinkConnector.properties
@@ -15,8 +15,8 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-name=CamelAws2-iamSinkConnector
-connector.class=org.apache.camel.kafkaconnector.aws2iam.CamelAws2iamSinkConnector
+name=CamelAws-ses-sinkSinkConnector
+connector.class=org.apache.camel.kafkaconnector.awssessink.CamelAwssessinkSinkConnector
 tasks.max=1
 
 # use the kafka converters that better suit your needs, these are just defaults:
@@ -28,6 +28,7 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# Logical name
-camel.sink.path.label=
-
+# From address Example: user@example.com
+camel.kamelet.aws-ses-sink.from=
+# The AWS region to connect to. Example: eu-west-1
+camel.kamelet.aws-ses-sink.region=
diff --git a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceConnector.java b/connectors/camel-aws-ses-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssessink/CamelAwssessinkSinkConnector.java
similarity index 79%
copy from connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceConnector.java
copy to connectors/camel-aws-ses-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssessink/CamelAwssessinkSinkConnector.java
index d7c8a90e6..13e29e7d3 100644
--- a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceConnector.java
+++ b/connectors/camel-aws-ses-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssessink/CamelAwssessinkSinkConnector.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.kafkaconnector.githubsource;
+package org.apache.camel.kafkaconnector.awssessink;
 
 import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnector;
 import org.apache.kafka.common.config.ConfigDef;
 import org.apache.kafka.connect.connector.Task;
 
 @Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGithubsourceSourceConnector extends CamelSourceConnector {
+public class CamelAwssessinkSinkConnector extends CamelSinkConnector {
 
     @Override
     public ConfigDef config() {
-        return CamelGithubsourceSourceConnectorConfig.conf();
+        return CamelAwssessinkSinkConnectorConfig.conf();
     }
     @Override
     public Class<? extends Task> taskClass() {
-        return CamelGithubsourceSourceTask.class;
+        return CamelAwssessinkSinkTask.class;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-ses-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssessink/CamelAwssessinkSinkConnectorConfig.java b/connectors/camel-aws-ses-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssessink/CamelAwssessinkSinkConnectorConfig.java
new file mode 100644
index 000000000..ce1eb1271
--- /dev/null
+++ b/connectors/camel-aws-ses-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssessink/CamelAwssessinkSinkConnectorConfig.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.awssessink;
+
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.kafka.common.config.ConfigDef;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelAwssessinkSinkConnectorConfig
+        extends
+            CamelSinkConnectorConfig {
+
+    public static final String CAMEL_SINK_AWSSESSINK_KAMELET_FROM_CONF = "camel.kamelet.aws-ses-sink.from";
+    public static final String CAMEL_SINK_AWSSESSINK_KAMELET_FROM_DOC = "From address Example: user@example.com";
+    public static final String CAMEL_SINK_AWSSESSINK_KAMELET_FROM_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSESSINK_KAMELET_ACCESS_KEY_CONF = "camel.kamelet.aws-ses-sink.accessKey";
+    public static final String CAMEL_SINK_AWSSESSINK_KAMELET_ACCESS_KEY_DOC = "The access key obtained from AWS.";
+    public static final String CAMEL_SINK_AWSSESSINK_KAMELET_ACCESS_KEY_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSESSINK_KAMELET_SECRET_KEY_CONF = "camel.kamelet.aws-ses-sink.secretKey";
+    public static final String CAMEL_SINK_AWSSESSINK_KAMELET_SECRET_KEY_DOC = "The secret key obtained from AWS.";
+    public static final String CAMEL_SINK_AWSSESSINK_KAMELET_SECRET_KEY_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSESSINK_KAMELET_REGION_CONF = "camel.kamelet.aws-ses-sink.region";
+    public static final String CAMEL_SINK_AWSSESSINK_KAMELET_REGION_DOC = "The AWS region to connect to. Example: eu-west-1";
+    public static final String CAMEL_SINK_AWSSESSINK_KAMELET_REGION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSESSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-ses-sink.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWSSESSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SES client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWSSESSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+
+    public CamelAwssessinkSinkConnectorConfig(
+            ConfigDef config,
+            Map<String, String> parsedConfig) {
+        super(config, parsedConfig);
+    }
+
+    public CamelAwssessinkSinkConnectorConfig(Map<String, String> parsedConfig) {
+        this(conf(), parsedConfig);
+    }
+
+    public static ConfigDef conf() {
+        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
+        conf.define(CAMEL_SINK_AWSSESSINK_KAMELET_FROM_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSESSINK_KAMELET_FROM_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSESSINK_KAMELET_FROM_DOC);
+        conf.define(CAMEL_SINK_AWSSESSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSESSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSESSINK_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSSESSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSESSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSESSINK_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSSESSINK_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSESSINK_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSESSINK_KAMELET_REGION_DOC);
+        conf.define(CAMEL_SINK_AWSSESSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSESSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSESSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        return conf;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceTask.java b/connectors/camel-aws-ses-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssessink/CamelAwssessinkSinkTask.java
similarity index 70%
copy from connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceTask.java
copy to connectors/camel-aws-ses-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssessink/CamelAwssessinkSinkTask.java
index 3e55aed5a..184ca25b9 100644
--- a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceTask.java
+++ b/connectors/camel-aws-ses-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssessink/CamelAwssessinkSinkTask.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.kafkaconnector.githubsource;
+package org.apache.camel.kafkaconnector.awssessink;
 
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.camel.kafkaconnector.CamelSinkTask;
 
 @Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGithubsourceSourceTask extends CamelSourceTask {
+public class CamelAwssessinkSinkTask extends CamelSinkTask {
 
     @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
+    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
             Map<String, String> props) {
-        return new CamelGithubsourceSourceConnectorConfig(props);
+        return new CamelAwssessinkSinkConnectorConfig(props);
     }
     @Override
-    protected String getSourceKamelet() {
-        return "kamelet:github-source";
+    protected String getSinkKamelet() {
+        return "kamelet:aws-ses-sink";
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-aws-ses-sink-kafka-connector/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
copy from connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/LICENSE.txt
copy to connectors/camel-aws-ses-sink-kafka-connector/src/main/resources/META-INF/LICENSE.txt
diff --git a/connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-aws-ses-sink-kafka-connector/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
copy from connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/NOTICE.txt
copy to connectors/camel-aws-ses-sink-kafka-connector/src/main/resources/META-INF/NOTICE.txt
diff --git a/connectors/camel-aws-ses-sink-kafka-connector/src/main/resources/kamelets/aws-ses-sink.kamelet.yaml b/connectors/camel-aws-ses-sink-kafka-connector/src/main/resources/kamelets/aws-ses-sink.kamelet.yaml
new file mode 100644
index 000000000..ed529ae33
--- /dev/null
+++ b/connectors/camel-aws-ses-sink-kafka-connector/src/main/resources/kamelets/aws-ses-sink.kamelet.yaml
@@ -0,0 +1,143 @@
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+apiVersion: camel.apache.org/v1alpha1
+kind: Kamelet
+metadata:
+  name: aws-ses-sink
+  annotations:
+    camel.apache.org/kamelet.support.level: "Preview"
+    camel.apache.org/catalog.version: "0.8.0"
+    camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjI1NnB4IiBoZWlnaHQ9IjI5OXB4IiB2aWV3Qm94PSIwIDAgMjU2IDI5OSIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCI+Cgk8Zz4KCQk8cGF0aCBkPSJNNjAuNTU2LDQ3LjYwMiBMMCwxNDQuMDEgTDYwLjU1NiwyNDAuNDM0IEw2MS42MTIsMjM5LjY4MSBMNjAuODM3LDQ3LjggTD [...]
+    camel.apache.org/provider: "Apache Software Foundation"
+    camel.apache.org/kamelet.group: "AWS SES"
+  labels:
+    camel.apache.org/kamelet.type: "sink"
+spec:
+  definition:
+    title: "AWS SES Sink"
+    description: |-
+      Send Email through AWS SES Service.
+
+      Access Key/Secret Key are the basic method for authenticating to the AWS SES Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+      
+      When using a default Credentials Provider the SES client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
+
+      The Kamelet expects the following headers to be set:
+
+      - `subject` / `ce-subject`: The email subject
+
+      If the header won't be set the exchange ID will be used as email subject.
+
+      - `to` / `ce-to`: a comma separated list of email addresses
+
+      - `reply-to-addresses` / `ce-reply-to-addresses`: a comma separated list of reply-to email addresses
+
+    required:
+      - from
+      - region
+    type: object
+    properties:
+      from:
+        title: From 
+        description: From address
+        type: string
+        example: user@example.com
+      accessKey:
+        title: Access Key
+        description: The access key obtained from AWS.
+        type: string
+        format: password
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:password
+        - urn:camel:group:credentials
+      secretKey:
+        title: Secret Key
+        description: The secret key obtained from AWS.
+        type: string
+        format: password
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:password
+        - urn:camel:group:credentials
+      region:
+        title: AWS Region
+        description: The AWS region to connect to.
+        type: string
+        example: eu-west-1
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the SES client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+        - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+  dependencies:
+    - "camel:core"
+    - "camel:aws2-ses"
+    - "camel:kamelet"
+  template:
+    from:
+      uri: "kamelet:source"
+      steps:
+      - choice:
+          when:
+          - simple: "${header[subject]}"
+            steps:
+            - set-header:
+                name: CamelAwsSesSubject
+                simple: "${header[subject]}"
+          - simple: "${header[ce-subject]}"
+            steps:
+            - set-header:
+                name: CamelAwsSesSubject
+                simple: "${header[ce-subject]}"
+          otherwise:
+            steps:
+            - set-header:
+                name: CamelAwsSesSubject
+                simple: "${exchangeId}"
+      - choice:
+          when:
+          - simple: "${header[to]}"
+            steps:
+            - set-header:
+                name: CamelAwsSesTo
+                simple: "${header[to]}"
+          - simple: "${header[ce-to]}"
+            steps:
+            - set-header:
+                name: CamelAwsSesTo
+                simple: "${header[ce-to]}"
+      - choice:
+          when:
+          - simple: "${header[reply-to-addresses]}"
+            steps:
+            - set-header:
+                name: CamelAwsSesReplyToAddresses
+                simple: "${header[reply-to-addresses]}"
+          - simple: "${header[ce-reply-to-addresses]}"
+            steps:
+            - set-header:
+                name: CamelAwsSesReplyToAddresses
+                simple: "${header[ce-reply-to-addresses]}"
+      - to:
+          uri: "aws2-ses://{{from}}"
+          parameters:
+            secretKey: "{{?secretKey}}"
+            accessKey: "{{?accessKey}}"
+            region: "{{region}}"
+            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
\ No newline at end of file
diff --git a/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/generated/resources/camel-aws-sns-fifo-sink-sink.json b/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/generated/resources/camel-aws-sns-fifo-sink-sink.json
index d87221472..735bb9d37 100644
--- a/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/generated/resources/camel-aws-sns-fifo-sink-sink.json
+++ b/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/generated/resources/camel-aws-sns-fifo-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sns-fifo-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Send message to an AWS SNS FIFO Topic\n\nThe Kamelet expects the following headers to be set:\n\n- `subject` \/ `ce-subject`: the subject of the message"
+		"description": "Send message to an AWS SNS FIFO Topic.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SNS Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SNS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-sns-fifo-sink.topicNameOrArn": {
@@ -18,14 +18,14 @@
 		"camel.kamelet.aws-sns-fifo-sink.accessKey": {
 			"name": "camel.kamelet.aws-sns-fifo-sink.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sns-fifo-sink.secretKey": {
 			"name": "camel.kamelet.aws-sns-fifo-sink.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sns-fifo-sink.region": {
 			"name": "camel.kamelet.aws-sns-fifo-sink.region",
@@ -46,6 +46,26 @@
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.aws-sns-fifo-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-sns-fifo-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the SNS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sns-fifo-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-sns-fifo-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sns-fifo-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-sns-fifo-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/docs/examples/CamelAwssnsfifosinkSinkConnector.properties b/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/docs/examples/CamelAwssnsfifosinkSinkConnector.properties
index da74db442..9a9656fc7 100644
--- a/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/docs/examples/CamelAwssnsfifosinkSinkConnector.properties
+++ b/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/docs/examples/CamelAwssnsfifosinkSinkConnector.properties
@@ -28,12 +28,7 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The access key obtained from AWS
-camel.kamelet.aws-sns-fifo-sink.accessKey=
 # The AWS region to connect to Example: eu-west-1
 camel.kamelet.aws-sns-fifo-sink.region=
-# The secret key obtained from AWS
-camel.kamelet.aws-sns-fifo-sink.secretKey=
 # The SNS Topic name or ARN
 camel.kamelet.aws-sns-fifo-sink.topicNameOrArn=
-
diff --git a/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnsfifosink/CamelAwssnsfifosinkSinkConnectorConfig.java b/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnsfifosink/CamelAwssnsfifosinkSinkConnectorConfig.java
index 61ad9ad3f..86c1c1313 100644
--- a/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnsfifosink/CamelAwssnsfifosinkSinkConnectorConfig.java
+++ b/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnsfifosink/CamelAwssnsfifosinkSinkConnectorConfig.java
@@ -44,6 +44,15 @@ public class CamelAwssnsfifosinkSinkConnectorConfig
     public static final String CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_AUTO_CREATE_TOPIC_CONF = "camel.kamelet.aws-sns-fifo-sink.autoCreateTopic";
     public static final String CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_AUTO_CREATE_TOPIC_DOC = "Setting the autocreation of the SNS topic.";
     public static final Boolean CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_AUTO_CREATE_TOPIC_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-sns-fifo-sink.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SNS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF = "camel.kamelet.aws-sns-fifo-sink.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.";
+    public static final String CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_OVERRIDE_ENDPOINT_CONF = "camel.kamelet.aws-sns-fifo-sink.overrideEndpoint";
+    public static final String CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_OVERRIDE_ENDPOINT_DOC = "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.";
+    public static final Boolean CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT = false;
 
     public CamelAwssnsfifosinkSinkConnectorConfig(
             ConfigDef config,
@@ -59,11 +68,14 @@ public class CamelAwssnsfifosinkSinkConnectorConfig
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_TOPIC_NAME_OR_ARN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_TOPIC_NAME_OR_ARN_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_TOPIC_NAME_OR_ARN_DOC);
-        conf.define(CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_REGION_DOC);
         conf.define(CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_CONTENT_BASED_DEDUPLICATION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_CONTENT_BASED_DEDUPLICATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_CONTENT_BASED_DEDUPLICATION_DOC);
         conf.define(CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_AUTO_CREATE_TOPIC_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_AUTO_CREATE_TOPIC_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_AUTO_CREATE_TOPIC_DOC);
+        conf.define(CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        conf.define(CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC);
+        conf.define(CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNSFIFOSINK_KAMELET_OVERRIDE_ENDPOINT_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/resources/kamelets/aws-sns-fifo-sink.kamelet.yaml b/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/resources/kamelets/aws-sns-fifo-sink.kamelet.yaml
index 015833a74..c867e4222 100644
--- a/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/resources/kamelets/aws-sns-fifo-sink.kamelet.yaml
+++ b/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/resources/kamelets/aws-sns-fifo-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-sns-fifo-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+DQo8c3ZnICAgdmlld0JveD0iMCAwIDI1NiAyNTciIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgcHJlc2VydmVBc3BlY3RSYXRpbz0ieE1pZFlNaWQiPg0KCTxnPg0KCQk8cGF0aCBkPSJNOTguODc1LDIzMi4wMzMgTDcyLjQ0MiwyMjQuNjI1IEw0Ny40NDEsMTk2LjExNyBMNzguNzEzLDE5NS4yNTQgTDk4Ljg3NSwyMzIuMDMzIiBmaWxsPSIjOTk1QjgwIj [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS SNS"
@@ -31,15 +31,17 @@ spec:
   definition:
     title: AWS SNS FIFO Sink
     description: |- 
-      Send message to an AWS SNS FIFO Topic
+      Send message to an AWS SNS FIFO Topic.
+
+      Access Key/Secret Key are the basic method for authenticating to the AWS SNS Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+      
+      When using a default Credentials Provider the SNS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
 
       The Kamelet expects the following headers to be set:
 
       - `subject` / `ce-subject`: the subject of the message
     required:
       - topicNameOrArn
-      - accessKey
-      - secretKey
       - region
     type: object
     properties:
@@ -82,11 +84,29 @@ spec:
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
         default: false
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the SNS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+        - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwrite Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
   dependencies:
   - "camel:aws2-sns"
   - "camel:core"
   - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: kamelet:source
       steps:
@@ -130,19 +150,25 @@ spec:
                 uri: "aws2-sns:{{topicNameOrArn}}"
                 parameters:
                   autoCreateTopic: "{{autoCreateTopic}}"
-                  accessKey: "{{accessKey}}"
-                  secretKey: "{{secretKey}}"
+                  accessKey: "{{?accessKey}}"
+                  secretKey: "{{?secretKey}}"
                   region: "{{region}}"
+                  useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
                   messageGroupIdStrategy: "usePropertyValue"
                   messageDeduplicationIdStrategy: "useContentBasedDeduplication"
+                  uriEndpointOverride: "{{?uriEndpointOverride}}"
+                  overrideEndpoint: "{{overrideEndpoint}}"
           otherwise:
             steps:
             - to:
                 uri: "aws2-sns:{{topicNameOrArn}}"
                 parameters:
                   autoCreateTopic: "{{autoCreateTopic}}"
-                  accessKey: "{{accessKey}}"
-                  secretKey: "{{secretKey}}"
+                  accessKey: "{{?accessKey}}"
+                  secretKey: "{{?secretKey}}"
                   region: "{{region}}"
+                  useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
                   messageGroupIdStrategy: "usePropertyValue"
-                  messageDeduplicationIdStrategy: "useExchangeId"
\ No newline at end of file
+                  messageDeduplicationIdStrategy: "useExchangeId"
+                  uriEndpointOverride: "{{?uriEndpointOverride}}"
+                  overrideEndpoint: "{{overrideEndpoint}}"
\ No newline at end of file
diff --git a/connectors/camel-aws-sns-sink-kafka-connector/pom.xml b/connectors/camel-aws-sns-sink-kafka-connector/pom.xml
index 02fb8007d..02cccd874 100644
--- a/connectors/camel-aws-sns-sink-kafka-connector/pom.xml
+++ b/connectors/camel-aws-sns-sink-kafka-connector/pom.xml
@@ -41,6 +41,10 @@
     </dependency>
     <!-- Camel -->
     <!--START OF GENERATED CODE-->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
diff --git a/connectors/camel-aws-sns-sink-kafka-connector/src/generated/resources/camel-aws-sns-sink-sink.json b/connectors/camel-aws-sns-sink-kafka-connector/src/generated/resources/camel-aws-sns-sink-sink.json
index 6414c5bfd..b34085069 100644
--- a/connectors/camel-aws-sns-sink-kafka-connector/src/generated/resources/camel-aws-sns-sink-sink.json
+++ b/connectors/camel-aws-sns-sink-kafka-connector/src/generated/resources/camel-aws-sns-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sns-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Send message to an AWS SNS Topic\n\nThe Kamelet expects the following headers to be set:\n\n- `subject` \/ `ce-subject`: the subject of the message"
+		"description": "Send message to an AWS SNS Topic.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SNS Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SNS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.\n\n [...]
 	},
 	"properties": {
 		"camel.kamelet.aws-sns-sink.topicNameOrArn": {
@@ -18,14 +18,14 @@
 		"camel.kamelet.aws-sns-sink.accessKey": {
 			"name": "camel.kamelet.aws-sns-sink.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sns-sink.secretKey": {
 			"name": "camel.kamelet.aws-sns-sink.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sns-sink.region": {
 			"name": "camel.kamelet.aws-sns-sink.region",
@@ -39,6 +39,26 @@
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.aws-sns-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-sns-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the SNS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sns-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-sns-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sns-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-sns-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-sns-sink-kafka-connector/src/main/docs/examples/CamelAwssnssinkSinkConnector.properties b/connectors/camel-aws-sns-sink-kafka-connector/src/main/docs/examples/CamelAwssnssinkSinkConnector.properties
index 1c5fd6741..1687e9bb2 100644
--- a/connectors/camel-aws-sns-sink-kafka-connector/src/main/docs/examples/CamelAwssnssinkSinkConnector.properties
+++ b/connectors/camel-aws-sns-sink-kafka-connector/src/main/docs/examples/CamelAwssnssinkSinkConnector.properties
@@ -28,12 +28,7 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The access key obtained from AWS
-camel.kamelet.aws-sns-sink.accessKey=
 # The AWS region to connect to Example: eu-west-1
 camel.kamelet.aws-sns-sink.region=
-# The secret key obtained from AWS
-camel.kamelet.aws-sns-sink.secretKey=
 # The SQS Topic name or ARN
 camel.kamelet.aws-sns-sink.topicNameOrArn=
-
diff --git a/connectors/camel-aws-sns-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnssink/CamelAwssnssinkSinkConnectorConfig.java b/connectors/camel-aws-sns-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnssink/CamelAwssnssinkSinkConnectorConfig.java
index 3d5c4480a..7c9ef5c83 100644
--- a/connectors/camel-aws-sns-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnssink/CamelAwssnssinkSinkConnectorConfig.java
+++ b/connectors/camel-aws-sns-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnssink/CamelAwssnssinkSinkConnectorConfig.java
@@ -41,6 +41,15 @@ public class CamelAwssnssinkSinkConnectorConfig
     public static final String CAMEL_SINK_AWSSNSSINK_KAMELET_AUTO_CREATE_TOPIC_CONF = "camel.kamelet.aws-sns-sink.autoCreateTopic";
     public static final String CAMEL_SINK_AWSSNSSINK_KAMELET_AUTO_CREATE_TOPIC_DOC = "Setting the autocreation of the SNS topic.";
     public static final Boolean CAMEL_SINK_AWSSNSSINK_KAMELET_AUTO_CREATE_TOPIC_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSNSSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-sns-sink.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWSSNSSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SNS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWSSNSSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSNSSINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF = "camel.kamelet.aws-sns-sink.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWSSNSSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.";
+    public static final String CAMEL_SINK_AWSSNSSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSNSSINK_KAMELET_OVERRIDE_ENDPOINT_CONF = "camel.kamelet.aws-sns-sink.overrideEndpoint";
+    public static final String CAMEL_SINK_AWSSNSSINK_KAMELET_OVERRIDE_ENDPOINT_DOC = "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.";
+    public static final Boolean CAMEL_SINK_AWSSNSSINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT = false;
 
     public CamelAwssnssinkSinkConnectorConfig(
             ConfigDef config,
@@ -55,10 +64,13 @@ public class CamelAwssnssinkSinkConnectorConfig
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_AWSSNSSINK_KAMELET_TOPIC_NAME_OR_ARN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSNSSINK_KAMELET_TOPIC_NAME_OR_ARN_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSNSSINK_KAMELET_TOPIC_NAME_OR_ARN_DOC);
-        conf.define(CAMEL_SINK_AWSSNSSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSNSSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSNSSINK_KAMELET_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSSNSSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSNSSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSNSSINK_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSSNSSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSNSSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNSSINK_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSSNSSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSNSSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNSSINK_KAMELET_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWSSNSSINK_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSNSSINK_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSNSSINK_KAMELET_REGION_DOC);
         conf.define(CAMEL_SINK_AWSSNSSINK_KAMELET_AUTO_CREATE_TOPIC_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNSSINK_KAMELET_AUTO_CREATE_TOPIC_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNSSINK_KAMELET_AUTO_CREATE_TOPIC_DOC);
+        conf.define(CAMEL_SINK_AWSSNSSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNSSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNSSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        conf.define(CAMEL_SINK_AWSSNSSINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSNSSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNSSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC);
+        conf.define(CAMEL_SINK_AWSSNSSINK_KAMELET_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNSSINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNSSINK_KAMELET_OVERRIDE_ENDPOINT_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-sns-sink-kafka-connector/src/main/resources/kamelets/aws-sns-sink.kamelet.yaml b/connectors/camel-aws-sns-sink-kafka-connector/src/main/resources/kamelets/aws-sns-sink.kamelet.yaml
index 5bf24716a..e5a87e725 100644
--- a/connectors/camel-aws-sns-sink-kafka-connector/src/main/resources/kamelets/aws-sns-sink.kamelet.yaml
+++ b/connectors/camel-aws-sns-sink-kafka-connector/src/main/resources/kamelets/aws-sns-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-sns-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+DQo8c3ZnICAgdmlld0JveD0iMCAwIDI1NiAyNTciIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgcHJlc2VydmVBc3BlY3RSYXRpbz0ieE1pZFlNaWQiPg0KCTxnPg0KCQk8cGF0aCBkPSJNOTguODc1LDIzMi4wMzMgTDcyLjQ0MiwyMjQuNjI1IEw0Ny40NDEsMTk2LjExNyBMNzguNzEzLDE5NS4yNTQgTDk4Ljg3NSwyMzIuMDMzIiBmaWxsPSIjOTk1QjgwIj [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS SNS"
@@ -31,15 +31,17 @@ spec:
   definition:
     title: AWS SNS Sink
     description: |-
-      Send message to an AWS SNS Topic
+      Send message to an AWS SNS Topic.
+
+      Access Key/Secret Key are the basic method for authenticating to the AWS SNS Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+      
+      When using a default Credentials Provider the SNS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
 
       The Kamelet expects the following headers to be set:
 
       - `subject` / `ce-subject`: the subject of the message
     required:
       - topicNameOrArn
-      - accessKey
-      - secretKey
       - region
     type: object
     properties:
@@ -75,10 +77,29 @@ spec:
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
         default: false
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the SNS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+        - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwrite Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
   dependencies:
+    - "camel:core"
     - "camel:aws2-sns"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: kamelet:source
       steps:
@@ -98,6 +119,9 @@ spec:
           uri: "aws2-sns:{{topicNameOrArn}}"
           parameters:
             autoCreateTopic: "{{autoCreateTopic}}"
-            accessKey: "{{accessKey}}"
-            secretKey: "{{secretKey}}"
-            region: "{{region}}"
\ No newline at end of file
+            accessKey: "{{?accessKey}}"
+            secretKey: "{{?secretKey}}"
+            region: "{{region}}"
+            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+            uriEndpointOverride: "{{?uriEndpointOverride}}"
+            overrideEndpoint: "{{overrideEndpoint}}"
\ No newline at end of file
diff --git a/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/generated/resources/camel-aws-sqs-batch-sink-sink.json b/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/generated/resources/camel-aws-sqs-batch-sink-sink.json
index 10277b13a..1d8a3e58e 100644
--- a/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/generated/resources/camel-aws-sqs-batch-sink-sink.json
+++ b/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/generated/resources/camel-aws-sqs-batch-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sqs-batch-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Send Batch message to an AWS SQS Queue"
+		"description": "Send Batch message to an AWS SQS Queue.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
 	},
 	"properties": {
 		"camel.kamelet.aws-sqs-batch-sink.queueNameOrArn": {
@@ -18,14 +18,14 @@
 		"camel.kamelet.aws-sqs-batch-sink.accessKey": {
 			"name": "camel.kamelet.aws-sqs-batch-sink.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sqs-batch-sink.secretKey": {
 			"name": "camel.kamelet.aws-sqs-batch-sink.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sqs-batch-sink.region": {
 			"name": "camel.kamelet.aws-sqs-batch-sink.region",
@@ -49,6 +49,7 @@
 		"camel.kamelet.aws-sqs-batch-sink.amazonAWSHost": {
 			"name": "camel.kamelet.aws-sqs-batch-sink.amazonAWSHost",
 			"description": "The hostname of the Amazon AWS cloud.",
+			"defaultValue": "\"amazonaws.com\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -58,6 +59,26 @@
 			"defaultValue": "\"https\"",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-batch-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-sqs-batch-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the SQS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-batch-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-sqs-batch-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-batch-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-sqs-batch-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/docs/examples/CamelAwssqsbatchsinkSinkConnector.properties b/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/docs/examples/CamelAwssqsbatchsinkSinkConnector.properties
index b285b2b34..edcb21fed 100644
--- a/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/docs/examples/CamelAwssqsbatchsinkSinkConnector.properties
+++ b/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/docs/examples/CamelAwssqsbatchsinkSinkConnector.properties
@@ -28,14 +28,9 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The access key obtained from AWS
-camel.kamelet.aws-sqs-batch-sink.accessKey=
 # The batch separator string Example: ,
 camel.kamelet.aws-sqs-batch-sink.batchSeparator=
 # The SQS Queue name or ARN
 camel.kamelet.aws-sqs-batch-sink.queueNameOrArn=
 # The AWS region to connect to Example: eu-west-1
 camel.kamelet.aws-sqs-batch-sink.region=
-# The secret key obtained from AWS
-camel.kamelet.aws-sqs-batch-sink.secretKey=
-
diff --git a/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsbatchsink/CamelAwssqsbatchsinkSinkConnectorConfig.java b/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsbatchsink/CamelAwssqsbatchsinkSinkConnectorConfig.java
index 3a5f307e3..59e23bd36 100644
--- a/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsbatchsink/CamelAwssqsbatchsinkSinkConnectorConfig.java
+++ b/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsbatchsink/CamelAwssqsbatchsinkSinkConnectorConfig.java
@@ -46,10 +46,19 @@ public class CamelAwssqsbatchsinkSinkConnectorConfig
     public static final String CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_BATCH_SEPARATOR_DEFAULT = null;
     public static final String CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_AMAZON_AWSHOST_CONF = "camel.kamelet.aws-sqs-batch-sink.amazonAWSHost";
     public static final String CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_AMAZON_AWSHOST_DOC = "The hostname of the Amazon AWS cloud.";
-    public static final String CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_AMAZON_AWSHOST_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_AMAZON_AWSHOST_DEFAULT = "amazonaws.com";
     public static final String CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_PROTOCOL_CONF = "camel.kamelet.aws-sqs-batch-sink.protocol";
     public static final String CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_PROTOCOL_DOC = "The underlying protocol used to communicate with SQS Example: http or https";
     public static final String CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_PROTOCOL_DEFAULT = "https";
+    public static final String CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-sqs-batch-sink.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SQS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF = "camel.kamelet.aws-sqs-batch-sink.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.";
+    public static final String CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_OVERRIDE_ENDPOINT_CONF = "camel.kamelet.aws-sqs-batch-sink.overrideEndpoint";
+    public static final String CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_OVERRIDE_ENDPOINT_DOC = "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.";
+    public static final Boolean CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT = false;
 
     public CamelAwssqsbatchsinkSinkConnectorConfig(
             ConfigDef config,
@@ -65,13 +74,16 @@ public class CamelAwssqsbatchsinkSinkConnectorConfig
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_QUEUE_NAME_OR_ARN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_QUEUE_NAME_OR_ARN_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_QUEUE_NAME_OR_ARN_DOC);
-        conf.define(CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_REGION_DOC);
         conf.define(CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_AUTO_CREATE_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_AUTO_CREATE_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_AUTO_CREATE_QUEUE_DOC);
         conf.define(CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_BATCH_SEPARATOR_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_BATCH_SEPARATOR_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_BATCH_SEPARATOR_DOC);
         conf.define(CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_AMAZON_AWSHOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_AMAZON_AWSHOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_AMAZON_AWSHOST_DOC);
         conf.define(CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_PROTOCOL_DOC);
+        conf.define(CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        conf.define(CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC);
+        conf.define(CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSBATCHSINK_KAMELET_OVERRIDE_ENDPOINT_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-batch-sink.kamelet.yaml b/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-batch-sink.kamelet.yaml
index 6f619b30c..bba379ba5 100644
--- a/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-batch-sink.kamelet.yaml
+++ b/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-batch-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-sqs-batch-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS SQS"
@@ -31,11 +31,13 @@ spec:
   definition:
     title: AWS SQS Batch Sink
     description: |-
-      Send Batch message to an AWS SQS Queue
+      Send Batch message to an AWS SQS Queue.
+
+      Access Key/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+      
+      When using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
     required:
       - queueNameOrArn
-      - accessKey
-      - secretKey
       - region
       - batchSeparator
     type: object
@@ -81,16 +83,35 @@ spec:
         title: AWS Host
         description: The hostname of the Amazon AWS cloud. 
         type: string
+        default: amazonaws.com
       protocol:
         title: Protocol
         description: The underlying protocol used to communicate with SQS
         type: string
         example: http or https
-        default: https        
+        default: https
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the SQS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+        - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwrite Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false        
   dependencies:
     - "camel:aws2-sqs"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: kamelet:source
       steps:
@@ -98,10 +119,13 @@ spec:
           uri: "aws2-sqs:{{queueNameOrArn}}"
           parameters:
             autoCreateQueue: "{{autoCreateQueue}}"
-            accessKey: "{{accessKey}}"
-            secretKey: "{{secretKey}}"
+            accessKey: "{{?accessKey}}"
+            secretKey: "{{?secretKey}}"
             region: "{{region}}"
             batchSeparator: "{{batchSeparator}}"
             operation: "sendBatchMessage"
             amazonAWSHost: "{{?amazonAWSHost}}"
-            protocol: "{{?protocol}}"
\ No newline at end of file
+            protocol: "{{?protocol}}"
+            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+            uriEndpointOverride: "{{?uriEndpointOverride}}"
+            overrideEndpoint: "{{overrideEndpoint}}"
\ No newline at end of file
diff --git a/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/generated/resources/camel-aws-sqs-fifo-sink-sink.json b/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/generated/resources/camel-aws-sqs-fifo-sink-sink.json
index de561215a..64e20e2f0 100644
--- a/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/generated/resources/camel-aws-sqs-fifo-sink-sink.json
+++ b/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/generated/resources/camel-aws-sqs-fifo-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sqs-fifo-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Send message to an AWS SQS FIFO Queue"
+		"description": "\nSend message to an AWS SQS FIFO Queue.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
 	},
 	"properties": {
 		"camel.kamelet.aws-sqs-fifo-sink.queueNameOrArn": {
@@ -18,14 +18,14 @@
 		"camel.kamelet.aws-sqs-fifo-sink.accessKey": {
 			"name": "camel.kamelet.aws-sqs-fifo-sink.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sqs-fifo-sink.secretKey": {
 			"name": "camel.kamelet.aws-sqs-fifo-sink.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sqs-fifo-sink.region": {
 			"name": "camel.kamelet.aws-sqs-fifo-sink.region",
@@ -50,6 +50,7 @@
 		"camel.kamelet.aws-sqs-fifo-sink.amazonAWSHost": {
 			"name": "camel.kamelet.aws-sqs-fifo-sink.amazonAWSHost",
 			"description": "The hostname of the Amazon AWS cloud.",
+			"defaultValue": "\"amazonaws.com\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -59,6 +60,26 @@
 			"defaultValue": "\"https\"",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-fifo-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-sqs-fifo-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the SQS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-fifo-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-sqs-fifo-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-fifo-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-sqs-fifo-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/docs/examples/CamelAwssqsfifosinkSinkConnector.properties b/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/docs/examples/CamelAwssqsfifosinkSinkConnector.properties
index edf8651bd..2c380fb58 100644
--- a/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/docs/examples/CamelAwssqsfifosinkSinkConnector.properties
+++ b/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/docs/examples/CamelAwssqsfifosinkSinkConnector.properties
@@ -28,12 +28,7 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The access key obtained from AWS
-camel.kamelet.aws-sqs-fifo-sink.accessKey=
 # The SQS Queue name or ARN
 camel.kamelet.aws-sqs-fifo-sink.queueNameOrArn=
 # The AWS region to connect to Example: eu-west-1
 camel.kamelet.aws-sqs-fifo-sink.region=
-# The secret key obtained from AWS
-camel.kamelet.aws-sqs-fifo-sink.secretKey=
-
diff --git a/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsfifosink/CamelAwssqsfifosinkSinkConnectorConfig.java b/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsfifosink/CamelAwssqsfifosinkSinkConnectorConfig.java
index 45b695ec0..ff14d3695 100644
--- a/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsfifosink/CamelAwssqsfifosinkSinkConnectorConfig.java
+++ b/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsfifosink/CamelAwssqsfifosinkSinkConnectorConfig.java
@@ -46,10 +46,19 @@ public class CamelAwssqsfifosinkSinkConnectorConfig
     public static final Boolean CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_AUTO_CREATE_QUEUE_DEFAULT = false;
     public static final String CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_AMAZON_AWSHOST_CONF = "camel.kamelet.aws-sqs-fifo-sink.amazonAWSHost";
     public static final String CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_AMAZON_AWSHOST_DOC = "The hostname of the Amazon AWS cloud.";
-    public static final String CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_AMAZON_AWSHOST_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_AMAZON_AWSHOST_DEFAULT = "amazonaws.com";
     public static final String CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_PROTOCOL_CONF = "camel.kamelet.aws-sqs-fifo-sink.protocol";
     public static final String CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_PROTOCOL_DOC = "The underlying protocol used to communicate with SQS Example: http or https";
     public static final String CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_PROTOCOL_DEFAULT = "https";
+    public static final String CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-sqs-fifo-sink.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SQS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF = "camel.kamelet.aws-sqs-fifo-sink.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.";
+    public static final String CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_OVERRIDE_ENDPOINT_CONF = "camel.kamelet.aws-sqs-fifo-sink.overrideEndpoint";
+    public static final String CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_OVERRIDE_ENDPOINT_DOC = "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.";
+    public static final Boolean CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT = false;
 
     public CamelAwssqsfifosinkSinkConnectorConfig(
             ConfigDef config,
@@ -65,13 +74,16 @@ public class CamelAwssqsfifosinkSinkConnectorConfig
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_QUEUE_NAME_OR_ARN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_QUEUE_NAME_OR_ARN_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_QUEUE_NAME_OR_ARN_DOC);
-        conf.define(CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_REGION_DOC);
         conf.define(CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_CONTENT_BASED_DEDUPLICATION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_CONTENT_BASED_DEDUPLICATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_CONTENT_BASED_DEDUPLICATION_DOC);
         conf.define(CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_AUTO_CREATE_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_AUTO_CREATE_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_AUTO_CREATE_QUEUE_DOC);
         conf.define(CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_AMAZON_AWSHOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_AMAZON_AWSHOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_AMAZON_AWSHOST_DOC);
         conf.define(CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_PROTOCOL_DOC);
+        conf.define(CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        conf.define(CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC);
+        conf.define(CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSFIFOSINK_KAMELET_OVERRIDE_ENDPOINT_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-fifo-sink.kamelet.yaml b/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-fifo-sink.kamelet.yaml
index 77e124f54..3d2967c98 100644
--- a/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-fifo-sink.kamelet.yaml
+++ b/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-fifo-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-sqs-fifo-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS SQS"
@@ -30,11 +30,15 @@ metadata:
 spec:
   definition:
     title: AWS SQS FIFO Sink
-    description: Send message to an AWS SQS FIFO Queue
+    description: |-
+
+      Send message to an AWS SQS FIFO Queue.
+
+      Access Key/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+      
+      When using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
     required:
       - queueNameOrArn
-      - accessKey
-      - secretKey
       - region
     type: object
     properties:
@@ -81,17 +85,36 @@ spec:
         title: AWS Host
         description: The hostname of the Amazon AWS cloud. 
         type: string
+        default: amazonaws.com
       protocol:
         title: Protocol
         description: The underlying protocol used to communicate with SQS
         type: string
         example: http or https
-        default: https  
+        default: https
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the SQS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+        - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwrite Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false   
   dependencies:
   - "camel:aws2-sqs"
   - "camel:core"
   - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: kamelet:source
       steps:
@@ -123,21 +146,29 @@ spec:
                 uri: "aws2-sqs:{{queueNameOrArn}}"
                 parameters:
                   autoCreateQueue: "{{autoCreateQueue}}"
-                  accessKey: "{{accessKey}}"
-                  secretKey: "{{secretKey}}"
+                  accessKey: "{{?accessKey}}"
+                  secretKey: "{{?secretKey}}"
                   region: "{{region}}"
+                  useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}" 
                   messageGroupIdStrategy: "usePropertyValue"
                   messageDeduplicationIdStrategy: "useContentBasedDeduplication"
+                  amazonAWSHost: "{{?amazonAWSHost}}"
+                  protocol: "{{?protocol}}"
+                  uriEndpointOverride: "{{?uriEndpointOverride}}"
+                  overrideEndpoint: "{{overrideEndpoint}}"
           otherwise:
             steps:
             - to:
                 uri: "aws2-sqs:{{queueNameOrArn}}"
                 parameters:
                   autoCreateQueue: "{{autoCreateQueue}}"
-                  accessKey: "{{accessKey}}"
-                  secretKey: "{{secretKey}}"
+                  accessKey: "{{?accessKey}}"
+                  secretKey: "{{?secretKey}}"
                   region: "{{region}}"
+                  useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}" 
                   messageGroupIdStrategy: "usePropertyValue"
                   messageDeduplicationIdStrategy: "useExchangeId"
                   amazonAWSHost: "{{?amazonAWSHost}}"
-                  protocol: "{{?protocol}}"
\ No newline at end of file
+                  protocol: "{{?protocol}}"
+                  uriEndpointOverride: "{{?uriEndpointOverride}}"
+                  overrideEndpoint: "{{overrideEndpoint}}"
\ No newline at end of file
diff --git a/connectors/camel-aws-sqs-sink-kafka-connector/src/generated/resources/camel-aws-sqs-sink-sink.json b/connectors/camel-aws-sqs-sink-kafka-connector/src/generated/resources/camel-aws-sqs-sink-sink.json
index d22e5915d..baa83b599 100644
--- a/connectors/camel-aws-sqs-sink-kafka-connector/src/generated/resources/camel-aws-sqs-sink-sink.json
+++ b/connectors/camel-aws-sqs-sink-kafka-connector/src/generated/resources/camel-aws-sqs-sink-sink.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sqs-sink-sink",
 		"type": "sink",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Send message to an AWS SQS Queue"
+		"description": "Send message to an AWS SQS Queue.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
 	},
 	"properties": {
 		"camel.kamelet.aws-sqs-sink.queueNameOrArn": {
@@ -18,14 +18,14 @@
 		"camel.kamelet.aws-sqs-sink.accessKey": {
 			"name": "camel.kamelet.aws-sqs-sink.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sqs-sink.secretKey": {
 			"name": "camel.kamelet.aws-sqs-sink.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sqs-sink.region": {
 			"name": "camel.kamelet.aws-sqs-sink.region",
@@ -43,6 +43,7 @@
 		"camel.kamelet.aws-sqs-sink.amazonAWSHost": {
 			"name": "camel.kamelet.aws-sqs-sink.amazonAWSHost",
 			"description": "The hostname of the Amazon AWS cloud.",
+			"defaultValue": "\"amazonaws.com\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -52,6 +53,26 @@
 			"defaultValue": "\"https\"",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-sink.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-sqs-sink.useDefaultCredentialsProvider",
+			"description": "Set whether the SQS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-sink.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-sqs-sink.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-sink.overrideEndpoint": {
+			"name": "camel.kamelet.aws-sqs-sink.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-sqs-sink-kafka-connector/src/main/docs/examples/CamelAwssqssinkSinkConnector.properties b/connectors/camel-aws-sqs-sink-kafka-connector/src/main/docs/examples/CamelAwssqssinkSinkConnector.properties
index aa0a5bbf0..3deb3a7c5 100644
--- a/connectors/camel-aws-sqs-sink-kafka-connector/src/main/docs/examples/CamelAwssqssinkSinkConnector.properties
+++ b/connectors/camel-aws-sqs-sink-kafka-connector/src/main/docs/examples/CamelAwssqssinkSinkConnector.properties
@@ -28,12 +28,7 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The access key obtained from AWS
-camel.kamelet.aws-sqs-sink.accessKey=
 # The SQS Queue name or ARN
 camel.kamelet.aws-sqs-sink.queueNameOrArn=
 # The AWS region to connect to Example: eu-west-1
 camel.kamelet.aws-sqs-sink.region=
-# The secret key obtained from AWS
-camel.kamelet.aws-sqs-sink.secretKey=
-
diff --git a/connectors/camel-aws-sqs-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssink/CamelAwssqssinkSinkConnectorConfig.java b/connectors/camel-aws-sqs-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssink/CamelAwssqssinkSinkConnectorConfig.java
index 365ca5dd4..fb9138508 100644
--- a/connectors/camel-aws-sqs-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssink/CamelAwssqssinkSinkConnectorConfig.java
+++ b/connectors/camel-aws-sqs-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssink/CamelAwssqssinkSinkConnectorConfig.java
@@ -43,10 +43,19 @@ public class CamelAwssqssinkSinkConnectorConfig
     public static final Boolean CAMEL_SINK_AWSSQSSINK_KAMELET_AUTO_CREATE_QUEUE_DEFAULT = false;
     public static final String CAMEL_SINK_AWSSQSSINK_KAMELET_AMAZON_AWSHOST_CONF = "camel.kamelet.aws-sqs-sink.amazonAWSHost";
     public static final String CAMEL_SINK_AWSSQSSINK_KAMELET_AMAZON_AWSHOST_DOC = "The hostname of the Amazon AWS cloud.";
-    public static final String CAMEL_SINK_AWSSQSSINK_KAMELET_AMAZON_AWSHOST_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSQSSINK_KAMELET_AMAZON_AWSHOST_DEFAULT = "amazonaws.com";
     public static final String CAMEL_SINK_AWSSQSSINK_KAMELET_PROTOCOL_CONF = "camel.kamelet.aws-sqs-sink.protocol";
     public static final String CAMEL_SINK_AWSSQSSINK_KAMELET_PROTOCOL_DOC = "The underlying protocol used to communicate with SQS Example: http or https";
     public static final String CAMEL_SINK_AWSSQSSINK_KAMELET_PROTOCOL_DEFAULT = "https";
+    public static final String CAMEL_SINK_AWSSQSSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-sqs-sink.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWSSQSSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SQS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWSSQSSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSQSSINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF = "camel.kamelet.aws-sqs-sink.uriEndpointOverride";
+    public static final String CAMEL_SINK_AWSSQSSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.";
+    public static final String CAMEL_SINK_AWSSQSSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSSQSSINK_KAMELET_OVERRIDE_ENDPOINT_CONF = "camel.kamelet.aws-sqs-sink.overrideEndpoint";
+    public static final String CAMEL_SINK_AWSSQSSINK_KAMELET_OVERRIDE_ENDPOINT_DOC = "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.";
+    public static final Boolean CAMEL_SINK_AWSSQSSINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT = false;
 
     public CamelAwssqssinkSinkConnectorConfig(
             ConfigDef config,
@@ -61,12 +70,15 @@ public class CamelAwssqssinkSinkConnectorConfig
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_AWSSQSSINK_KAMELET_QUEUE_NAME_OR_ARN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQSSINK_KAMELET_QUEUE_NAME_OR_ARN_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSQSSINK_KAMELET_QUEUE_NAME_OR_ARN_DOC);
-        conf.define(CAMEL_SINK_AWSSQSSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSQSSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSQSSINK_KAMELET_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSSQSSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSQSSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSQSSINK_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSSQSSINK_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSQSSINK_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSSINK_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SINK_AWSSQSSINK_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AWSSQSSINK_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSSINK_KAMELET_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWSSQSSINK_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQSSINK_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWSSQSSINK_KAMELET_REGION_DOC);
         conf.define(CAMEL_SINK_AWSSQSSINK_KAMELET_AUTO_CREATE_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQSSINK_KAMELET_AUTO_CREATE_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSSINK_KAMELET_AUTO_CREATE_QUEUE_DOC);
         conf.define(CAMEL_SINK_AWSSQSSINK_KAMELET_AMAZON_AWSHOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQSSINK_KAMELET_AMAZON_AWSHOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSSINK_KAMELET_AMAZON_AWSHOST_DOC);
         conf.define(CAMEL_SINK_AWSSQSSINK_KAMELET_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQSSINK_KAMELET_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSSINK_KAMELET_PROTOCOL_DOC);
+        conf.define(CAMEL_SINK_AWSSQSSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQSSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSSINK_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        conf.define(CAMEL_SINK_AWSSQSSINK_KAMELET_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQSSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSSINK_KAMELET_URI_ENDPOINT_OVERRIDE_DOC);
+        conf.define(CAMEL_SINK_AWSSQSSINK_KAMELET_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQSSINK_KAMELET_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQSSINK_KAMELET_OVERRIDE_ENDPOINT_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-sqs-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-sink.kamelet.yaml b/connectors/camel-aws-sqs-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-sink.kamelet.yaml
index 8bd830cc8..792fb4bfe 100644
--- a/connectors/camel-aws-sqs-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-sink.kamelet.yaml
+++ b/connectors/camel-aws-sqs-sink-kafka-connector/src/main/resources/kamelets/aws-sqs-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-sqs-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS SQS"
@@ -31,11 +31,13 @@ spec:
   definition:
     title: AWS SQS Sink
     description: |-
-      Send message to an AWS SQS Queue
+      Send message to an AWS SQS Queue.
+
+      Access Key/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+      
+      When using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
     required:
       - queueNameOrArn
-      - accessKey
-      - secretKey
       - region
     type: object
     properties:
@@ -75,16 +77,35 @@ spec:
         title: AWS Host
         description: The hostname of the Amazon AWS cloud. 
         type: string
+        default: amazonaws.com
       protocol:
         title: Protocol
         description: The underlying protocol used to communicate with SQS
         type: string
         example: http or https
-        default: https  
+        default: https
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the SQS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+        - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwrite Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false    
   dependencies:
     - "camel:aws2-sqs"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: kamelet:source
       steps:
@@ -92,8 +113,11 @@ spec:
           uri: "aws2-sqs:{{queueNameOrArn}}"
           parameters:
             autoCreateQueue: "{{autoCreateQueue}}"
-            accessKey: "{{accessKey}}"
-            secretKey: "{{secretKey}}"
+            accessKey: "{{?accessKey}}"
+            secretKey: "{{?secretKey}}"
             region: "{{region}}"
             amazonAWSHost: "{{?amazonAWSHost}}"
-            protocol: "{{?protocol}}"
\ No newline at end of file
+            protocol: "{{?protocol}}"
+            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+            uriEndpointOverride: "{{?uriEndpointOverride}}"
+            overrideEndpoint: "{{overrideEndpoint}}"
\ No newline at end of file
diff --git a/connectors/camel-aws-sqs-source-kafka-connector/src/generated/resources/camel-aws-sqs-source-source.json b/connectors/camel-aws-sqs-source-kafka-connector/src/generated/resources/camel-aws-sqs-source-source.json
index 9ad13da09..6a9d88985 100644
--- a/connectors/camel-aws-sqs-source-kafka-connector/src/generated/resources/camel-aws-sqs-source-source.json
+++ b/connectors/camel-aws-sqs-source-kafka-connector/src/generated/resources/camel-aws-sqs-source-source.json
@@ -6,7 +6,7 @@
 		"id": "camel-aws-sqs-source-source",
 		"type": "source",
 		"version": "1.1.0-SNAPSHOT",
-		"description": "Receive data from AWS SQS."
+		"description": "Receive data from AWS SQS.\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
 	},
 	"properties": {
 		"camel.kamelet.aws-sqs-source.queueNameOrArn": {
@@ -25,14 +25,14 @@
 		"camel.kamelet.aws-sqs-source.accessKey": {
 			"name": "camel.kamelet.aws-sqs-source.accessKey",
 			"description": "The access key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sqs-source.secretKey": {
 			"name": "camel.kamelet.aws-sqs-source.secretKey",
 			"description": "The secret key obtained from AWS",
-			"priority": "HIGH",
-			"required": "true"
+			"priority": "MEDIUM",
+			"required": "false"
 		},
 		"camel.kamelet.aws-sqs-source.region": {
 			"name": "camel.kamelet.aws-sqs-source.region",
@@ -50,6 +50,7 @@
 		"camel.kamelet.aws-sqs-source.amazonAWSHost": {
 			"name": "camel.kamelet.aws-sqs-source.amazonAWSHost",
 			"description": "The hostname of the Amazon AWS cloud.",
+			"defaultValue": "\"amazonaws.com\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -59,6 +60,32 @@
 			"defaultValue": "\"https\"",
 			"priority": "MEDIUM",
 			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-source.queueURL": {
+			"name": "camel.kamelet.aws-sqs-source.queueURL",
+			"description": "The full SQS Queue URL (required if using KEDA)",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-source.useDefaultCredentialsProvider": {
+			"name": "camel.kamelet.aws-sqs-source.useDefaultCredentialsProvider",
+			"description": "Set whether the SQS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-source.uriEndpointOverride": {
+			"name": "camel.kamelet.aws-sqs-source.uriEndpointOverride",
+			"description": "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.aws-sqs-source.overrideEndpoint": {
+			"name": "camel.kamelet.aws-sqs-source.overrideEndpoint",
+			"description": "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
 		}
 	}
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-sqs-source-kafka-connector/src/main/docs/examples/CamelAwssqssourceSourceConnector.properties b/connectors/camel-aws-sqs-source-kafka-connector/src/main/docs/examples/CamelAwssqssourceSourceConnector.properties
index ac37d14fe..8bc7c9251 100644
--- a/connectors/camel-aws-sqs-source-kafka-connector/src/main/docs/examples/CamelAwssqssourceSourceConnector.properties
+++ b/connectors/camel-aws-sqs-source-kafka-connector/src/main/docs/examples/CamelAwssqssourceSourceConnector.properties
@@ -28,12 +28,7 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The access key obtained from AWS
-camel.kamelet.aws-sqs-source.accessKey=
 # The SQS Queue Name or ARN
 camel.kamelet.aws-sqs-source.queueNameOrArn=
 # The AWS region to connect to Example: eu-west-1
 camel.kamelet.aws-sqs-source.region=
-# The secret key obtained from AWS
-camel.kamelet.aws-sqs-source.secretKey=
-
diff --git a/connectors/camel-aws-sqs-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssource/CamelAwssqssourceSourceConnectorConfig.java b/connectors/camel-aws-sqs-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssource/CamelAwssqssourceSourceConnectorConfig.java
index 6e4ca08a8..d6dcf3540 100644
--- a/connectors/camel-aws-sqs-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssource/CamelAwssqssourceSourceConnectorConfig.java
+++ b/connectors/camel-aws-sqs-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssource/CamelAwssqssourceSourceConnectorConfig.java
@@ -46,10 +46,22 @@ public class CamelAwssqssourceSourceConnectorConfig
     public static final Boolean CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_AUTO_CREATE_QUEUE_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_AMAZON_AWSHOST_CONF = "camel.kamelet.aws-sqs-source.amazonAWSHost";
     public static final String CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_AMAZON_AWSHOST_DOC = "The hostname of the Amazon AWS cloud.";
-    public static final String CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_AMAZON_AWSHOST_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_AMAZON_AWSHOST_DEFAULT = "amazonaws.com";
     public static final String CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_PROTOCOL_CONF = "camel.kamelet.aws-sqs-source.protocol";
     public static final String CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_PROTOCOL_DOC = "The underlying protocol used to communicate with SQS Example: http or https";
     public static final String CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_PROTOCOL_DEFAULT = "https";
+    public static final String CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_QUEUE_URLCONF = "camel.kamelet.aws-sqs-source.queueURL";
+    public static final String CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_QUEUE_URLDOC = "The full SQS Queue URL (required if using KEDA)";
+    public static final String CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_QUEUE_URLDEFAULT = null;
+    public static final String CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.kamelet.aws-sqs-source.useDefaultCredentialsProvider";
+    public static final String CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SQS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_CONF = "camel.kamelet.aws-sqs-source.uriEndpointOverride";
+    public static final String CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.";
+    public static final String CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_OVERRIDE_ENDPOINT_CONF = "camel.kamelet.aws-sqs-source.overrideEndpoint";
+    public static final String CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_OVERRIDE_ENDPOINT_DOC = "Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.";
+    public static final Boolean CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_OVERRIDE_ENDPOINT_DEFAULT = false;
 
     public CamelAwssqssourceSourceConnectorConfig(
             ConfigDef config,
@@ -66,12 +78,16 @@ public class CamelAwssqssourceSourceConnectorConfig
         ConfigDef conf = new ConfigDef(CamelSourceConnectorConfig.conf());
         conf.define(CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_QUEUE_NAME_OR_ARN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_QUEUE_NAME_OR_ARN_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_QUEUE_NAME_OR_ARN_DOC);
         conf.define(CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_DELETE_AFTER_READ_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_DELETE_AFTER_READ_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_DELETE_AFTER_READ_DOC);
-        conf.define(CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_ACCESS_KEY_DOC);
-        conf.define(CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_SECRET_KEY_DOC);
+        conf.define(CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_ACCESS_KEY_DOC);
+        conf.define(CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_SECRET_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_SECRET_KEY_DOC);
         conf.define(CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_REGION_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_REGION_DOC);
         conf.define(CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_AUTO_CREATE_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_AUTO_CREATE_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_AUTO_CREATE_QUEUE_DOC);
         conf.define(CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_AMAZON_AWSHOST_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_AMAZON_AWSHOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_AMAZON_AWSHOST_DOC);
         conf.define(CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_PROTOCOL_DOC);
+        conf.define(CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_QUEUE_URLCONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_QUEUE_URLDEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_QUEUE_URLDOC);
+        conf.define(CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
+        conf.define(CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_URI_ENDPOINT_OVERRIDE_DOC);
+        conf.define(CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQSSOURCE_KAMELET_OVERRIDE_ENDPOINT_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-sqs-source-kafka-connector/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml b/connectors/camel-aws-sqs-source-kafka-connector/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml
index 6bb647750..5b4fa1f6d 100644
--- a/connectors/camel-aws-sqs-source-kafka-connector/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml
+++ b/connectors/camel-aws-sqs-source-kafka-connector/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml
@@ -21,10 +21,11 @@ metadata:
   name: aws-sqs-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS SQS"
+    camel.apache.org/keda.type: "aws-sqs-queue"
   labels:
     camel.apache.org/kamelet.type: "source"
 spec:
@@ -32,10 +33,12 @@ spec:
     title: "AWS SQS Source"
     description: |-
       Receive data from AWS SQS.
+
+      Access Key/Secret Key are the basic method for authenticating to the AWS SQS Service. These parameters are optional, because the Kamelet provide also the 'useDefaultCredentialsProvider'.
+      
+      When using a default Credentials Provider the SQS client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.
     required:
       - queueNameOrArn
-      - accessKey
-      - secretKey
       - region
     type: object
     properties:
@@ -58,6 +61,8 @@ spec:
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:password
         - urn:camel:group:credentials
+        - urn:keda:authentication:awsAccessKeyID
+        - urn:keda:required
       secretKey:
         title: Secret Key
         description: The secret key obtained from AWS
@@ -66,11 +71,16 @@ spec:
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:password
         - urn:camel:group:credentials
+        - urn:keda:authentication:awsSecretAccessKey
+        - urn:keda:required
       region:
         title: AWS Region
         description: The AWS region to connect to
         type: string
         example: eu-west-1
+        x-descriptors:
+        - urn:keda:metadata:awsRegion
+        - urn:keda:required
       autoCreateQueue:
         title: Autocreate Queue
         description: Setting the autocreation of the SQS queue. 
@@ -82,25 +92,54 @@ spec:
         title: AWS Host
         description: The hostname of the Amazon AWS cloud. 
         type: string
+        default: amazonaws.com
       protocol:
         title: Protocol
         description: The underlying protocol used to communicate with SQS
         type: string
         example: http or https
         default: https
+      queueURL:
+        title: Queue URL
+        description: The full SQS Queue URL (required if using KEDA)
+        type: string
+        x-descriptors:
+        - urn:keda:metadata:queueURL
+        - urn:keda:required
+      useDefaultCredentialsProvider:
+        title: Default Credentials Provider
+        description: Set whether the SQS client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.
+        type: boolean
+        x-descriptors:
+        - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwrite Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false    
   dependencies:
     - "camel:aws2-sqs"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: "aws2-sqs:{{queueNameOrArn}}"
       parameters:
         autoCreateQueue: "{{autoCreateQueue}}"
-        secretKey: "{{secretKey}}"
-        accessKey: "{{accessKey}}"
+        secretKey: "{{?secretKey}}"
+        accessKey: "{{?accessKey}}"
         region: "{{region}}"
         deleteAfterRead: "{{deleteAfterRead}}"
         amazonAWSHost: "{{?amazonAWSHost}}"
         protocol: "{{?protocol}}"
+        useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+        uriEndpointOverride: "{{?uriEndpointOverride}}"
+        overrideEndpoint: "{{overrideEndpoint}}"  
       steps:
       - to: "kamelet:sink"
\ No newline at end of file
diff --git a/connectors/camel-aws2-iam-kafka-connector/src/main/docs/examples/CamelAws2iamSinkConnector.properties b/connectors/camel-aws2-iam-kafka-connector/src/main/docs/examples/CamelAws2iamSinkConnector.properties
index 46557852c..1833f8f2a 100644
--- a/connectors/camel-aws2-iam-kafka-connector/src/main/docs/examples/CamelAws2iamSinkConnector.properties
+++ b/connectors/camel-aws2-iam-kafka-connector/src/main/docs/examples/CamelAws2iamSinkConnector.properties
@@ -30,4 +30,3 @@ topics=
 
 # Logical name
 camel.sink.path.label=
-
diff --git a/connectors/camel-aws2-kms-kafka-connector/src/main/docs/examples/CamelAws2kmsSinkConnector.properties b/connectors/camel-aws2-kms-kafka-connector/src/main/docs/examples/CamelAws2kmsSinkConnector.properties
index 628326861..872784c6f 100644
--- a/connectors/camel-aws2-kms-kafka-connector/src/main/docs/examples/CamelAws2kmsSinkConnector.properties
+++ b/connectors/camel-aws2-kms-kafka-connector/src/main/docs/examples/CamelAws2kmsSinkConnector.properties
@@ -34,4 +34,3 @@ camel.component.aws2-kms.operation=
 camel.sink.endpoint.operation=
 # Logical name
 camel.sink.path.label=
-
diff --git a/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/docs/examples/CamelAzurecosmosdbsourceSourceConnector.properties b/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/docs/examples/CamelAzurecosmosdbsourceSourceConnector.properties
index 466caeda3..ed32dd521 100644
--- a/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/docs/examples/CamelAzurecosmosdbsourceSourceConnector.properties
+++ b/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/docs/examples/CamelAzurecosmosdbsourceSourceConnector.properties
@@ -36,4 +36,3 @@ camel.kamelet.azure-cosmosdb-source.containerName=
 camel.kamelet.azure-cosmosdb-source.databaseEndpoint=
 # The Azure Cosmos database name.
 camel.kamelet.azure-cosmosdb-source.databaseName=
-
diff --git a/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/resources/kamelets/azure-cosmosdb-source.kamelet.yaml b/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/resources/kamelets/azure-cosmosdb-source.kamelet.yaml
index c5954f3e6..22a772a8c 100644
--- a/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/resources/kamelets/azure-cosmosdb-source.kamelet.yaml
+++ b/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/resources/kamelets/azure-cosmosdb-source.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: azure-cosmosdb-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxOCAxOCI+PGRlZnM+PHJhZGlhbEdyYWRpZW50IGlkPSJhIiBjeD0iLTEwNS4wMDYiIGN5PSItMTAuNDA5IiByPSI1Ljk1NCIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCgxLjAzNiAwIDAgMS4wMjcgMTE3LjczOSAxOS42NDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIuMTgzIiBzdG9wLWNvbG9yPSIjNWVhMGVmIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjMDA3OGQ0Ii8+PC9yYWRpYWxHcmFkaWVudD48Y2xpcFBhdG [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Azure CosmosDB"
@@ -88,7 +88,7 @@ spec:
     - "camel:azure-cosmosdb"
     - "camel:kamelet"
     - "camel:jackson"
-  flow:
+  template:
     from:
       uri: "azure-cosmosdb:{{databaseName}}/{{containerName}}"
       parameters:
diff --git a/connectors/camel-azure-eventhubs-sink-kafka-connector/pom.xml b/connectors/camel-azure-eventhubs-sink-kafka-connector/pom.xml
index 356ab43f7..ca42c278d 100644
--- a/connectors/camel-azure-eventhubs-sink-kafka-connector/pom.xml
+++ b/connectors/camel-azure-eventhubs-sink-kafka-connector/pom.xml
@@ -56,6 +56,10 @@
       <artifactId>jackson-dataformat-xml</artifactId>
       <version>2.11.3</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-azure-eventhubs</artifactId>
diff --git a/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/docs/examples/CamelAzureeventhubssinkSinkConnector.properties b/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/docs/examples/CamelAzureeventhubssinkSinkConnector.properties
index fbf7109a5..2313651c6 100644
--- a/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/docs/examples/CamelAzureeventhubssinkSinkConnector.properties
+++ b/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/docs/examples/CamelAzureeventhubssinkSinkConnector.properties
@@ -36,4 +36,3 @@ camel.kamelet.azure-eventhubs-sink.namespaceName=
 camel.kamelet.azure-eventhubs-sink.sharedAccessKey=
 # EventHubs SAS key name
 camel.kamelet.azure-eventhubs-sink.sharedAccessName=
-
diff --git a/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/resources/kamelets/azure-eventhubs-sink.kamelet.yaml b/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/resources/kamelets/azure-eventhubs-sink.kamelet.yaml
index b666ed17d..4d6035851 100644
--- a/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/resources/kamelets/azure-eventhubs-sink.kamelet.yaml
+++ b/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/resources/kamelets/azure-eventhubs-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: azure-eventhubs-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHZpZXdCb3g9Ii0uMDc1IC0uMTc0IDE1OC40IDE2My4xMDEiIHdpZHRoPSIyNDM5IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxnIGZpbGw9IiMwMDZmZDQiPjxwYXRoIGQ9Im02LjIyNS4wMjZoMTQ2LjZjMS4zIDAgMy0uMiA0LjEuNS45LjYuOCAxLjUuOCAyLjR2MzEuOGMwIC45LS4xIDEuOC0uOCAyLjQtLjguOC0xLjcuOC0yLjguOGgtMTQuMWMtMS4yIDAtMi40LS4xLTMuMi0xLS43LS44LS43LTEuOS0uNy0yLjl2LTEyLjVoLTExNHYxMi44YzAgMS0uMSAyLS44IDIuOC0uOC44LTEuOC44LTIuOC44aC0xNC44Yy [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Azure Eventhubs"
@@ -68,14 +68,15 @@ spec:
         - urn:alm:descriptor:com.tectonic.ui:password
         - urn:camel:group:credentials
   dependencies:
-  #TODO: these mvn:* dependencies must be removed after upgrading to camel 3.10
-  - "mvn:com.fasterxml.jackson.core:jackson-core:2.11.3"
-  - "mvn:com.fasterxml.jackson.core:jackson-annotations:2.11.3"
-  - "mvn:com.fasterxml.jackson.core:jackson-databind:2.11.3"
-  - "mvn:com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.11.3"
-  - "camel:azure-eventhubs"
-  - "camel:kamelet"
-  flow:
+    - "camel:core"
+    #TODO: these mvn:* dependencies must be removed after upgrading to camel 3.10
+    - "mvn:com.fasterxml.jackson.core:jackson-core:2.11.3"
+    - "mvn:com.fasterxml.jackson.core:jackson-annotations:2.11.3"
+    - "mvn:com.fasterxml.jackson.core:jackson-databind:2.11.3"
+    - "mvn:com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.11.3"
+    - "camel:azure-eventhubs"
+    - "camel:kamelet"
+  template:
     from:
       uri: "kamelet:source"
       steps:
diff --git a/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/docs/examples/CamelAzureeventhubssourceSourceConnector.properties b/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/docs/examples/CamelAzureeventhubssourceSourceConnector.properties
index 406a0e408..122da1244 100644
--- a/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/docs/examples/CamelAzureeventhubssourceSourceConnector.properties
+++ b/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/docs/examples/CamelAzureeventhubssourceSourceConnector.properties
@@ -42,4 +42,3 @@ camel.kamelet.azure-eventhubs-source.namespaceName=
 camel.kamelet.azure-eventhubs-source.sharedAccessKey=
 # EventHubs SAS key name
 camel.kamelet.azure-eventhubs-source.sharedAccessName=
-
diff --git a/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/resources/kamelets/azure-eventhubs-source.kamelet.yaml b/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/resources/kamelets/azure-eventhubs-source.kamelet.yaml
index a4861964b..bda5bc003 100644
--- a/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/resources/kamelets/azure-eventhubs-source.kamelet.yaml
+++ b/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/resources/kamelets/azure-eventhubs-source.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: azure-eventhubs-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHZpZXdCb3g9Ii0uMDc1IC0uMTc0IDE1OC40IDE2My4xMDEiIHdpZHRoPSIyNDM5IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxnIGZpbGw9IiMwMDZmZDQiPjxwYXRoIGQ9Im02LjIyNS4wMjZoMTQ2LjZjMS4zIDAgMy0uMiA0LjEuNS45LjYuOCAxLjUuOCAyLjR2MzEuOGMwIC45LS4xIDEuOC0uOCAyLjQtLjguOC0xLjcuOC0yLjguOGgtMTQuMWMtMS4yIDAtMi40LS4xLTMuMi0xLS43LS44LS43LTEuOS0uNy0yLjl2LTEyLjVoLTExNHYxMi44YzAgMS0uMSAyLS44IDIuOC0uOC44LTEuOC44LTIuOC44aC0xNC44Yy [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Azure Eventhubs"
@@ -92,7 +92,7 @@ spec:
   - "camel:azure-eventhubs"
   - "camel:kamelet"
   - "camel:jackson"
-  flow:
+  template:
     from:
       uri: 'azure-eventhubs://{{namespaceName}}/{{eventhubName}}'
       parameters:
diff --git a/connectors/camel-github-source-kafka-connector/pom.xml b/connectors/camel-azure-servicebus-sink-kafka-connector/pom.xml
similarity index 93%
copy from connectors/camel-github-source-kafka-connector/pom.xml
copy to connectors/camel-azure-servicebus-sink-kafka-connector/pom.xml
index 5b4ad74cd..e12d7e678 100644
--- a/connectors/camel-github-source-kafka-connector/pom.xml
+++ b/connectors/camel-azure-servicebus-sink-kafka-connector/pom.xml
@@ -24,9 +24,9 @@
     <artifactId>connectors</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>camel-github-source-kafka-connector</artifactId>
-  <name>Camel-Kafka-Connector :: github-source</name>
-  <description>Camel Kafka Connector for github-source</description>
+  <artifactId>camel-azure-servicebus-sink-kafka-connector</artifactId>
+  <name>Camel-Kafka-Connector :: azure-servicebus-sink</name>
+  <description>Camel Kafka Connector for azure-servicebus-sink</description>
   <dependencies>
     <!-- Kafka -->
     <dependency>
@@ -43,7 +43,7 @@
     <!--START OF GENERATED CODE-->
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jackson</artifactId>
+      <artifactId>camel-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
@@ -55,11 +55,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-github</artifactId>
+      <artifactId>camel-kamelet</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-kamelet</artifactId>
+      <artifactId>camel-azure-servicebus</artifactId>
     </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
diff --git a/connectors/camel-azure-servicebus-sink-kafka-connector/src/generated/descriptors/connector-sink.properties b/connectors/camel-azure-servicebus-sink-kafka-connector/src/generated/descriptors/connector-sink.properties
new file mode 100644
index 000000000..8e94151b5
--- /dev/null
+++ b/connectors/camel-azure-servicebus-sink-kafka-connector/src/generated/descriptors/connector-sink.properties
@@ -0,0 +1 @@
+camel-azure-servicebus-sink-sink
\ No newline at end of file
diff --git a/connectors/camel-azure-servicebus-sink-kafka-connector/src/generated/resources/camel-azure-servicebus-sink-sink.json b/connectors/camel-azure-servicebus-sink-kafka-connector/src/generated/resources/camel-azure-servicebus-sink-sink.json
new file mode 100644
index 000000000..20be54e31
--- /dev/null
+++ b/connectors/camel-azure-servicebus-sink-kafka-connector/src/generated/resources/camel-azure-servicebus-sink-sink.json
@@ -0,0 +1,25 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.azureservicebussink.CamelAzureservicebussinkSinkConnector",
+		"artifactId": "camel-azure-servicebus-sink-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-azure-servicebus-sink-sink",
+		"type": "sink",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Send Messages to Azure Servicebus."
+	},
+	"properties": {
+		"camel.kamelet.azure-servicebus-sink.topicOrQueueName": {
+			"name": "camel.kamelet.azure-servicebus-sink.topicOrQueueName",
+			"description": "Topic Or Queue Name for the Azure Servicebus instance",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.azure-servicebus-sink.connectionString": {
+			"name": "camel.kamelet.azure-servicebus-sink.connectionString",
+			"description": "Connection String for Azure Servicebus instance",
+			"priority": "HIGH",
+			"required": "true"
+		}
+	}
+}
diff --git a/connectors/camel-github-source-kafka-connector/src/main/assembly/package.xml b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/assembly/package.xml
similarity index 100%
copy from connectors/camel-github-source-kafka-connector/src/main/assembly/package.xml
copy to connectors/camel-azure-servicebus-sink-kafka-connector/src/main/assembly/package.xml
diff --git a/connectors/camel-aws2-iam-kafka-connector/src/main/docs/examples/CamelAws2iamSinkConnector.properties b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/docs/examples/CamelAzureservicebussinkSinkConnector.properties
similarity index 78%
copy from connectors/camel-aws2-iam-kafka-connector/src/main/docs/examples/CamelAws2iamSinkConnector.properties
copy to connectors/camel-azure-servicebus-sink-kafka-connector/src/main/docs/examples/CamelAzureservicebussinkSinkConnector.properties
index 46557852c..e7684a7e7 100644
--- a/connectors/camel-aws2-iam-kafka-connector/src/main/docs/examples/CamelAws2iamSinkConnector.properties
+++ b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/docs/examples/CamelAzureservicebussinkSinkConnector.properties
@@ -15,8 +15,8 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-name=CamelAws2-iamSinkConnector
-connector.class=org.apache.camel.kafkaconnector.aws2iam.CamelAws2iamSinkConnector
+name=CamelAzure-servicebus-sinkSinkConnector
+connector.class=org.apache.camel.kafkaconnector.azureservicebussink.CamelAzureservicebussinkSinkConnector
 tasks.max=1
 
 # use the kafka converters that better suit your needs, these are just defaults:
@@ -28,6 +28,7 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# Logical name
-camel.sink.path.label=
-
+# Connection String for Azure Servicebus instance
+camel.kamelet.azure-servicebus-sink.connectionString=
+# Topic Or Queue Name for the Azure Servicebus instance
+camel.kamelet.azure-servicebus-sink.topicOrQueueName=
diff --git a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceConnector.java b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussink/CamelAzureservicebussinkSinkConnector.java
similarity index 78%
copy from connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceConnector.java
copy to connectors/camel-azure-servicebus-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussink/CamelAzureservicebussinkSinkConnector.java
index d7c8a90e6..f05395b64 100644
--- a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceConnector.java
+++ b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussink/CamelAzureservicebussinkSinkConnector.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.kafkaconnector.githubsource;
+package org.apache.camel.kafkaconnector.azureservicebussink;
 
 import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnector;
 import org.apache.kafka.common.config.ConfigDef;
 import org.apache.kafka.connect.connector.Task;
 
 @Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGithubsourceSourceConnector extends CamelSourceConnector {
+public class CamelAzureservicebussinkSinkConnector extends CamelSinkConnector {
 
     @Override
     public ConfigDef config() {
-        return CamelGithubsourceSourceConnectorConfig.conf();
+        return CamelAzureservicebussinkSinkConnectorConfig.conf();
     }
     @Override
     public Class<? extends Task> taskClass() {
-        return CamelGithubsourceSourceTask.class;
+        return CamelAzureservicebussinkSinkTask.class;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussink/CamelAzureservicebussinkSinkConnectorConfig.java b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussink/CamelAzureservicebussinkSinkConnectorConfig.java
new file mode 100644
index 000000000..f4511e14b
--- /dev/null
+++ b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussink/CamelAzureservicebussinkSinkConnectorConfig.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.azureservicebussink;
+
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.kafka.common.config.ConfigDef;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelAzureservicebussinkSinkConnectorConfig
+        extends
+            CamelSinkConnectorConfig {
+
+    public static final String CAMEL_SINK_AZURESERVICEBUSSINK_KAMELET_TOPIC_OR_QUEUE_NAME_CONF = "camel.kamelet.azure-servicebus-sink.topicOrQueueName";
+    public static final String CAMEL_SINK_AZURESERVICEBUSSINK_KAMELET_TOPIC_OR_QUEUE_NAME_DOC = "Topic Or Queue Name for the Azure Servicebus instance";
+    public static final String CAMEL_SINK_AZURESERVICEBUSSINK_KAMELET_TOPIC_OR_QUEUE_NAME_DEFAULT = null;
+    public static final String CAMEL_SINK_AZURESERVICEBUSSINK_KAMELET_CONNECTION_STRING_CONF = "camel.kamelet.azure-servicebus-sink.connectionString";
+    public static final String CAMEL_SINK_AZURESERVICEBUSSINK_KAMELET_CONNECTION_STRING_DOC = "Connection String for Azure Servicebus instance";
+    public static final String CAMEL_SINK_AZURESERVICEBUSSINK_KAMELET_CONNECTION_STRING_DEFAULT = null;
+
+    public CamelAzureservicebussinkSinkConnectorConfig(
+            ConfigDef config,
+            Map<String, String> parsedConfig) {
+        super(config, parsedConfig);
+    }
+
+    public CamelAzureservicebussinkSinkConnectorConfig(
+            Map<String, String> parsedConfig) {
+        this(conf(), parsedConfig);
+    }
+
+    public static ConfigDef conf() {
+        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
+        conf.define(CAMEL_SINK_AZURESERVICEBUSSINK_KAMELET_TOPIC_OR_QUEUE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESERVICEBUSSINK_KAMELET_TOPIC_OR_QUEUE_NAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AZURESERVICEBUSSINK_KAMELET_TOPIC_OR_QUEUE_NAME_DOC);
+        conf.define(CAMEL_SINK_AZURESERVICEBUSSINK_KAMELET_CONNECTION_STRING_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_AZURESERVICEBUSSINK_KAMELET_CONNECTION_STRING_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AZURESERVICEBUSSINK_KAMELET_CONNECTION_STRING_DOC);
+        return conf;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceTask.java b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussink/CamelAzureservicebussinkSinkTask.java
similarity index 70%
copy from connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceTask.java
copy to connectors/camel-azure-servicebus-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussink/CamelAzureservicebussinkSinkTask.java
index 3e55aed5a..7755ab858 100644
--- a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceTask.java
+++ b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussink/CamelAzureservicebussinkSinkTask.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.kafkaconnector.githubsource;
+package org.apache.camel.kafkaconnector.azureservicebussink;
 
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.camel.kafkaconnector.CamelSinkTask;
 
 @Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGithubsourceSourceTask extends CamelSourceTask {
+public class CamelAzureservicebussinkSinkTask extends CamelSinkTask {
 
     @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
+    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
             Map<String, String> props) {
-        return new CamelGithubsourceSourceConnectorConfig(props);
+        return new CamelAzureservicebussinkSinkConnectorConfig(props);
     }
     @Override
-    protected String getSourceKamelet() {
-        return "kamelet:github-source";
+    protected String getSinkKamelet() {
+        return "kamelet:azure-servicebus-sink";
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
copy from connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/LICENSE.txt
copy to connectors/camel-azure-servicebus-sink-kafka-connector/src/main/resources/META-INF/LICENSE.txt
diff --git a/connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
copy from connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/NOTICE.txt
copy to connectors/camel-azure-servicebus-sink-kafka-connector/src/main/resources/META-INF/NOTICE.txt
diff --git a/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/resources/kamelets/azure-servicebus-sink.kamelet.yaml b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/resources/kamelets/azure-servicebus-sink.kamelet.yaml
new file mode 100644
index 000000000..d9d5f517c
--- /dev/null
+++ b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/resources/kamelets/azure-servicebus-sink.kamelet.yaml
@@ -0,0 +1,67 @@
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+apiVersion: camel.apache.org/v1alpha1
+kind: Kamelet
+metadata:
+  name: azure-servicebus-sink
+  annotations:
+    camel.apache.org/kamelet.support.level: "Preview"
+    camel.apache.org/catalog.version: "0.8.0"
+    camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgODEgODIiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI0EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9IkEiIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNMS4zMzMgMEMuNTMzIDAgMCAuNTMzIDAgMS4zMzN2MTZjMCAuOC41MzMgMS4zMz [...]
+    camel.apache.org/provider: "Apache Software Foundation"
+    camel.apache.org/kamelet.group: "Azure Servicebus"
+  labels:
+    camel.apache.org/kamelet.type: "sink"
+spec:
+  definition:
+    title: "Azure Servicebus Sink"
+    description: |-
+      Send Messages to Azure Servicebus.
+    required:
+      - topicOrQueueName
+      - connectionString
+    type: object
+    properties:
+      topicOrQueueName:
+        title: Topic Or Queue Name
+        description: Topic Or Queue Name for the Azure Servicebus instance
+        type: String
+      connectionString:
+        title: Connection String
+        description: Connection String for Azure Servicebus instance
+        type: string
+        format: password
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:password
+        - urn:camel:group:credentials
+  types:
+    in:
+      mediaType: application/octet-stream
+  dependencies:
+    - "camel:azure-servicebus"
+    - "camel:kamelet"
+    - "camel:core"
+  template:
+    from:
+      uri: kamelet:source
+      steps:
+      - to:
+          uri: "azure-servicebus:{{topicOrQueueName}}"
+          parameters:
+            connectionString: "{{connectionString}}"
+            producerOperation: "sendMessages"
\ No newline at end of file
diff --git a/connectors/camel-mongodb-sink-kafka-connector/pom.xml b/connectors/camel-azure-servicebus-source-kafka-connector/pom.xml
similarity index 93%
copy from connectors/camel-mongodb-sink-kafka-connector/pom.xml
copy to connectors/camel-azure-servicebus-source-kafka-connector/pom.xml
index 1d2af4be2..b487a55f5 100644
--- a/connectors/camel-mongodb-sink-kafka-connector/pom.xml
+++ b/connectors/camel-azure-servicebus-source-kafka-connector/pom.xml
@@ -24,9 +24,9 @@
     <artifactId>connectors</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>camel-mongodb-sink-kafka-connector</artifactId>
-  <name>Camel-Kafka-Connector :: mongodb-sink</name>
-  <description>Camel Kafka Connector for mongodb-sink</description>
+  <artifactId>camel-azure-servicebus-source-kafka-connector</artifactId>
+  <name>Camel-Kafka-Connector :: azure-servicebus-source</name>
+  <description>Camel Kafka Connector for azure-servicebus-source</description>
   <dependencies>
     <!-- Kafka -->
     <dependency>
@@ -43,11 +43,7 @@
     <!--START OF GENERATED CODE-->
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-mongodb</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jackson</artifactId>
+      <artifactId>camel-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
@@ -61,6 +57,10 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-azure-servicebus</artifactId>
+    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-azure-servicebus-source-kafka-connector/src/generated/descriptors/connector-source.properties b/connectors/camel-azure-servicebus-source-kafka-connector/src/generated/descriptors/connector-source.properties
new file mode 100644
index 000000000..43af81215
--- /dev/null
+++ b/connectors/camel-azure-servicebus-source-kafka-connector/src/generated/descriptors/connector-source.properties
@@ -0,0 +1 @@
+camel-azure-servicebus-source-source
\ No newline at end of file
diff --git a/connectors/camel-azure-servicebus-source-kafka-connector/src/generated/resources/camel-azure-servicebus-source-source.json b/connectors/camel-azure-servicebus-source-kafka-connector/src/generated/resources/camel-azure-servicebus-source-source.json
new file mode 100644
index 000000000..4bd12ab69
--- /dev/null
+++ b/connectors/camel-azure-servicebus-source-kafka-connector/src/generated/resources/camel-azure-servicebus-source-source.json
@@ -0,0 +1,38 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.azureservicebussource.CamelAzureservicebussourceSourceConnector",
+		"artifactId": "camel-azure-servicebus-source-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-azure-servicebus-source-source",
+		"type": "source",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Consume Messages from Azure Servicebus.\n\nThe subscribtion name parameter needs to be populated in case of consuming from a Topic."
+	},
+	"properties": {
+		"camel.kamelet.azure-servicebus-source.topicOrQueueName": {
+			"name": "camel.kamelet.azure-servicebus-source.topicOrQueueName",
+			"description": "Topic Or Queue Name for the Azure Servicebus instance",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.azure-servicebus-source.connectionString": {
+			"name": "camel.kamelet.azure-servicebus-source.connectionString",
+			"description": "Connection String for Azure Servicebus instance",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.azure-servicebus-source.serviceBusReceiveMode": {
+			"name": "camel.kamelet.azure-servicebus-source.serviceBusReceiveMode",
+			"description": "Sets the receive mode for the receiver, possible values are PEEK_LOCK and RECEIVE_AND_DELETE",
+			"defaultValue": "\"PEEK_LOCK\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.kamelet.azure-servicebus-source.subscriptionName": {
+			"name": "camel.kamelet.azure-servicebus-source.subscriptionName",
+			"description": "Sets the name of the subscription in the topic to listen to. This parameter is mandatory in case of topic.",
+			"priority": "MEDIUM",
+			"required": "false"
+		}
+	}
+}
diff --git a/connectors/camel-github-source-kafka-connector/src/main/assembly/package.xml b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/assembly/package.xml
similarity index 100%
copy from connectors/camel-github-source-kafka-connector/src/main/assembly/package.xml
copy to connectors/camel-azure-servicebus-source-kafka-connector/src/main/assembly/package.xml
diff --git a/connectors/camel-cxf-kafka-connector/src/main/docs/examples/CamelCxfSourceConnector.properties b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/docs/examples/CamelAzureservicebussourceSourceConnector.properties
similarity index 77%
copy from connectors/camel-cxf-kafka-connector/src/main/docs/examples/CamelCxfSourceConnector.properties
copy to connectors/camel-azure-servicebus-source-kafka-connector/src/main/docs/examples/CamelAzureservicebussourceSourceConnector.properties
index 71eb716d5..b96ddca95 100644
--- a/connectors/camel-cxf-kafka-connector/src/main/docs/examples/CamelCxfSourceConnector.properties
+++ b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/docs/examples/CamelAzureservicebussourceSourceConnector.properties
@@ -15,8 +15,8 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-name=CamelCxfSourceConnector
-connector.class=org.apache.camel.kafkaconnector.cxf.CamelCxfSourceConnector
+name=CamelAzure-servicebus-sourceSourceConnector
+connector.class=org.apache.camel.kafkaconnector.azureservicebussource.CamelAzureservicebussourceSourceConnector
 tasks.max=1
 
 # use the kafka converters that better suit your needs, these are just defaults:
@@ -28,4 +28,7 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-
+# Connection String for Azure Servicebus instance
+camel.kamelet.azure-servicebus-source.connectionString=
+# Topic Or Queue Name for the Azure Servicebus instance
+camel.kamelet.azure-servicebus-source.topicOrQueueName=
diff --git a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceConnector.java b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussource/CamelAzureservicebussourceSourceConnector.java
similarity index 80%
copy from connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceConnector.java
copy to connectors/camel-azure-servicebus-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussource/CamelAzureservicebussourceSourceConnector.java
index d7c8a90e6..3458d6aab 100644
--- a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceConnector.java
+++ b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussource/CamelAzureservicebussourceSourceConnector.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.kafkaconnector.githubsource;
+package org.apache.camel.kafkaconnector.azureservicebussource;
 
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
@@ -22,14 +22,16 @@ import org.apache.kafka.common.config.ConfigDef;
 import org.apache.kafka.connect.connector.Task;
 
 @Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGithubsourceSourceConnector extends CamelSourceConnector {
+public class CamelAzureservicebussourceSourceConnector
+        extends
+            CamelSourceConnector {
 
     @Override
     public ConfigDef config() {
-        return CamelGithubsourceSourceConnectorConfig.conf();
+        return CamelAzureservicebussourceSourceConnectorConfig.conf();
     }
     @Override
     public Class<? extends Task> taskClass() {
-        return CamelGithubsourceSourceTask.class;
+        return CamelAzureservicebussourceSourceTask.class;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-servicebus-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussource/CamelAzureservicebussourceSourceConnectorConfig.java b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussource/CamelAzureservicebussourceSourceConnectorConfig.java
new file mode 100644
index 000000000..e6f711734
--- /dev/null
+++ b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussource/CamelAzureservicebussourceSourceConnectorConfig.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.azureservicebussource;
+
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
+import org.apache.kafka.common.config.ConfigDef;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelAzureservicebussourceSourceConnectorConfig
+        extends
+            CamelSourceConnectorConfig {
+
+    public static final String CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_TOPIC_OR_QUEUE_NAME_CONF = "camel.kamelet.azure-servicebus-source.topicOrQueueName";
+    public static final String CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_TOPIC_OR_QUEUE_NAME_DOC = "Topic Or Queue Name for the Azure Servicebus instance";
+    public static final String CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_TOPIC_OR_QUEUE_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_CONNECTION_STRING_CONF = "camel.kamelet.azure-servicebus-source.connectionString";
+    public static final String CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_CONNECTION_STRING_DOC = "Connection String for Azure Servicebus instance";
+    public static final String CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_CONNECTION_STRING_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_SERVICE_BUS_RECEIVE_MODE_CONF = "camel.kamelet.azure-servicebus-source.serviceBusReceiveMode";
+    public static final String CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_SERVICE_BUS_RECEIVE_MODE_DOC = "Sets the receive mode for the receiver, possible values are PEEK_LOCK and RECEIVE_AND_DELETE";
+    public static final String CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_SERVICE_BUS_RECEIVE_MODE_DEFAULT = "PEEK_LOCK";
+    public static final String CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_SUBSCRIPTION_NAME_CONF = "camel.kamelet.azure-servicebus-source.subscriptionName";
+    public static final String CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_SUBSCRIPTION_NAME_DOC = "Sets the name of the subscription in the topic to listen to. This parameter is mandatory in case of topic.";
+    public static final String CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_SUBSCRIPTION_NAME_DEFAULT = null;
+
+    public CamelAzureservicebussourceSourceConnectorConfig(
+            ConfigDef config,
+            Map<String, String> parsedConfig) {
+        super(config, parsedConfig);
+    }
+
+    public CamelAzureservicebussourceSourceConnectorConfig(
+            Map<String, String> parsedConfig) {
+        this(conf(), parsedConfig);
+    }
+
+    public static ConfigDef conf() {
+        ConfigDef conf = new ConfigDef(CamelSourceConnectorConfig.conf());
+        conf.define(CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_TOPIC_OR_QUEUE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_TOPIC_OR_QUEUE_NAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_TOPIC_OR_QUEUE_NAME_DOC);
+        conf.define(CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_CONNECTION_STRING_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_CONNECTION_STRING_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_CONNECTION_STRING_DOC);
+        conf.define(CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_SERVICE_BUS_RECEIVE_MODE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_SERVICE_BUS_RECEIVE_MODE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_SERVICE_BUS_RECEIVE_MODE_DOC);
+        conf.define(CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_SUBSCRIPTION_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_SUBSCRIPTION_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESERVICEBUSSOURCE_KAMELET_SUBSCRIPTION_NAME_DOC);
+        return conf;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceTask.java b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussource/CamelAzureservicebussourceSourceTask.java
similarity index 83%
copy from connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceTask.java
copy to connectors/camel-azure-servicebus-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussource/CamelAzureservicebussourceSourceTask.java
index 3e55aed5a..a84a7de03 100644
--- a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceTask.java
+++ b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussource/CamelAzureservicebussourceSourceTask.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.kafkaconnector.githubsource;
+package org.apache.camel.kafkaconnector.azureservicebussource;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -23,15 +23,15 @@ import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 import org.apache.camel.kafkaconnector.CamelSourceTask;
 
 @Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGithubsourceSourceTask extends CamelSourceTask {
+public class CamelAzureservicebussourceSourceTask extends CamelSourceTask {
 
     @Override
     protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
             Map<String, String> props) {
-        return new CamelGithubsourceSourceConnectorConfig(props);
+        return new CamelAzureservicebussourceSourceConnectorConfig(props);
     }
     @Override
     protected String getSourceKamelet() {
-        return "kamelet:github-source";
+        return "kamelet:azure-servicebus-source";
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
copy from connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/LICENSE.txt
copy to connectors/camel-azure-servicebus-source-kafka-connector/src/main/resources/META-INF/LICENSE.txt
diff --git a/connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
copy from connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/NOTICE.txt
copy to connectors/camel-azure-servicebus-source-kafka-connector/src/main/resources/META-INF/NOTICE.txt
diff --git a/connectors/camel-azure-servicebus-source-kafka-connector/src/main/resources/kamelets/azure-servicebus-source.kamelet.yaml b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/resources/kamelets/azure-servicebus-source.kamelet.yaml
new file mode 100644
index 000000000..068db8a17
--- /dev/null
+++ b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/resources/kamelets/azure-servicebus-source.kamelet.yaml
@@ -0,0 +1,78 @@
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+apiVersion: camel.apache.org/v1alpha1
+kind: Kamelet
+metadata:
+  name: azure-servicebus-source
+  annotations:
+    camel.apache.org/kamelet.support.level: "Preview"
+    camel.apache.org/catalog.version: "0.8.0"
+    camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgODEgODIiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI0EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9IkEiIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNMS4zMzMgMEMuNTMzIDAgMCAuNTMzIDAgMS4zMzN2MTZjMCAuOC41MzMgMS4zMz [...]
+    camel.apache.org/provider: "Apache Software Foundation"
+    camel.apache.org/kamelet.group: "Azure Servicebus"
+  labels:
+    camel.apache.org/kamelet.type: "source"
+spec:
+  definition:
+    title: "Azure Servicebus Source"
+    description: |-
+      Consume Messages from Azure Servicebus.
+
+      The subscribtion name parameter needs to be populated in case of consuming from a Topic.
+    required:
+      - topicOrQueueName
+      - connectionString
+    type: object
+    properties:
+      topicOrQueueName:
+        title: Topic Or Queue Name
+        description: Topic Or Queue Name for the Azure Servicebus instance
+        type: String
+      connectionString:
+        title: Connection String
+        description: Connection String for Azure Servicebus instance
+        type: string
+        format: password
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:password
+        - urn:camel:group:credentials
+      serviceBusReceiveMode:
+        title: Servicebus Receive Mode
+        description: Sets the receive mode for the receiver, possible values are PEEK_LOCK and RECEIVE_AND_DELETE
+        type: String
+        default: PEEK_LOCK
+      subscriptionName:
+        title: Subscription Name
+        description: Sets the name of the subscription in the topic to listen to. This parameter is mandatory in case of topic.
+        type: String
+  types:
+    out:
+      mediaType: application/octet-stream
+  dependencies:
+    - "camel:azure-servicebus"
+    - "camel:kamelet"
+    - "camel:core"
+  template:
+    from:
+      uri: "azure-servicebus:{{topicOrQueueName}}"
+      parameters:
+        connectionString: "{{connectionString}}"
+        serviceBusReceiveMode: "{{serviceBusReceiveMode}}"
+        subscriptionName: "{{?subscriptionName}}"
+      steps:
+      - to: "kamelet:sink"
diff --git a/connectors/camel-wttrin-source-kafka-connector/pom.xml b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/pom.xml
similarity index 93%
copy from connectors/camel-wttrin-source-kafka-connector/pom.xml
copy to connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/pom.xml
index 8125af121..4c6d53f11 100644
--- a/connectors/camel-wttrin-source-kafka-connector/pom.xml
+++ b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/pom.xml
@@ -24,9 +24,9 @@
     <artifactId>connectors</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>camel-wttrin-source-kafka-connector</artifactId>
-  <name>Camel-Kafka-Connector :: wttrin-source</name>
-  <description>Camel Kafka Connector for wttrin-source</description>
+  <artifactId>camel-azure-storage-blob-changefeed-source-kafka-connector</artifactId>
+  <name>Camel-Kafka-Connector :: azure-storage-blob-changefeed-source</name>
+  <description>Camel Kafka Connector for azure-storage-blob-changefeed-source</description>
   <dependencies>
     <!-- Kafka -->
     <dependency>
@@ -43,7 +43,7 @@
     <!--START OF GENERATED CODE-->
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jackson</artifactId>
+      <artifactId>camel-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
@@ -55,19 +55,19 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jsonpath</artifactId>
+      <artifactId>camel-azure-storage-blob</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-yaml-dsl</artifactId>
+      <artifactId>camel-jsonpath</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-kamelet</artifactId>
+      <artifactId>camel-yaml-dsl</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-http</artifactId>
+      <artifactId>camel-kamelet</artifactId>
     </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
diff --git a/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/generated/descriptors/connector-source.properties b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/generated/descriptors/connector-source.properties
new file mode 100644
index 000000000..74a5fe2a8
--- /dev/null
+++ b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/generated/descriptors/connector-source.properties
@@ -0,0 +1 @@
+camel-azure-storage-blob-changefeed-source-source
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/generated/resources/camel-azure-storage-blob-changefeed-source-source.json b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/generated/resources/camel-azure-storage-blob-changefeed-source-source.json
new file mode 100644
index 000000000..b6126744b
--- /dev/null
+++ b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/generated/resources/camel-azure-storage-blob-changefeed-source-source.json
@@ -0,0 +1,32 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.azurestorageblobchangefeedsource.CamelAzurestorageblobchangefeedsourceSourceConnector",
+		"artifactId": "camel-azure-storage-blob-changefeed-source-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-azure-storage-blob-changefeed-source-source",
+		"type": "source",
+		"version": "1.1.0-SNAPSHOT",
+		"description": "Consume Events from Azure Storage Blob Change feed."
+	},
+	"properties": {
+		"camel.kamelet.azure-storage-blob-changefeed-source.period": {
+			"name": "camel.kamelet.azure-storage-blob-changefeed-source.period",
+			"description": "The interval between fetches to the Azure Storage Changefeed in milliseconds",
+			"defaultValue": "10000",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.azure-storage-blob-changefeed-source.accountName": {
+			"name": "camel.kamelet.azure-storage-blob-changefeed-source.accountName",
+			"description": "The Azure Storage Blob account name.",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.kamelet.azure-storage-blob-changefeed-source.accessKey": {
+			"name": "camel.kamelet.azure-storage-blob-changefeed-source.accessKey",
+			"description": "The Azure Storage Blob access Key.",
+			"priority": "HIGH",
+			"required": "true"
+		}
+	}
+}
diff --git a/connectors/camel-github-source-kafka-connector/src/main/assembly/package.xml b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/assembly/package.xml
similarity index 100%
copy from connectors/camel-github-source-kafka-connector/src/main/assembly/package.xml
copy to connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/assembly/package.xml
diff --git a/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/docs/examples/CamelAzurestorageblobsourceSourceConnector.properties b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/docs/examples/CamelAzurestorageblobchangefeedsourceSourceConnector.properties
similarity index 77%
copy from connectors/camel-azure-storage-blob-source-kafka-connector/src/main/docs/examples/CamelAzurestorageblobsourceSourceConnector.properties
copy to connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/docs/examples/CamelAzurestorageblobchangefeedsourceSourceConnector.properties
index 5271a4de5..9c0c791cc 100644
--- a/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/docs/examples/CamelAzurestorageblobsourceSourceConnector.properties
+++ b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/docs/examples/CamelAzurestorageblobchangefeedsourceSourceConnector.properties
@@ -15,8 +15,8 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-name=CamelAzure-storage-blob-sourceSourceConnector
-connector.class=org.apache.camel.kafkaconnector.azurestorageblobsource.CamelAzurestorageblobsourceSourceConnector
+name=CamelAzure-storage-blob-changefeed-sourceSourceConnector
+connector.class=org.apache.camel.kafkaconnector.azurestorageblobchangefeedsource.CamelAzurestorageblobchangefeedsourceSourceConnector
 tasks.max=1
 
 # use the kafka converters that better suit your needs, these are just defaults:
@@ -29,11 +29,8 @@ topics=
 # mandatory properties (for a complete properties list see the connector documentation):
 
 # The Azure Storage Blob access Key.
-camel.kamelet.azure-storage-blob-source.accessKey=
+camel.kamelet.azure-storage-blob-changefeed-source.accessKey=
 # The Azure Storage Blob account name.
-camel.kamelet.azure-storage-blob-source.accountName=
-# The Azure Storage Blob container name.
-camel.kamelet.azure-storage-blob-source.containerName=
-# The interval between fetches to the Azure Storage Container in milliseconds
-camel.kamelet.azure-storage-blob-source.period=
-
+camel.kamelet.azure-storage-blob-changefeed-source.accountName=
+# The interval between fetches to the Azure Storage Changefeed in milliseconds
+camel.kamelet.azure-storage-blob-changefeed-source.period=
diff --git a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceConnector.java b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobchangefeedsource/CamelAzurestorageblobchangefeedsourceSourceConnector.java
similarity index 78%
copy from connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceConnector.java
copy to connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobchangefeedsource/CamelAzurestorageblobchangefeedsourceSourceConnector.java
index d7c8a90e6..7fa62cbc0 100644
--- a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceConnector.java
+++ b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobchangefeedsource/CamelAzurestorageblobchangefeedsourceSourceConnector.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.kafkaconnector.githubsource;
+package org.apache.camel.kafkaconnector.azurestorageblobchangefeedsource;
 
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
@@ -22,14 +22,16 @@ import org.apache.kafka.common.config.ConfigDef;
 import org.apache.kafka.connect.connector.Task;
 
 @Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGithubsourceSourceConnector extends CamelSourceConnector {
+public class CamelAzurestorageblobchangefeedsourceSourceConnector
+        extends
+            CamelSourceConnector {
 
     @Override
     public ConfigDef config() {
-        return CamelGithubsourceSourceConnectorConfig.conf();
+        return CamelAzurestorageblobchangefeedsourceSourceConnectorConfig.conf();
     }
     @Override
     public Class<? extends Task> taskClass() {
-        return CamelGithubsourceSourceTask.class;
+        return CamelAzurestorageblobchangefeedsourceSourceTask.class;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobchangefeedsource/CamelAzurestorageblobchangefeedsourceSourceConnectorConfig.java b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobchangefeedsource/CamelAzurestorageblobchangefeedsourceSourceConnectorConfig.java
new file mode 100644
index 000000000..89a8dd6fd
--- /dev/null
+++ b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobchangefeedsource/CamelAzurestorageblobchangefeedsourceSourceConnectorConfig.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.azurestorageblobchangefeedsource;
+
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
+import org.apache.kafka.common.config.ConfigDef;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelAzurestorageblobchangefeedsourceSourceConnectorConfig
+        extends
+            CamelSourceConnectorConfig {
+
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOBCHANGEFEEDSOURCE_KAMELET_PERIOD_CONF = "camel.kamelet.azure-storage-blob-changefeed-source.period";
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOBCHANGEFEEDSOURCE_KAMELET_PERIOD_DOC = "The interval between fetches to the Azure Storage Changefeed in milliseconds";
+    public static final Integer CAMEL_SOURCE_AZURESTORAGEBLOBCHANGEFEEDSOURCE_KAMELET_PERIOD_DEFAULT = 10000;
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOBCHANGEFEEDSOURCE_KAMELET_ACCOUNT_NAME_CONF = "camel.kamelet.azure-storage-blob-changefeed-source.accountName";
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOBCHANGEFEEDSOURCE_KAMELET_ACCOUNT_NAME_DOC = "The Azure Storage Blob account name.";
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOBCHANGEFEEDSOURCE_KAMELET_ACCOUNT_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOBCHANGEFEEDSOURCE_KAMELET_ACCESS_KEY_CONF = "camel.kamelet.azure-storage-blob-changefeed-source.accessKey";
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOBCHANGEFEEDSOURCE_KAMELET_ACCESS_KEY_DOC = "The Azure Storage Blob access Key.";
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOBCHANGEFEEDSOURCE_KAMELET_ACCESS_KEY_DEFAULT = null;
+
+    public CamelAzurestorageblobchangefeedsourceSourceConnectorConfig(
+            ConfigDef config,
+            Map<String, String> parsedConfig) {
+        super(config, parsedConfig);
+    }
+
+    public CamelAzurestorageblobchangefeedsourceSourceConnectorConfig(
+            Map<String, String> parsedConfig) {
+        this(conf(), parsedConfig);
+    }
+
+    public static ConfigDef conf() {
+        ConfigDef conf = new ConfigDef(CamelSourceConnectorConfig.conf());
+        conf.define(CAMEL_SOURCE_AZURESTORAGEBLOBCHANGEFEEDSOURCE_KAMELET_PERIOD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AZURESTORAGEBLOBCHANGEFEEDSOURCE_KAMELET_PERIOD_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AZURESTORAGEBLOBCHANGEFEEDSOURCE_KAMELET_PERIOD_DOC);
+        conf.define(CAMEL_SOURCE_AZURESTORAGEBLOBCHANGEFEEDSOURCE_KAMELET_ACCOUNT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOBCHANGEFEEDSOURCE_KAMELET_ACCOUNT_NAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AZURESTORAGEBLOBCHANGEFEEDSOURCE_KAMELET_ACCOUNT_NAME_DOC);
+        conf.define(CAMEL_SOURCE_AZURESTORAGEBLOBCHANGEFEEDSOURCE_KAMELET_ACCESS_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SOURCE_AZURESTORAGEBLOBCHANGEFEEDSOURCE_KAMELET_ACCESS_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AZURESTORAGEBLOBCHANGEFEEDSOURCE_KAMELET_ACCESS_KEY_DOC);
+        return conf;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceTask.java b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobchangefeedsource/CamelAzurestorageblobchangefeedsourceSourceTask.java
similarity index 80%
copy from connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceTask.java
copy to connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobchangefeedsource/CamelAzurestorageblobchangefeedsourceSourceTask.java
index 3e55aed5a..c3ce2a682 100644
--- a/connectors/camel-github-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/githubsource/CamelGithubsourceSourceTask.java
+++ b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobchangefeedsource/CamelAzurestorageblobchangefeedsourceSourceTask.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.kafkaconnector.githubsource;
+package org.apache.camel.kafkaconnector.azurestorageblobchangefeedsource;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -23,15 +23,17 @@ import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 import org.apache.camel.kafkaconnector.CamelSourceTask;
 
 @Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGithubsourceSourceTask extends CamelSourceTask {
+public class CamelAzurestorageblobchangefeedsourceSourceTask
+        extends
+            CamelSourceTask {
 
     @Override
     protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
             Map<String, String> props) {
-        return new CamelGithubsourceSourceConnectorConfig(props);
+        return new CamelAzurestorageblobchangefeedsourceSourceConnectorConfig(props);
     }
     @Override
     protected String getSourceKamelet() {
-        return "kamelet:github-source";
+        return "kamelet:azure-storage-blob-changefeed-source";
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
copy from connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/LICENSE.txt
copy to connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/resources/META-INF/LICENSE.txt
diff --git a/connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
copy from connectors/camel-github-source-kafka-connector/src/main/resources/META-INF/NOTICE.txt
copy to connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/resources/META-INF/NOTICE.txt
diff --git a/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-changefeed-source.kamelet.yaml
similarity index 81%
copy from connectors/camel-azure-storage-blob-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml
copy to connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-changefeed-source.kamelet.yaml
index 6768f26b9..710f0fa25 100644
--- a/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml
+++ b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-changefeed-source.kamelet.yaml
@@ -18,30 +18,29 @@
 apiVersion: camel.apache.org/v1alpha1
 kind: Kamelet
 metadata:
-  name: azure-storage-blob-source
+  name: azure-storage-blob-changefeed-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgOTEgODEiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI0EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9IkEiIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNNjcuNTU4IDBIMjIuNDQxTDAgNDBsMjIuNDQxIDQwaDQ1LjExN0w5MCA0MCA2Ny [...]
     camel.apache.org/provider: "Apache Software Foundation"
-    camel.apache.org/kamelet.group: "Azure Storage Blob"
+    camel.apache.org/kamelet.group: "Azure Storage Blob Changefeed"
   labels:
     camel.apache.org/kamelet.type: "source"
 spec:
   definition:
-    title: "Azure Storage Blob Source"
+    title: "Azure Storage Blob Changefeed Source"
     description: |-
-      Consume Files from Azure Storage Blob.
+      Consume Events from Azure Storage Blob Change feed.
     required:
       - period
       - accountName
-      - containerName
       - accessKey
     type: object
     properties:
       period:
         title: Period between Polls
-        description: The interval between fetches to the Azure Storage Container in milliseconds
+        description: The interval between fetches to the Azure Storage Changefeed in milliseconds
         type: integer
         default: 10000
       accountName:
@@ -50,10 +49,6 @@ spec:
         type: string
         x-descriptors:
         - urn:camel:group:credentials
-      containerName:
-        title: Container Name
-        description: The Azure Storage Blob container name.
-        type: string
       accessKey:
         title: Access Key
         description: The Azure Storage Blob access Key.
@@ -68,37 +63,15 @@ spec:
     - "camel:core"
     - "camel:jsonpath"
     - "camel:timer"
-  flow:
+  template:
     from:
       uri: "timer:azure-storage-blob-stream"
       parameters:
         period: "{{period}}"
       steps:
       - to:
-          uri: "azure-storage-blob:{{accountName}}/{{containerName}}"
+          uri: "azure-storage-blob:{{accountName}}"
           parameters:
-            operation: "listBlobs"
+            operation: "getChangeFeed"
             accessKey: "{{accessKey}}"
-      - split:
-          jsonpath: "$.*"
-          steps:
-          - set-property:
-              name: azureBlobName
-              simple: ${body.name}
-          - set-header:
-              name: CamelAzureStorageBlobBlobName
-              simple: ${exchangeProperty.azureBlobName}
-          - to:
-              uri: "azure-storage-blob:{{accountName}}/{{containerName}}"
-              parameters:
-                operation: "getBlob"
-                accessKey: "{{accessKey}}"
-          - to: "kamelet:sink"
-          - set-header:
-              name: CamelAzureStorageBlobBlobName
-              simple: ${exchangeProperty.azureBlobName}
-          - to:
-              uri: "azure-storage-blob:{{accountName}}/{{containerName}}"
-              parameters:
-                operation: "deleteBlob"
-                accessKey: "{{accessKey}}"
\ No newline at end of file
+      - to: "kamelet:sink"
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-blob-sink-kafka-connector/pom.xml b/connectors/camel-azure-storage-blob-sink-kafka-connector/pom.xml
index b71126daa..670b02bc7 100644
--- a/connectors/camel-azure-storage-blob-sink-kafka-connector/pom.xml
+++ b/connectors/camel-azure-storage-blob-sink-kafka-connector/pom.xml
@@ -41,6 +41,10 @@
     </dependency>
     <!-- Camel -->
     <!--START OF GENERATED CODE-->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
diff --git a/connectors/camel-azure-storage-blob-sink-kafka-connector/src/main/docs/examples/CamelAzurestorageblobsinkSinkConnector.properties b/connectors/camel-azure-storage-blob-sink-kafka-connector/src/main/docs/examples/CamelAzurestorageblobsinkSinkConnector.properties
index 1ff6737f3..34569f38b 100644
--- a/connectors/camel-azure-storage-blob-sink-kafka-connector/src/main/docs/examples/CamelAzurestorageblobsinkSinkConnector.properties
+++ b/connectors/camel-azure-storage-blob-sink-kafka-connector/src/main/docs/examples/CamelAzurestorageblobsinkSinkConnector.properties
@@ -34,4 +34,3 @@ camel.kamelet.azure-storage-blob-sink.accessKey=
 camel.kamelet.azure-storage-blob-sink.accountName=
 # The Azure Storage Blob container name.
 camel.kamelet.azure-storage-blob-sink.containerName=
-
diff --git a/connectors/camel-azure-storage-blob-sink-kafka-connector/src/main/resources/kamelets/azure-storage-blob-sink.kamelet.yaml b/connectors/camel-azure-storage-blob-sink-kafka-connector/src/main/resources/kamelets/azure-storage-blob-sink.kamelet.yaml
index 3cb2544a1..e4ed5a873 100644
--- a/connectors/camel-azure-storage-blob-sink-kafka-connector/src/main/resources/kamelets/azure-storage-blob-sink.kamelet.yaml
+++ b/connectors/camel-azure-storage-blob-sink-kafka-connector/src/main/resources/kamelets/azure-storage-blob-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: azure-storage-blob-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgOTEgODEiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI0EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9IkEiIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNNjcuNTU4IDBIMjIuNDQxTDAgNDBsMjIuNDQxIDQwaDQ1LjExN0w5MCA0MCA2Ny [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Azure Storage Blob"
@@ -68,9 +68,10 @@ spec:
         type: string
         default: uploadBlockBlob
   dependencies:
-  - "camel:azure-storage-blob"
-  - "camel:kamelet"
-  flow:
+    - "camel:core"
+    - "camel:azure-storage-blob"
+    - "camel:kamelet"
+  template:
     from:
       uri: "kamelet:source"
       steps:
diff --git a/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/docs/examples/CamelAzurestorageblobsourceSourceConnector.properties b/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/docs/examples/CamelAzurestorageblobsourceSourceConnector.properties
index 5271a4de5..5eb925567 100644
--- a/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/docs/examples/CamelAzurestorageblobsourceSourceConnector.properties
+++ b/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/docs/examples/CamelAzurestorageblobsourceSourceConnector.properties
@@ -36,4 +36,3 @@ camel.kamelet.azure-storage-blob-source.accountName=
 camel.kamelet.azure-storage-blob-source.containerName=
 # The interval between fetches to the Azure Storage Container in milliseconds
 camel.kamelet.azure-storage-blob-source.period=
-
diff --git a/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml b/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml
index 6768f26b9..2f2589d27 100644
--- a/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml
+++ b/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: azure-storage-blob-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgOTEgODEiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI0EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9IkEiIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNNjcuNTU4IDBIMjIuNDQxTDAgNDBsMjIuNDQxIDQwaDQ1LjExN0w5MCA0MCA2Ny [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Azure Storage Blob"
@@ -68,7 +68,7 @@ spec:
     - "camel:core"
     - "camel:jsonpath"
     - "camel:timer"
-  flow:
+  template:
     from:
       uri: "timer:azure-storage-blob-stream"
       parameters:
diff --git a/connectors/camel-azure-storage-queue-sink-kafka-connector/pom.xml b/connectors/camel-azure-storage-queue-sink-kafka-connector/pom.xml
index 6c6d6c1f7..0995949ab 100644
--- a/connectors/camel-azure-storage-queue-sink-kafka-connector/pom.xml
+++ b/connectors/camel-azure-storage-queue-sink-kafka-connector/pom.xml
@@ -45,6 +45,10 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-azure-storage-queue</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
diff --git a/connectors/camel-azure-storage-queue-sink-kafka-connector/src/main/docs/examples/CamelAzurestoragequeuesinkSinkConnector.properties b/connectors/camel-azure-storage-queue-sink-kafka-connector/src/main/docs/examples/CamelAzurestoragequeuesinkSinkConnector.properties
index 55b3ab4c9..c0a39ffeb 100644
--- a/connectors/camel-azure-storage-queue-sink-kafka-connector/src/main/docs/examples/CamelAzurestoragequeuesinkSinkConnector.properties
+++ b/connectors/camel-azure-storage-queue-sink-kafka-connector/src/main/docs/examples/CamelAzurestoragequeuesinkSinkConnector.properties
@@ -34,4 +34,3 @@ camel.kamelet.azure-storage-queue-sink.accessKey=
 camel.kamelet.azure-storage-queue-sink.accountName=
 # The Azure Storage Queue container name.
 camel.kamelet.azure-storage-queue-sink.queueName=
-
diff --git a/connectors/camel-azure-storage-queue-sink-kafka-connector/src/main/resources/kamelets/azure-storage-queue-sink.kamelet.yaml b/connectors/camel-azure-storage-queue-sink-kafka-connector/src/main/resources/kamelets/azure-storage-queue-sink.kamelet.yaml
index 5cc8f9c1f..f879af896 100644
--- a/connectors/camel-azure-storage-queue-sink-kafka-connector/src/main/resources/kamelets/azure-storage-queue-sink.kamelet.yaml
+++ b/connectors/camel-azure-storage-queue-sink-kafka-connector/src/main/resources/kamelets/azure-storage-queue-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: azure-storage-queue-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgOTEgODEiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI0EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9IkEiIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNNzAuMDUzIDM0LjYzNEg1MC41OGw5LjczNiA3LjgwNXptLTM5LjQyIDEwLjQ4OG [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Azure Storage Queue"
@@ -65,9 +65,10 @@ spec:
         - urn:alm:descriptor:com.tectonic.ui:password
         - urn:camel:group:credentials
   dependencies:
+    - "camel:core"
     - "camel:azure-storage-queue"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: "kamelet:source"
       steps:
diff --git a/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/docs/examples/CamelAzurestoragequeuesourceSourceConnector.properties b/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/docs/examples/CamelAzurestoragequeuesourceSourceConnector.properties
index e6eae82f6..dc49d4ed4 100644
--- a/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/docs/examples/CamelAzurestoragequeuesourceSourceConnector.properties
+++ b/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/docs/examples/CamelAzurestoragequeuesourceSourceConnector.properties
@@ -34,4 +34,3 @@ camel.kamelet.azure-storage-queue-source.accessKey=
 camel.kamelet.azure-storage-queue-source.accountName=
 # The Azure Storage Queue container name.
 camel.kamelet.azure-storage-queue-source.queueName=
-
diff --git a/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/resources/kamelets/azure-storage-queue-source.kamelet.yaml b/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/resources/kamelets/azure-storage-queue-source.kamelet.yaml
index d3f299d92..1a10d8d1e 100644
--- a/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/resources/kamelets/azure-storage-queue-source.kamelet.yaml
+++ b/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/resources/kamelets/azure-storage-queue-source.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: azure-storage-queue-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgOTEgODEiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI0EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9IkEiIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNNzAuMDUzIDM0LjYzNEg1MC41OGw5LjczNiA3LjgwNXptLTM5LjQyIDEwLjQ4OG [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Azure Storage Queue"
@@ -64,7 +64,7 @@ spec:
   dependencies:
     - "camel:azure-storage-queue"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: "azure-storage-queue://{{accountName}}/{{queueName}}"
       parameters:
diff --git a/connectors/camel-bitcoin-source-kafka-connector/src/main/docs/examples/CamelBitcoinsourceSourceConnector.properties b/connectors/camel-bitcoin-source-kafka-connector/src/main/docs/examples/CamelBitcoinsourceSourceConnector.properties
index ec738f482..0c9aa3dcd 100644
--- a/connectors/camel-bitcoin-source-kafka-connector/src/main/docs/examples/CamelBitcoinsourceSourceConnector.properties
+++ b/connectors/camel-bitcoin-source-kafka-connector/src/main/docs/examples/CamelBitcoinsourceSourceConnector.properties
@@ -28,4 +28,3 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-
diff --git a/connectors/camel-bitcoin-source-kafka-connector/src/main/resources/kamelets/bitcoin-source.kamelet.yaml b/connectors/camel-bitcoin-source-kafka-connector/src/main/resources/kamelets/bitcoin-source.kamelet.yaml
index 1212ba1c6..d073010da 100644
--- a/connectors/camel-bitcoin-source-kafka-connector/src/main/resources/kamelets/bitcoin-source.kamelet.yaml
+++ b/connectors/camel-bitcoin-source-kafka-connector/src/main/resources/kamelets/bitcoin-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: bitcoin-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PCEtLSBDcmVhdGVkIHdpdGggSW5rc2NhcGUgKGh0dHA6Ly93d3cuaW5rc2NhcGUub3JnLykgLS0+CjxzdmcgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iNjQiIHdpZHRoPSI2NCIgdmVyc2lvbj0iMS4xIiB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iPgo8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLjAwNjMwODc2LC0wLjAwMzAxOT [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Bitcoin"
@@ -73,7 +73,7 @@ spec:
     - "camel:kamelet"
     - "camel:jackson"
     - "camel:timer"
-  flow:
+  template:
     from:
       uri: "timer:update"
       parameters:
diff --git a/connectors/camel-cassandra-sink-kafka-connector/src/generated/resources/camel-cassandra-sink-sink.json b/connectors/camel-cassandra-sink-kafka-connector/src/generated/resources/camel-cassandra-sink-sink.json
index f17127cca..76b06db7c 100644
--- a/connectors/camel-cassandra-sink-kafka-connector/src/generated/resources/camel-cassandra-sink-sink.json
+++ b/connectors/camel-cassandra-sink-kafka-connector/src/generated/resources/camel-cassandra-sink-sink.json
@@ -46,8 +46,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.kamelet.cassandra-sink.preparedStatement": {
-			"name": "camel.kamelet.cassandra-sink.preparedStatement",
+		"camel.kamelet.cassandra-sink.prepareStatements": {
+			"name": "camel.kamelet.cassandra-sink.prepareStatements",
 			"description": "Whether to use PreparedStatements or regular Statements as the query.",
 			"defaultValue": "true",
 			"priority": "MEDIUM",
diff --git a/connectors/camel-cassandra-sink-kafka-connector/src/main/docs/examples/CamelCassandrasinkSinkConnector.properties b/connectors/camel-cassandra-sink-kafka-connector/src/main/docs/examples/CamelCassandrasinkSinkConnector.properties
index 7d4b5ff0f..d90d31520 100644
--- a/connectors/camel-cassandra-sink-kafka-connector/src/main/docs/examples/CamelCassandrasinkSinkConnector.properties
+++ b/connectors/camel-cassandra-sink-kafka-connector/src/main/docs/examples/CamelCassandrasinkSinkConnector.properties
@@ -36,4 +36,3 @@ camel.kamelet.cassandra-sink.connectionPort=
 camel.kamelet.cassandra-sink.keyspace=
 # The query to execute against the Cassandra cluster table
 camel.kamelet.cassandra-sink.query=
-
diff --git a/connectors/camel-cassandra-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasink/CamelCassandrasinkSinkConnectorConfig.java b/connectors/camel-cassandra-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasink/CamelCassandrasinkSinkConnectorConfig.java
index 8bc5d17cc..429d4cab8 100644
--- a/connectors/camel-cassandra-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasink/CamelCassandrasinkSinkConnectorConfig.java
+++ b/connectors/camel-cassandra-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasink/CamelCassandrasinkSinkConnectorConfig.java
@@ -44,9 +44,9 @@ public class CamelCassandrasinkSinkConnectorConfig
     public static final String CAMEL_SINK_CASSANDRASINK_KAMELET_CONSISTENCY_LEVEL_CONF = "camel.kamelet.cassandra-sink.consistencyLevel";
     public static final String CAMEL_SINK_CASSANDRASINK_KAMELET_CONSISTENCY_LEVEL_DOC = "Consistency level to use. The value can be one of ANY, ONE, TWO, THREE, QUORUM, ALL, LOCAL_QUORUM, EACH_QUORUM, SERIAL, LOCAL_SERIAL, LOCAL_ONE";
     public static final String CAMEL_SINK_CASSANDRASINK_KAMELET_CONSISTENCY_LEVEL_DEFAULT = "ANY";
-    public static final String CAMEL_SINK_CASSANDRASINK_KAMELET_PREPARED_STATEMENT_CONF = "camel.kamelet.cassandra-sink.preparedStatement";
-    public static final String CAMEL_SINK_CASSANDRASINK_KAMELET_PREPARED_STATEMENT_DOC = "Whether to use PreparedStatements or regular Statements as the query.";
-    public static final Boolean CAMEL_SINK_CASSANDRASINK_KAMELET_PREPARED_STATEMENT_DEFAULT = true;
+    public static final String CAMEL_SINK_CASSANDRASINK_KAMELET_PREPARE_STATEMENTS_CONF = "camel.kamelet.cassandra-sink.prepareStatements";
+    public static final String CAMEL_SINK_CASSANDRASINK_KAMELET_PREPARE_STATEMENTS_DOC = "Whether to use PreparedStatements or regular Statements as the query.";
+    public static final Boolean CAMEL_SINK_CASSANDRASINK_KAMELET_PREPARE_STATEMENTS_DEFAULT = true;
     public static final String CAMEL_SINK_CASSANDRASINK_KAMELET_QUERY_CONF = "camel.kamelet.cassandra-sink.query";
     public static final String CAMEL_SINK_CASSANDRASINK_KAMELET_QUERY_DOC = "The query to execute against the Cassandra cluster table";
     public static final String CAMEL_SINK_CASSANDRASINK_KAMELET_QUERY_DEFAULT = null;
@@ -70,7 +70,7 @@ public class CamelCassandrasinkSinkConnectorConfig
         conf.define(CAMEL_SINK_CASSANDRASINK_KAMELET_USERNAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_CASSANDRASINK_KAMELET_USERNAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_CASSANDRASINK_KAMELET_USERNAME_DOC);
         conf.define(CAMEL_SINK_CASSANDRASINK_KAMELET_PASSWORD_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_CASSANDRASINK_KAMELET_PASSWORD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_CASSANDRASINK_KAMELET_PASSWORD_DOC);
         conf.define(CAMEL_SINK_CASSANDRASINK_KAMELET_CONSISTENCY_LEVEL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_CASSANDRASINK_KAMELET_CONSISTENCY_LEVEL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_CASSANDRASINK_KAMELET_CONSISTENCY_LEVEL_DOC);
-        conf.define(CAMEL_SINK_CASSANDRASINK_KAMELET_PREPARED_STATEMENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_CASSANDRASINK_KAMELET_PREPARED_STATEMENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_CASSANDRASINK_KAMELET_PREPARED_STATEMENT_DOC);
+        conf.define(CAMEL_SINK_CASSANDRASINK_KAMELET_PREPARE_STATEMENTS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_CASSANDRASINK_KAMELET_PREPARE_STATEMENTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_CASSANDRASINK_KAMELET_PREPARE_STATEMENTS_DOC);
         conf.define(CAMEL_SINK_CASSANDRASINK_KAMELET_QUERY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_CASSANDRASINK_KAMELET_QUERY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_CASSANDRASINK_KAMELET_QUERY_DOC);
         return conf;
     }
diff --git a/connectors/camel-cassandra-sink-kafka-connector/src/main/resources/kamelets/cassandra-sink.kamelet.yaml b/connectors/camel-cassandra-sink-kafka-connector/src/main/resources/kamelets/cassandra-sink.kamelet.yaml
index 5a02a815e..5d4e53190 100644
--- a/connectors/camel-cassandra-sink-kafka-connector/src/main/resources/kamelets/cassandra-sink.kamelet.yaml
+++ b/connectors/camel-cassandra-sink-kafka-connector/src/main/resources/kamelets/cassandra-sink.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: cassandra-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDIyLjEuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgoJIHZpZXdCb3g9IjAgMCAzMiAzMiIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIgMzI7Ii [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Cassandra"
@@ -74,8 +74,8 @@ spec:
         description: Consistency level to use. The value can be one of ANY, ONE, TWO, THREE, QUORUM, ALL, LOCAL_QUORUM, EACH_QUORUM, SERIAL, LOCAL_SERIAL, LOCAL_ONE
         type: string
         default: ANY
-      preparedStatement:
-        title: Prepared Statement
+      prepareStatements:
+        title: Prepare Statements
         description: Whether to use PreparedStatements or regular Statements as the query.
         type: boolean
         default: true
@@ -92,7 +92,7 @@ spec:
   - "camel:jackson"
   - "camel:kamelet"
   - "camel:cassandraql"
-  flow:
+  template:
     from:
       uri: "kamelet:source"
       steps:
@@ -105,6 +105,6 @@ spec:
           parameters:
             username: "{{?username}}"
             password: "{{?password}}"
-            preparedStatement: "{{preparedStatement}}"
+            prepareStatements: "{{prepareStatements}}"
             consistencyLevel: "{{consistencyLevel}}"
             cql: "{{query}}"
\ No newline at end of file
diff --git a/connectors/camel-cassandra-source-kafka-connector/src/generated/resources/camel-cassandra-source-source.json b/connectors/camel-cassandra-source-kafka-connector/src/generated/resources/camel-cassandra-source-source.json
index bf30cc06d..34f39383a 100644
--- a/connectors/camel-cassandra-source-kafka-connector/src/generated/resources/camel-cassandra-source-source.json
+++ b/connectors/camel-cassandra-source-kafka-connector/src/generated/resources/camel-cassandra-source-source.json
@@ -49,7 +49,7 @@
 		"camel.kamelet.cassandra-source.consistencyLevel": {
 			"name": "camel.kamelet.cassandra-source.consistencyLevel",
 			"description": "Consistency level to use. The value can be one of ANY, ONE, TWO, THREE, QUORUM, ALL, LOCAL_QUORUM, EACH_QUORUM, SERIAL, LOCAL_SERIAL, LOCAL_ONE",
-			"defaultValue": "\"ANY\"",
+			"defaultValue": "\"QUORUM\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/connectors/camel-cassandra-source-kafka-connector/src/main/docs/examples/CamelCassandrasourceSourceConnector.properties b/connectors/camel-cassandra-source-kafka-connector/src/main/docs/examples/CamelCassandrasourceSourceConnector.properties
index 1b8ec33e8..20d05ea89 100644
--- a/connectors/camel-cassandra-source-kafka-connector/src/main/docs/examples/CamelCassandrasourceSourceConnector.properties
+++ b/connectors/camel-cassandra-source-kafka-connector/src/main/docs/examples/CamelCassandrasourceSourceConnector.properties
@@ -36,4 +36,3 @@ camel.kamelet.cassandra-source.connectionPort=
 camel.kamelet.cassandra-source.keyspace=
 # The query to execute against the Cassandra cluster table
 camel.kamelet.cassandra-source.query=
-
diff --git a/connectors/camel-cassandra-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasource/CamelCassandrasourceSourceConnectorConfig.java b/connectors/camel-cassandra-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasource/CamelCassandrasourceSourceConnectorConfig.java
index 1769af1fa..81cec1b32 100644
--- a/connectors/camel-cassandra-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasource/CamelCassandrasourceSourceConnectorConfig.java
+++ b/connectors/camel-cassandra-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasource/CamelCassandrasourceSourceConnectorConfig.java
@@ -46,7 +46,7 @@ public class CamelCassandrasourceSourceConnectorConfig
     public static final String CAMEL_SOURCE_CASSANDRASOURCE_KAMELET_RESULT_STRATEGY_DEFAULT = "ALL";
     public static final String CAMEL_SOURCE_CASSANDRASOURCE_KAMELET_CONSISTENCY_LEVEL_CONF = "camel.kamelet.cassandra-source.consistencyLevel";
     public static final String CAMEL_SOURCE_CASSANDRASOURCE_KAMELET_CONSISTENCY_LEVEL_DOC = "Consistency level to use. The value can be one of ANY, ONE, TWO, THREE, QUORUM, ALL, LOCAL_QUORUM, EACH_QUORUM, SERIAL, LOCAL_SERIAL, LOCAL_ONE";
-    public static final String CAMEL_SOURCE_CASSANDRASOURCE_KAMELET_CONSISTENCY_LEVEL_DEFAULT = "ANY";
+    public static final String CAMEL_SOURCE_CASSANDRASOURCE_KAMELET_CONSISTENCY_LEVEL_DEFAULT = "QUORUM";
     public static final String CAMEL_SOURCE_CASSANDRASOURCE_KAMELET_QUERY_CONF = "camel.kamelet.cassandra-source.query";
     public static final String CAMEL_SOURCE_CASSANDRASOURCE_KAMELET_QUERY_DOC = "The query to execute against the Cassandra cluster table";
     public static final String CAMEL_SOURCE_CASSANDRASOURCE_KAMELET_QUERY_DEFAULT = null;
diff --git a/connectors/camel-cassandra-source-kafka-connector/src/main/resources/kamelets/cassandra-source.kamelet.yaml b/connectors/camel-cassandra-source-kafka-connector/src/main/resources/kamelets/cassandra-source.kamelet.yaml
index f4ca301b5..9c7fe22ea 100644
--- a/connectors/camel-cassandra-source-kafka-connector/src/main/resources/kamelets/cassandra-source.kamelet.yaml
+++ b/connectors/camel-cassandra-source-kafka-connector/src/main/resources/kamelets/cassandra-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: cassandra-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDIyLjEuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgoJIHZpZXdCb3g9IjAgMCAzMiAzMiIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIgMzI7Ii [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Cassandra"
@@ -76,7 +76,7 @@ spec:
         title: Consistency Level
         description: Consistency level to use. The value can be one of ANY, ONE, TWO, THREE, QUORUM, ALL, LOCAL_QUORUM, EACH_QUORUM, SERIAL, LOCAL_SERIAL, LOCAL_ONE
         type: string
-        default: ANY
+        default: QUORUM
       query:
         title: Query
         description: The query to execute against the Cassandra cluster table
@@ -88,7 +88,7 @@ spec:
   - "camel:jackson"
   - "camel:kamelet"
   - "camel:cassandraql"
-  flow:
+  template:
     from:
       uri: "cql://{{connectionHost}}:{{connectionPort}}/{{keyspace}}"
       parameters:
diff --git a/connectors/camel-chuck-norris-source-kafka-connector/src/main/docs/examples/CamelChucknorrissourceSourceConnector.properties b/connectors/camel-chuck-norris-source-kafka-connector/src/main/docs/examples/CamelChucknorrissourceSourceConnector.properties
index 0bcceb4bb..121a1f8f9 100644
--- a/connectors/camel-chuck-norris-source-kafka-connector/src/main/docs/examples/CamelChucknorrissourceSourceConnector.properties
+++ b/connectors/camel-chuck-norris-source-kafka-connector/src/main/docs/examples/CamelChucknorrissourceSourceConnector.properties
@@ -28,4 +28,3 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-
diff --git a/connectors/camel-chuck-norris-source-kafka-connector/src/main/resources/kamelets/chuck-norris-source.kamelet.yaml b/connectors/camel-chuck-norris-source-kafka-connector/src/main/resources/kamelets/chuck-norris-source.kamelet.yaml
index b376d6aaf..a7bcf9b5b 100644
--- a/connectors/camel-chuck-norris-source-kafka-connector/src/main/resources/kamelets/chuck-norris-source.kamelet.yaml
+++ b/connectors/camel-chuck-norris-source-kafka-connector/src/main/resources/kamelets/chuck-norris-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: chuck-norris-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pg0KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDE5LjAuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPg0KPHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJDYXBhXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDA [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Chuck Norris"
@@ -46,7 +46,7 @@ spec:
     - "camel:timer"
     - "camel:http"
     - "camel:jsonpath"
-  flow:
+  template:
     from:
       uri: "timer:chuck"
       parameters:
diff --git a/connectors/camel-couchbase-sink-kafka-connector/src/main/docs/examples/CamelCouchbasesinkSinkConnector.properties b/connectors/camel-couchbase-sink-kafka-connector/src/main/docs/examples/CamelCouchbasesinkSinkConnector.properties
index 619f259b3..43844dab7 100644
--- a/connectors/camel-couchbase-sink-kafka-connector/src/main/docs/examples/CamelCouchbasesinkSinkConnector.properties
+++ b/connectors/camel-couchbase-sink-kafka-connector/src/main/docs/examples/CamelCouchbasesinkSinkConnector.properties
@@ -34,4 +34,3 @@ camel.kamelet.couchbase-sink.bucket=
 camel.kamelet.couchbase-sink.couchbaseHostname=
 # The protocol to use
 camel.kamelet.couchbase-sink.protocol=
-
diff --git a/connectors/camel-couchbase-sink-kafka-connector/src/main/resources/kamelets/couchbase-sink.kamelet.yaml b/connectors/camel-couchbase-sink-kafka-connector/src/main/resources/kamelets/couchbase-sink.kamelet.yaml
index 0cb7ad719..7ea1e383e 100644
--- a/connectors/camel-couchbase-sink-kafka-connector/src/main/resources/kamelets/couchbase-sink.kamelet.yaml
+++ b/connectors/camel-couchbase-sink-kafka-connector/src/main/resources/kamelets/couchbase-sink.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: couchbase-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNjguMzQzIDY4LjM0MyIgZmlsbD0iI2ZmZiIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCI+PHVzZSB4bGluazpocmVmPSIjQSIgeD0iMi4xNzEiIHk9IjIuMTcxIi8+PHN5bWJvbCBpZD0iQSIgb3ZlcmZsb3c9InZpc2libGUiPjxwYXRoIGQ9Ik0zMi4wMDIgMEMxNC4zMzEuMDAyLjAwNSAxNC4zMjYgMC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Couchbase"
@@ -83,7 +83,7 @@ spec:
   dependencies:
     - "camel:couchbase"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: "kamelet:source"
       steps:
diff --git a/connectors/camel-cron-source-kafka-connector/src/main/docs/examples/CamelCronsourceSourceConnector.properties b/connectors/camel-cron-source-kafka-connector/src/main/docs/examples/CamelCronsourceSourceConnector.properties
index 04f616b9a..6f2acc687 100644
--- a/connectors/camel-cron-source-kafka-connector/src/main/docs/examples/CamelCronsourceSourceConnector.properties
+++ b/connectors/camel-cron-source-kafka-connector/src/main/docs/examples/CamelCronsourceSourceConnector.properties
@@ -32,4 +32,3 @@ topics=
 camel.kamelet.cron-source.message=
 # A cron expression that will be used to trigger events generation. Example: 0/3 10 * * * ?
 camel.kamelet.cron-source.schedule=
-
diff --git a/connectors/camel-cron-source-kafka-connector/src/main/resources/kamelets/cron-source.kamelet.yaml b/connectors/camel-cron-source-kafka-connector/src/main/resources/kamelets/cron-source.kamelet.yaml
index ea422474d..e48bed170 100644
--- a/connectors/camel-cron-source-kafka-connector/src/main/resources/kamelets/cron-source.kamelet.yaml
+++ b/connectors/camel-cron-source-kafka-connector/src/main/resources/kamelets/cron-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: cron-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNTAwIiBoZWlnaHQ9IjI1MDAiIHZpZXdCb3g9IjAgMCAxOTIuNzU2IDE5Mi43NTYiPjxnIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIj48cGF0aCBmaWxsPSIjZmZmIiBkPSJNMCAwaDE5Mi43NTZ2MTkyLjc1NkgwVjB6Ii8+PHBhdGggZD0iTTQyLjE2IDEwMy4wNzJsNS45MDEgMS40OTZjLTEuMjQyIDQuODY1LTMuNDc2IDguNTc0LTYuNzAxIDExLjEyOXMtNy4xNjcgMy44MzItMTEuODI2IDMuODMyYy00LjgyMyAwLTguNzQ2LS45ODItMTEuNzY3LTIuOTQ3LT [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Cron"
@@ -54,7 +54,7 @@ spec:
   - "camel:core"
   - "camel:cron"
   - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: "cron:tick"
       parameters:
diff --git a/connectors/camel-cxf-kafka-connector/src/main/docs/examples/CamelCxfSinkConnector.properties b/connectors/camel-cxf-kafka-connector/src/main/docs/examples/CamelCxfSinkConnector.properties
index 9b9958500..483f724a7 100644
--- a/connectors/camel-cxf-kafka-connector/src/main/docs/examples/CamelCxfSinkConnector.properties
+++ b/connectors/camel-cxf-kafka-connector/src/main/docs/examples/CamelCxfSinkConnector.properties
@@ -28,4 +28,3 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-
diff --git a/connectors/camel-cxf-kafka-connector/src/main/docs/examples/CamelCxfSourceConnector.properties b/connectors/camel-cxf-kafka-connector/src/main/docs/examples/CamelCxfSourceConnector.properties
index 71eb716d5..a9a27ff04 100644
--- a/connectors/camel-cxf-kafka-connector/src/main/docs/examples/CamelCxfSourceConnector.properties
+++ b/connectors/camel-cxf-kafka-connector/src/main/docs/examples/CamelCxfSourceConnector.properties
@@ -28,4 +28,3 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-
diff --git a/connectors/camel-cxfrs-kafka-connector/src/main/docs/examples/CamelCxfrsSinkConnector.properties b/connectors/camel-cxfrs-kafka-connector/src/main/docs/examples/CamelCxfrsSinkConnector.properties
index d667498e0..d2fcee7d5 100644
--- a/connectors/camel-cxfrs-kafka-connector/src/main/docs/examples/CamelCxfrsSinkConnector.properties
+++ b/connectors/camel-cxfrs-kafka-connector/src/main/docs/examples/CamelCxfrsSinkConnector.properties
@@ -28,4 +28,3 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-
diff --git a/connectors/camel-cxfrs-kafka-connector/src/main/docs/examples/CamelCxfrsSourceConnector.properties b/connectors/camel-cxfrs-kafka-connector/src/main/docs/examples/CamelCxfrsSourceConnector.properties
index d6d8fdd90..4f9896099 100644
--- a/connectors/camel-cxfrs-kafka-connector/src/main/docs/examples/CamelCxfrsSourceConnector.properties
+++ b/connectors/camel-cxfrs-kafka-connector/src/main/docs/examples/CamelCxfrsSourceConnector.properties
@@ -28,4 +28,3 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-
diff --git a/connectors/camel-dropbox-sink-kafka-connector/pom.xml b/connectors/camel-dropbox-sink-kafka-connector/pom.xml
index 5329b674f..8b9c805de 100644
--- a/connectors/camel-dropbox-sink-kafka-connector/pom.xml
+++ b/connectors/camel-dropbox-sink-kafka-connector/pom.xml
@@ -45,6 +45,10 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-dropbox</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>
diff --git a/connectors/camel-dropbox-sink-kafka-connector/src/main/docs/examples/CamelDropboxsinkSinkConnector.properties b/connectors/camel-dropbox-sink-kafka-connector/src/main/docs/examples/CamelDropboxsinkSinkConnector.properties
index 84cfc43c0..7e76ad61d 100644
--- a/connectors/camel-dropbox-sink-kafka-connector/src/main/docs/examples/CamelDropboxsinkSinkConnector.properties
+++ b/connectors/camel-dropbox-sink-kafka-connector/src/main/docs/examples/CamelDropboxsinkSinkConnector.properties
@@ -36,4 +36,3 @@ camel.kamelet.dropbox-sink.clientIdentifier=
 camel.kamelet.dropbox-sink.remotePath=
 # Which mode to upload. in case of add the new file will be renamed if a file with the same name already exists on dropbox. in case of force if a file with the same name already exists on dropbox, this will be overwritten. The value can be one of add, force.
 camel.kamelet.dropbox-sink.uploadMode=
-
diff --git a/connectors/camel-dropbox-sink-kafka-connector/src/main/resources/kamelets/dropbox-sink.kamelet.yaml b/connectors/camel-dropbox-sink-kafka-connector/src/main/resources/kamelets/dropbox-sink.kamelet.yaml
index 246748062..75dd6ad19 100644
--- a/connectors/camel-dropbox-sink-kafka-connector/src/main/resources/kamelets/dropbox-sink.kamelet.yaml
+++ b/connectors/camel-dropbox-sink-kafka-connector/src/main/resources/kamelets/dropbox-sink.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: dropbox-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjQzcHgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDQzIDQwIiB2ZXJzaW9uPSIxLjEiIGhlaWdodD0iNDBweCI+CiA8cGF0aCBkPSJtMTIuNSAwbC0xMi41IDguMSA4LjcgNyAxMi41LTcuOC04LjctNy4zem0tMTIuNSAyMS45bDEyLjUgOC4yIDguNy03LjMtMTIuNS03LjctOC43IDYuOHptMjEuMiAwLjlsOC44IDcuMyAxMi40LTguMS04LjYtNi45LTEyLjYgNy43em0yMS4yLTE0LjdsLTEyLjQtOC4xLTguOC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Dropbox"
@@ -68,9 +68,10 @@ spec:
         type: string
         default: add
   dependencies:
+    - "camel:core"
     - "camel:dropbox"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: "kamelet:source"
       steps:
diff --git a/connectors/camel-dropbox-source-kafka-connector/src/main/docs/examples/CamelDropboxsourceSourceConnector.properties b/connectors/camel-dropbox-source-kafka-connector/src/main/docs/examples/CamelDropboxsourceSourceConnector.properties
index df5e04c7e..4469eb162 100644
--- a/connectors/camel-dropbox-source-kafka-connector/src/main/docs/examples/CamelDropboxsourceSourceConnector.properties
+++ b/connectors/camel-dropbox-source-kafka-connector/src/main/docs/examples/CamelDropboxsourceSourceConnector.properties
@@ -38,4 +38,3 @@ camel.kamelet.dropbox-source.period=
 camel.kamelet.dropbox-source.query=
 # Original file or folder to work with
 camel.kamelet.dropbox-source.remotePath=
-
diff --git a/connectors/camel-dropbox-source-kafka-connector/src/main/resources/kamelets/dropbox-source.kamelet.yaml b/connectors/camel-dropbox-source-kafka-connector/src/main/resources/kamelets/dropbox-source.kamelet.yaml
index efb514c11..d0c6c1973 100644
--- a/connectors/camel-dropbox-source-kafka-connector/src/main/resources/kamelets/dropbox-source.kamelet.yaml
+++ b/connectors/camel-dropbox-source-kafka-connector/src/main/resources/kamelets/dropbox-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: dropbox-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjQzcHgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDQzIDQwIiB2ZXJzaW9uPSIxLjEiIGhlaWdodD0iNDBweCI+CiA8cGF0aCBkPSJtMTIuNSAwbC0xMi41IDguMSA4LjcgNyAxMi41LTcuOC04LjctNy4zem0tMTIuNSAyMS45bDEyLjUgOC4yIDguNy03LjMtMTIuNS03LjctOC43IDYuOHptMjEuMiAwLjlsOC44IDcuMyAxMi40LTguMS04LjYtNi45LTEyLjYgNy43em0yMS4yLTE0LjdsLTEyLjQtOC4xLTguOC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Dropbox"
@@ -72,7 +72,7 @@ spec:
     - "camel:core"
     - "camel:jsonpath"
     - "camel:timer"
-  flow:
+  template:
     from:
       uri: "timer:dropbox-stream"
       parameters:
@@ -91,6 +91,6 @@ spec:
           - set-property:
               name: dropboxFileName
               simple: ${body.metadata.pathDisplay}
-          - to-d: "dropbox:get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=${exchangeProperty.dropboxFileName}"
+          - toD: "dropbox:get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=${exchangeProperty.dropboxFileName}"
           - to: "kamelet:sink"
-          - to-d: "dropbox:del?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=${exchangeProperty.dropboxFileName}"
\ No newline at end of file
+          - toD: "dropbox:del?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=${exchangeProperty.dropboxFileName}"
\ No newline at end of file
diff --git a/connectors/camel-earthquake-source-kafka-connector/src/main/docs/examples/CamelEarthquakesourceSourceConnector.properties b/connectors/camel-earthquake-source-kafka-connector/src/main/docs/examples/CamelEarthquakesourceSourceConnector.properties
index 1c215ac41..a6967d44a 100644
--- a/connectors/camel-earthquake-source-kafka-connector/src/main/docs/examples/CamelEarthquakesourceSourceConnector.properties
+++ b/connectors/camel-earthquake-source-kafka-connector/src/main/docs/examples/CamelEarthquakesourceSourceConnector.properties
@@ -28,4 +28,3 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-
diff --git a/connectors/camel-earthquake-source-kafka-connector/src/main/resources/kamelets/earthquake-source.kamelet.yaml b/connectors/camel-earthquake-source-kafka-connector/src/main/resources/kamelets/earthquake-source.kamelet.yaml
index 8e454e877..c06394e60 100644
--- a/connectors/camel-earthquake-source-kafka-connector/src/main/resources/kamelets/earthquake-source.kamelet.yaml
+++ b/connectors/camel-earthquake-source-kafka-connector/src/main/resources/kamelets/earthquake-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: earthquake-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9JzEwMHB4JyB3aWR0aD0nMTAwcHgnICBmaWxsPSIjMDAwMDAwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMTAwLjAwMyA3OS45OTciIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDEwMC4wMDMgNzkuOTk3IiB4bWw6c3BhY2U9InByZXNlcnZlIj48cGF0aCBkPSJNODEuNjUzLDQyLjk0Yy0xLjM4NywwLTIuNjY2LDAuNzY3LTMuMzE1LDEuOTkyTDcyLjk0Miw1NS4xbC02Lj [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Earthquake"
@@ -55,7 +55,7 @@ spec:
     - "camel:jackson"
     - "camel:jsonpath"
     - "camel:timer"
-  flow:
+  template:
     from:
       uri: "timer:earthquake"
       parameters:
@@ -64,7 +64,7 @@ spec:
       - set-header:
           name: CamelCaffeineAction
           constant: GET
-      - tod: "caffeine-cache:cache-${routeId}?key=lastUpdate"
+      - toD: "caffeine-cache:cache-${routeId}?key=lastUpdate"
       - choice:
           when:
           - simple: "${header.CamelCaffeineActionHasResult}"
@@ -80,7 +80,7 @@ spec:
       - set-header:
           name: CamelHttpMethod
           constant: GET
-      - tod: "https://earthquake.usgs.gov/fdsnws/event/1/query?format=geojson&updatedafter=${exchangeProperty.lastUpdate}&orderby=time-asc"
+      - toD: "https://earthquake.usgs.gov/fdsnws/event/1/query?format=geojson&updatedafter=${exchangeProperty.lastUpdate}&orderby=time-asc"
       - remove-header:
           name: CamelHttpMethod
       - unmarshal:
@@ -98,7 +98,7 @@ spec:
       - set-header:
           name: CamelCaffeineAction
           constant: PUT
-      - tod: "caffeine-cache:cache-${routeId}?key=lastUpdate"
+      - toD: "caffeine-cache:cache-${routeId}?key=lastUpdate"
       - claim-check:
           operation: Pop
       - split:
diff --git a/connectors/camel-elasticsearch-index-sink-kafka-connector/pom.xml b/connectors/camel-elasticsearch-index-sink-kafka-connector/pom.xml
index b7ec4adf6..cf2a287d9 100644
--- a/connectors/camel-elasticsearch-index-sink-kafka-connector/pom.xml
+++ b/connectors/camel-elasticsearch-index-sink-kafka-connector/pom.xml
@@ -49,6 +49,10 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-elasticsearch-rest</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-bean</artifactId>
diff --git a/connectors/camel-elasticsearch-index-sink-kafka-connector/src/main/docs/examples/CamelElasticsearchindexsinkSinkConnector.properties b/connectors/camel-elasticsearch-index-sink-kafka-connector/src/main/docs/examples/CamelElasticsearchindexsinkSinkConnector.properties
index 48e9cb7e3..4ccce2bbd 100644
--- a/connectors/camel-elasticsearch-index-sink-kafka-connector/src/main/docs/examples/CamelElasticsearchindexsinkSinkConnector.properties
+++ b/connectors/camel-elasticsearch-index-sink-kafka-connector/src/main/docs/examples/CamelElasticsearchindexsinkSinkConnector.properties
@@ -32,4 +32,3 @@ topics=
 camel.kamelet.elasticsearch-index-sink.clusterName=
 # Comma separated list with ip:port formatted remote transport addresses to use. Example: quickstart-es-http:9200
 camel.kamelet.elasticsearch-index-sink.hostAddresses=
-
diff --git a/connectors/camel-elasticsearch-index-sink-kafka-connector/src/main/resources/kamelets/elasticsearch-index-sink.kamelet.yaml b/connectors/camel-elasticsearch-index-sink-kafka-connector/src/main/resources/kamelets/elasticsearch-index-sink.kamelet.yaml
index b80001a80..6e19f4693 100644
--- a/connectors/camel-elasticsearch-index-sink-kafka-connector/src/main/resources/kamelets/elasticsearch-index-sink.kamelet.yaml
+++ b/connectors/camel-elasticsearch-index-sink-kafka-connector/src/main/resources/kamelets/elasticsearch-index-sink.kamelet.yaml
@@ -22,7 +22,7 @@ metadata:
     camel.apache.org/kamelet.type: "sink"
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.group: "ElasticSearch"
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCA1NTAgMjUwIiB2aWV3Qm94PSI3Nyw4Myw0MTAsOTAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiA8cGF0aCBkPSJtMTc4IDEwMi41aDMxM3Y0MWgtMzEzeiIgZmlsbD0ibm9uZSIvPgogPGcgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyI+CiAgPHBhdGggZD0ibTE5My4zIDEzOS40Yy00IDAtNy4yLTEuMi05LjUtMy41cy0zLjQtNS42LTMuNC05LjdjMC00LjIgMS4xLTcuNiAzLjItMTBzNS0zLjYgOC43LTMuNmMzLjQgMCA2Lj [...]
@@ -88,15 +88,19 @@ spec:
     in:
       mediaType: application/json
   dependencies:
+    - "camel:core"
     - "camel:jackson"
     - "camel:kamelet"
     - "camel:elasticsearch-rest"
     - "camel:gson"
     - "camel:bean"
-  flow:
+  template:
     beans:
       - name: local-es
         type: "#class:org.apache.camel.component.elasticsearch.ElasticsearchComponent"
+        properties:
+            user: "{{?user}}"
+            password: "{{?password}}"
     from:
       uri: kamelet:source
       steps:
@@ -112,12 +116,6 @@ spec:
             - set-header:
                 name: "indexId"
                 simple: "${header[ce-indexid]}"
-          otherwise:
-            steps:
-            - set-header:
-                name: "indexId"
-                expression:
-                  simple: ${bean:org.apache.camel.support.ShortUuidGenerator?method=generateUuid}
       - choice:
           when:
           - simple: "${header[indexName]}"
@@ -136,8 +134,6 @@ spec:
             operation: "INDEX"
             hostAddresses: "{{hostAddresses}}"
             enableSSL: "{{enableSSL}}"
-            user: "{{?user}}"
-            password: "{{?password}}"
             indexName: "{{?indexName}}"
       - marshal:
           json: { }
\ No newline at end of file
diff --git a/connectors/camel-elasticsearch-search-source-kafka-connector/src/main/docs/examples/CamelElasticsearchsearchsourceSourceConnector.properties b/connectors/camel-elasticsearch-search-source-kafka-connector/src/main/docs/examples/CamelElasticsearchsearchsourceSourceConnector.properties
index bcc974829..5e075acb5 100644
--- a/connectors/camel-elasticsearch-search-source-kafka-connector/src/main/docs/examples/CamelElasticsearchsearchsourceSourceConnector.properties
+++ b/connectors/camel-elasticsearch-search-source-kafka-connector/src/main/docs/examples/CamelElasticsearchsearchsourceSourceConnector.properties
@@ -36,4 +36,3 @@ camel.kamelet.elasticsearch-search-source.hostAddresses=
 camel.kamelet.elasticsearch-search-source.indexName=
 # The query we want to use to search on ElasticSearch.
 camel.kamelet.elasticsearch-search-source.query=
-
diff --git a/connectors/camel-elasticsearch-search-source-kafka-connector/src/main/resources/kamelets/elasticsearch-search-source.kamelet.yaml b/connectors/camel-elasticsearch-search-source-kafka-connector/src/main/resources/kamelets/elasticsearch-search-source.kamelet.yaml
index 01b4dc421..8e1dc7f82 100644
--- a/connectors/camel-elasticsearch-search-source-kafka-connector/src/main/resources/kamelets/elasticsearch-search-source.kamelet.yaml
+++ b/connectors/camel-elasticsearch-search-source-kafka-connector/src/main/resources/kamelets/elasticsearch-search-source.kamelet.yaml
@@ -22,7 +22,7 @@ metadata:
     camel.apache.org/kamelet.type: "source"
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.group: "ElasticSearch"
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCA1NTAgMjUwIiB2aWV3Qm94PSI3Nyw4Myw0MTAsOTAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiA8cGF0aCBkPSJtMTc4IDEwMi41aDMxM3Y0MWgtMzEzeiIgZmlsbD0ibm9uZSIvPgogPGcgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyI+CiAgPHBhdGggZD0ibTE5My4zIDEzOS40Yy00IDAtNy4yLTEuMi05LjUtMy41cy0zLjQtNS42LTMuNC05LjdjMC00LjIgMS4xLTcuNiAzLjItMTBzNS0zLjYgOC43LTMuNmMzLjQgMCA2Lj [...]
@@ -89,7 +89,7 @@ spec:
       - "camel:timer"
       - "camel:elasticsearch-rest"
       - "camel:gson"
-  flow:
+  template:
     beans:
       - name: local-es
         type: "#class:org.apache.camel.component.elasticsearch.ElasticsearchComponent"
diff --git a/connectors/camel-exec-sink-kafka-connector/src/main/docs/examples/CamelExecsinkSinkConnector.properties b/connectors/camel-exec-sink-kafka-connector/src/main/docs/examples/CamelExecsinkSinkConnector.properties
index a9e030264..30ee40447 100644
--- a/connectors/camel-exec-sink-kafka-connector/src/main/docs/examples/CamelExecsinkSinkConnector.properties
+++ b/connectors/camel-exec-sink-kafka-connector/src/main/docs/examples/CamelExecsinkSinkConnector.properties
@@ -30,4 +30,3 @@ topics=
 
 # The command to execute
 camel.kamelet.exec-sink.executable=
-
diff --git a/connectors/camel-exec-sink-kafka-connector/src/main/resources/kamelets/exec-sink.kamelet.yaml b/connectors/camel-exec-sink-kafka-connector/src/main/resources/kamelets/exec-sink.kamelet.yaml
index 59432a5c0..d3098dd8a 100644
--- a/connectors/camel-exec-sink-kafka-connector/src/main/resources/kamelets/exec-sink.kamelet.yaml
+++ b/connectors/camel-exec-sink-kafka-connector/src/main/resources/kamelets/exec-sink.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: exec-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDIwMDEwOTA0Ly9FTiIKICJodHRwOi8vd3d3LnczLm9yZy9UUi8yMDAxL1JFQy1TVkctMjAwMTA5MDQvRFREL3N2ZzEwLmR0ZCI+CjxzdmcgdmVyc2lvbj0iMS4wIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiB3aWR0aD0iMTI4MC4wMDAwMDBwdCIgaGVpZ2h0PSIxMDEyLjAwMDAwMHB0IiB2aWV3Qm94PSIwIDAgMTI4MC4wMDAwMDAgMTAxMi4wMDAwMDAiCiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCBtZW [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Exec"
@@ -49,7 +49,7 @@ spec:
     - "camel:core"
     - "camel:exec"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: kamelet:source
       steps:
diff --git a/connectors/camel-fhir-source-kafka-connector/src/main/docs/examples/CamelFhirsourceSourceConnector.properties b/connectors/camel-fhir-source-kafka-connector/src/main/docs/examples/CamelFhirsourceSourceConnector.properties
index a2c3f7e2a..6d61c62da 100644
--- a/connectors/camel-fhir-source-kafka-connector/src/main/docs/examples/CamelFhirsourceSourceConnector.properties
+++ b/connectors/camel-fhir-source-kafka-connector/src/main/docs/examples/CamelFhirsourceSourceConnector.properties
@@ -34,4 +34,3 @@ camel.kamelet.fhir-source.password=
 camel.kamelet.fhir-source.serverUrl=
 # The username to access the Fhir server
 camel.kamelet.fhir-source.username=
-
diff --git a/connectors/camel-fhir-source-kafka-connector/src/main/resources/kamelets/fhir-source.kamelet.yaml b/connectors/camel-fhir-source-kafka-connector/src/main/resources/kamelets/fhir-source.kamelet.yaml
index 38426073a..6a0228959 100644
--- a/connectors/camel-fhir-source-kafka-connector/src/main/resources/kamelets/fhir-source.kamelet.yaml
+++ b/connectors/camel-fhir-source-kafka-connector/src/main/resources/kamelets/fhir-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: fhir-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxOTUuMiAzMDAiPjxzdHlsZT48L3N0eWxlPjxnIGlkPSJMYXllcl8yIj48bGluZWFyR3JhZGllbnQgaWQ9IlNWR0lEXzFfIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjYyLjY0NCIgeTE9IjI2OC4yMDEiIHgyPSIzMC43MjEiIHkyPSI4Ny4xNTUiPjxzdG9wIG9mZnNldD0iLjE1NCIgc3RvcC1jb2xvcj0iI2ZmZTQwZSIvPjxzdG9wIG9mZnNldD0iLjkxIiBzdG9wLWNvbG9yPSIjZTEwZTE5Ii8+PC9saW5lYXJHcmFkaWVudD48cGF0aCBkPSJNNzkuNiA3OC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "FHIR"
@@ -83,7 +83,7 @@ spec:
   dependencies:
     - "camel:fhir"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: "fhir://search/searchByUrl"
       parameters:
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 accd97d8d..8bffbc6dd 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
@@ -128,7 +128,7 @@
 		},
 		"camel.sink.endpoint.keepLastModified": {
 			"name": "camel.sink.endpoint.keepLastModified",
-			"description": "Will keep the last modified timestamp from the source file (if any). Will use the Exchange.FILE_LAST_MODIFIED header to located the timestamp. This header can contain either a java.util.Date or long with the timestamp. If the timestamp exists and the option is enabled it will set this timestamp on the written file. Note: This option only applies to the file producer. You cannot use this option with any of the ftp producers.",
+			"description": "Will keep the last modified timestamp from the source file (if any). Will use the FileConstants.FILE_LAST_MODIFIED header to located the timestamp. This header can contain either a java.util.Date or long with the timestamp. If the timestamp exists and the option is enabled it will set this timestamp on the written file. Note: This option only applies to the file producer. You cannot use this option with any of the ftp producers.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
diff --git a/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-source.json b/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-source.json
index 12ab05822..557bf5fe1 100644
--- a/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-source.json
+++ b/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-source.json
@@ -154,12 +154,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.resumeStrategy": {
-			"name": "camel.source.endpoint.resumeStrategy",
-			"description": "Set a resume strategy for files. This makes it possible to define a strategy for resuming reading files after the last point before stopping the application. See the FileConsumerResumeStrategy for implementation details",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.startingDirectoryMustExist": {
 			"name": "camel.source.endpoint.startingDirectoryMustExist",
 			"description": "Whether the starting directory must exist. Mind that the autoCreate option is default enabled, which means the starting directory is normally auto created if it doesn't exist. You can disable autoCreate and enable this to ensure the starting directory must exist. Will thrown an exception if the directory doesn't exist.",
diff --git a/connectors/camel-file-kafka-connector/src/main/docs/examples/CamelFileSinkConnector.properties b/connectors/camel-file-kafka-connector/src/main/docs/examples/CamelFileSinkConnector.properties
index c8b409e4d..2321654be 100644
--- a/connectors/camel-file-kafka-connector/src/main/docs/examples/CamelFileSinkConnector.properties
+++ b/connectors/camel-file-kafka-connector/src/main/docs/examples/CamelFileSinkConnector.properties
@@ -30,4 +30,3 @@ topics=
 
 # The starting directory
 camel.sink.path.directoryName=
-
diff --git a/connectors/camel-file-kafka-connector/src/main/docs/examples/CamelFileSourceConnector.properties b/connectors/camel-file-kafka-connector/src/main/docs/examples/CamelFileSourceConnector.properties
index 036f7e7c7..a9c706a0c 100644
--- a/connectors/camel-file-kafka-connector/src/main/docs/examples/CamelFileSourceConnector.properties
+++ b/connectors/camel-file-kafka-connector/src/main/docs/examples/CamelFileSourceConnector.properties
@@ -30,4 +30,3 @@ topics=
 
 # The starting directory
 camel.source.path.directoryName=
-
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 d489980dd..0d53723a4 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
@@ -76,7 +76,7 @@ public class CamelFileSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_FILE_ENDPOINT_FORCE_WRITES_DOC = "Whether to force syncing writes to the file system. You can turn this off if you do not want this level of guarantee, for example if writing to logs / audit logs etc; this would yield better performance.";
     public static final Boolean CAMEL_SINK_FILE_ENDPOINT_FORCE_WRITES_DEFAULT = true;
     public static final String CAMEL_SINK_FILE_ENDPOINT_KEEP_LAST_MODIFIED_CONF = "camel.sink.endpoint.keepLastModified";
-    public static final String CAMEL_SINK_FILE_ENDPOINT_KEEP_LAST_MODIFIED_DOC = "Will keep the last modified timestamp from the source file (if any). Will use the Exchange.FILE_LAST_MODIFIED header to located the timestamp. This header can contain either a java.util.Date or long with the timestamp. If the timestamp exists and the option is enabled it will set this timestamp on the written file. Note: This option only applies to the file producer. You cannot use this option with any of t [...]
+    public static final String CAMEL_SINK_FILE_ENDPOINT_KEEP_LAST_MODIFIED_DOC = "Will keep the last modified timestamp from the source file (if any). Will use the FileConstants.FILE_LAST_MODIFIED header to located the timestamp. This header can contain either a java.util.Date or long with the timestamp. If the timestamp exists and the option is enabled it will set this timestamp on the written file. Note: This option only applies to the file producer. You cannot use this option with any [...]
     public static final Boolean CAMEL_SINK_FILE_ENDPOINT_KEEP_LAST_MODIFIED_DEFAULT = false;
     public static final String CAMEL_SINK_FILE_ENDPOINT_MOVE_EXISTING_FILE_STRATEGY_CONF = "camel.sink.endpoint.moveExistingFileStrategy";
     public static final String CAMEL_SINK_FILE_ENDPOINT_MOVE_EXISTING_FILE_STRATEGY_DOC = "Strategy (Custom Strategy) used to move file with special naming token to use when fileExist=Move is configured. By default, there is an implementation used if no custom strategy is provided";
diff --git a/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSourceConnectorConfig.java b/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSourceConnectorConfig.java
index fa116c89a..3b86fbd8d 100644
--- a/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSourceConnectorConfig.java
+++ b/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSourceConnectorConfig.java
@@ -92,9 +92,6 @@ public class CamelFileSourceConnectorConfig
     public static final String CAMEL_SOURCE_FILE_ENDPOINT_PROCESS_STRATEGY_CONF = "camel.source.endpoint.processStrategy";
     public static final String CAMEL_SOURCE_FILE_ENDPOINT_PROCESS_STRATEGY_DOC = "A pluggable org.apache.camel.component.file.GenericFileProcessStrategy allowing you to implement your own readLock option or similar. Can also be used when special conditions must be met before a file can be consumed, such as a special ready file exists. If this option is set then the readLock option does not apply.";
     public static final String CAMEL_SOURCE_FILE_ENDPOINT_PROCESS_STRATEGY_DEFAULT = null;
-    public static final String CAMEL_SOURCE_FILE_ENDPOINT_RESUME_STRATEGY_CONF = "camel.source.endpoint.resumeStrategy";
-    public static final String CAMEL_SOURCE_FILE_ENDPOINT_RESUME_STRATEGY_DOC = "Set a resume strategy for files. This makes it possible to define a strategy for resuming reading files after the last point before stopping the application. See the FileConsumerResumeStrategy for implementation details";
-    public static final String CAMEL_SOURCE_FILE_ENDPOINT_RESUME_STRATEGY_DEFAULT = null;
     public static final String CAMEL_SOURCE_FILE_ENDPOINT_STARTING_DIRECTORY_MUST_EXIST_CONF = "camel.source.endpoint.startingDirectoryMustExist";
     public static final String CAMEL_SOURCE_FILE_ENDPOINT_STARTING_DIRECTORY_MUST_EXIST_DOC = "Whether the starting directory must exist. Mind that the autoCreate option is default enabled, which means the starting directory is normally auto created if it doesn't exist. You can disable autoCreate and enable this to ensure the starting directory must exist. Will thrown an exception if the directory doesn't exist.";
     public static final Boolean CAMEL_SOURCE_FILE_ENDPOINT_STARTING_DIRECTORY_MUST_EXIST_DEFAULT = false;
@@ -307,7 +304,6 @@ public class CamelFileSourceConnectorConfig
         conf.define(CAMEL_SOURCE_FILE_ENDPOINT_POLL_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_FILE_ENDPOINT_POLL_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_FILE_ENDPOINT_POLL_STRATEGY_DOC);
         conf.define(CAMEL_SOURCE_FILE_ENDPOINT_PROBE_CONTENT_TYPE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_FILE_ENDPOINT_PROBE_CONTENT_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_FILE_ENDPOINT_PROBE_CONTENT_TYPE_DOC);
         conf.define(CAMEL_SOURCE_FILE_ENDPOINT_PROCESS_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_FILE_ENDPOINT_PROCESS_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_FILE_ENDPOINT_PROCESS_STRATEGY_DOC);
-        conf.define(CAMEL_SOURCE_FILE_ENDPOINT_RESUME_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_FILE_ENDPOINT_RESUME_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_FILE_ENDPOINT_RESUME_STRATEGY_DOC);
         conf.define(CAMEL_SOURCE_FILE_ENDPOINT_STARTING_DIRECTORY_MUST_EXIST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_FILE_ENDPOINT_STARTING_DIRECTORY_MUST_EXIST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_FILE_ENDPOINT_STARTING_DIRECTORY_MUST_EXIST_DOC);
         conf.define(CAMEL_SOURCE_FILE_ENDPOINT_STARTING_DIRECTORY_MUST_HAVE_ACCESS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_FILE_ENDPOINT_STARTING_DIRECTORY_MUST_HAVE_ACCESS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_FILE_ENDPOINT_STARTING_DIRECTORY_MUST_HAVE_ACCESS_DOC);
         conf.define(CAMEL_SOURCE_FILE_ENDPOINT_AUTO_CREATE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_FILE_ENDPOINT_AUTO_CREATE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_FILE_ENDPOINT_AUTO_CREATE_DOC);
diff --git a/connectors/camel-file-watch-source-kafka-connector/src/main/docs/examples/CamelFilewatchsourceSourceConnector.properties b/connectors/camel-file-watch-source-kafka-connector/src/main/docs/examples/CamelFilewatchsourceSourceConnector.properties
index c02e4210b..45edd415e 100644
--- a/connectors/camel-file-watch-source-kafka-connector/src/main/docs/examples/CamelFilewatchsourceSourceConnector.properties
+++ b/connectors/camel-file-watch-source-kafka-connector/src/main/docs/examples/CamelFilewatchsourceSourceConnector.properties
@@ -32,4 +32,3 @@ topics=
 camel.kamelet.file-watch-source.events=
 # Path of file or folder to watch
 camel.kamelet.file-watch-source.filePath=
-
diff --git a/connectors/camel-file-watch-source-kafka-connector/src/main/resources/kamelets/file-watch-source.kamelet.yaml b/connectors/camel-file-watch-source-kafka-connector/src/main/resources/kamelets/file-watch-source.kamelet.yaml
index 48f374eb2..5d0c3f5b4 100644
--- a/connectors/camel-file-watch-source-kafka-connector/src/main/resources/kamelets/file-watch-source.kamelet.yaml
+++ b/connectors/camel-file-watch-source-kafka-connector/src/main/resources/kamelets/file-watch-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: file-watch-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pg0KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDE5LjEuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPg0KPHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJDYXBhXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgMzY4LjU1MyAzNjguNTUzIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bm [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "File Watch"
@@ -48,7 +48,7 @@ spec:
   dependencies:
     - "camel:file-watch"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: "file-watch:{{filePath}}"
       parameters:
diff --git a/connectors/camel-ftp-sink-kafka-connector/src/main/docs/examples/CamelFtpsinkSinkConnector.properties b/connectors/camel-ftp-sink-kafka-connector/src/main/docs/examples/CamelFtpsinkSinkConnector.properties
index 1e587ecc8..bdabf94c1 100644
--- a/connectors/camel-ftp-sink-kafka-connector/src/main/docs/examples/CamelFtpsinkSinkConnector.properties
+++ b/connectors/camel-ftp-sink-kafka-connector/src/main/docs/examples/CamelFtpsinkSinkConnector.properties
@@ -38,4 +38,3 @@ camel.kamelet.ftp-sink.directoryName=
 camel.kamelet.ftp-sink.password=
 # The username to access the FTP server
 camel.kamelet.ftp-sink.username=
-
diff --git a/connectors/camel-ftp-sink-kafka-connector/src/main/resources/kamelets/ftp-sink.kamelet.yaml b/connectors/camel-ftp-sink-kafka-connector/src/main/resources/kamelets/ftp-sink.kamelet.yaml
index d69c3d634..86671e805 100644
--- a/connectors/camel-ftp-sink-kafka-connector/src/main/resources/kamelets/ftp-sink.kamelet.yaml
+++ b/connectors/camel-ftp-sink-kafka-connector/src/main/resources/kamelets/ftp-sink.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: ftp-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxOS4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiDQoJIHZpZXdCb3g9IjAgMCAyMjEuMSAzMDAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwID [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "FTP"
@@ -88,7 +88,7 @@ spec:
     - "camel:ftp"
     - "camel:core"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: "kamelet:source"
       steps:
diff --git a/connectors/camel-ftp-source-kafka-connector/src/main/docs/examples/CamelFtpsourceSourceConnector.properties b/connectors/camel-ftp-source-kafka-connector/src/main/docs/examples/CamelFtpsourceSourceConnector.properties
index b7c31af10..867ba47f2 100644
--- a/connectors/camel-ftp-source-kafka-connector/src/main/docs/examples/CamelFtpsourceSourceConnector.properties
+++ b/connectors/camel-ftp-source-kafka-connector/src/main/docs/examples/CamelFtpsourceSourceConnector.properties
@@ -38,4 +38,3 @@ camel.kamelet.ftp-source.directoryName=
 camel.kamelet.ftp-source.password=
 # The username to access the FTP server
 camel.kamelet.ftp-source.username=
-
diff --git a/connectors/camel-ftp-source-kafka-connector/src/main/resources/kamelets/ftp-source.kamelet.yaml b/connectors/camel-ftp-source-kafka-connector/src/main/resources/kamelets/ftp-source.kamelet.yaml
index 116428dbe..8947430e0 100644
--- a/connectors/camel-ftp-source-kafka-connector/src/main/resources/kamelets/ftp-source.kamelet.yaml
+++ b/connectors/camel-ftp-source-kafka-connector/src/main/resources/kamelets/ftp-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: ftp-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxOS4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiDQoJIHZpZXdCb3g9IjAgMCAyMjEuMSAzMDAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwID [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "FTP"
@@ -91,7 +91,7 @@ spec:
     - "camel:ftp"
     - "camel:core"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: "ftp:{{username}}@{{connectionHost}}:{{connectionPort}}/{{directoryName}}"
       parameters:
diff --git a/connectors/camel-ftps-sink-kafka-connector/src/main/docs/examples/CamelFtpssinkSinkConnector.properties b/connectors/camel-ftps-sink-kafka-connector/src/main/docs/examples/CamelFtpssinkSinkConnector.properties
index d6431a854..8e064dfd4 100644
--- a/connectors/camel-ftps-sink-kafka-connector/src/main/docs/examples/CamelFtpssinkSinkConnector.properties
+++ b/connectors/camel-ftps-sink-kafka-connector/src/main/docs/examples/CamelFtpssinkSinkConnector.properties
@@ -38,4 +38,3 @@ camel.kamelet.ftps-sink.directoryName=
 camel.kamelet.ftps-sink.password=
 # The username to access the FTP server
 camel.kamelet.ftps-sink.username=
-
diff --git a/connectors/camel-ftps-sink-kafka-connector/src/main/resources/kamelets/ftps-sink.kamelet.yaml b/connectors/camel-ftps-sink-kafka-connector/src/main/resources/kamelets/ftps-sink.kamelet.yaml
index 6e28d0f18..6fff5db1b 100644
--- a/connectors/camel-ftps-sink-kafka-connector/src/main/resources/kamelets/ftps-sink.kamelet.yaml
+++ b/connectors/camel-ftps-sink-kafka-connector/src/main/resources/kamelets/ftps-sink.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: ftps-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxOS4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiDQoJIHZpZXdCb3g9IjAgMCAyMjEuMSAzMDAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwID [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "FTP"
@@ -88,7 +88,7 @@ spec:
     - "camel:ftp"
     - "camel:core"
     - "camel:kamelet"
-  flow:
+  template:
     from:
       uri: "kamelet:source"
       steps:
diff --git a/connectors/camel-ftps-source-kafka-connector/src/main/docs/examples/CamelFtpssourceSourceConnector.properties b/connectors/camel-ftps-source-kafka-connector/src/main/docs/examples/CamelFtpssourceSourceConnector.properties
index 00ed10c18..03c81db01 100644
--- a/connectors/camel-ftps-source-kafka-connector/src/main/docs/examples/CamelFtpssourceSourceConnector.properties
+++ b/connectors/camel-ftps-source-kafka-connector/src/main/docs/examples/CamelFtpssourceSourceConnector.properties
@@ -38,4 +38,3 @@ camel.kamelet.ftps-source.directoryName=
 camel.kamelet.ftps-source.password=
 # The username to access the FTPS server
 camel.kamelet.ftps-source.username=
-
diff --git a/connectors/camel-ftps-source-kafka-connector/src/main/resources/kamelets/ftps-source.kamelet.yaml b/connectors/camel-ftps-source-kafka-connector/src/main/resources/kamelets/ftps-source.kamelet.yaml
index 30ce06c3f..00184cce7 100644
--- a/connectors/camel-ftps-source-kafka-connector/src/main/resources/kamelets/ftps-source.kamelet.yaml
+++ b/connectors/camel-ftps-source-kafka-connector/src/main/resources/kamelets/ftps-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: ftps-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "0.6.0"
+    camel.apache.org/catalog.version: "0.8.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxOS4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiDQoJIHZpZXdCb3g9IjAgMCAyMjEuMSAzMDAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwID [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "FTP"
@@ -91,7 +91,7 @@ spec:
... 10753 lines suppressed ...