You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2026/07/09 10:24:50 UTC

(camel-kafka-connector) branch feature/1787-eliminate-generated-task-classes updated (44863db919 -> 7b69bbddaf)

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

oscerd pushed a change to branch feature/1787-eliminate-generated-task-classes
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git


 discard 44863db919 Eliminate generated Task classes from connector modules (#1787)
     new 7b69bbddaf Eliminate generated Task classes from connector modules (#1787)

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (44863db919)
            \
             N -- N -- N   refs/heads/feature/1787-eliminate-generated-task-classes (7b69bbddaf)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:


(camel-kafka-connector) 01/01: Eliminate generated Task classes from connector modules (#1787)

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

oscerd pushed a commit to branch feature/1787-eliminate-generated-task-classes
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 7b69bbddaf7ffd9a6fb7c0eb4761669162ce113c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jul 9 12:24:01 2026 +0200

    Eliminate generated Task classes from connector modules (#1787)
    
    Move connector-specific defaults (component name, kamelet URI) from
    generated Task subclasses into the Connector via a new
    getConnectorDefaults() hook, and read the kamelet URI from a new
    camel.{sink,source}.kamelet config property instead of requiring
    a Task subclass override.
    
    This removes 193 generated Task files (~6,800 lines of boilerplate),
    simplifies each generated Connector to just config() and
    getConnectorDefaults(), and reduces the per-connector surface from
    3 generated Java classes to 2 (Connector + ConnectorConfig).
    
    Key changes:
    - Add camel.sink.kamelet / camel.source.kamelet config keys to base
      ConnectorConfig classes
    - Add getConnectorDefaults() to CamelSinkConnector/CamelSourceConnector,
      merged into task configs via taskConfigs()
    - Modify CamelSinkTask/CamelSourceTask to read kamelet from config
      with backward-compatible fallback to getSinkKamelet()/getSourceKamelet()
    - Update generator mojos to stop producing Task classes and generate
      Connector with getConnectorDefaults() instead of taskClass()
    - Update hand-written syslog Tasks to extend base classes directly
    
    Co-Authored-By: Claude Opus 4.6 (1M context) <no...@anthropic.com>
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 ...melAwsbedrockagentruntimesinkSinkConnector.java |  8 ++--
 .../CamelAwsbedrockagentruntimesinkSinkTask.java   | 37 --------------
 .../aws-bedrock-agent-runtime-sink.kamelet.yaml    |  2 +-
 .../CamelAwsbedrocktextsinkSinkConnector.java      |  8 ++--
 .../CamelAwsbedrocktextsinkSinkTask.java           | 37 --------------
 .../kamelets/aws-bedrock-text-sink.kamelet.yaml    |  2 +-
 .../CamelAwscloudtrailsourceSourceConnector.java   |  8 ++--
 .../CamelAwscloudtrailsourceSourceTask.java        | 37 --------------
 .../kamelets/aws-cloudtrail-source.kamelet.yaml    |  2 +-
 .../CamelAwscloudwatchsinkSinkConnector.java       |  8 ++--
 .../CamelAwscloudwatchsinkSinkTask.java            | 37 --------------
 .../kamelets/aws-cloudwatch-sink.kamelet.yaml      |  2 +-
 .../CamelAwscomprehendsinkSinkConnector.java       |  8 ++--
 .../CamelAwscomprehendsinkSinkTask.java            | 37 --------------
 .../kamelets/aws-comprehend-sink.kamelet.yaml      |  2 +-
 .../awsddbsink/CamelAwsddbsinkSinkConnector.java   |  8 ++--
 .../awsddbsink/CamelAwsddbsinkSinkTask.java        | 37 --------------
 .../resources/kamelets/aws-ddb-sink.kamelet.yaml   |  2 +-
 .../CamelAwsddbstreamssourceSourceConnector.java   |  8 ++--
 .../CamelAwsddbstreamssourceSourceTask.java        | 37 --------------
 .../kamelets/aws-ddb-streams-source.kamelet.yaml   |  2 +-
 .../awsec2sink/CamelAwsec2sinkSinkConnector.java   |  8 ++--
 .../awsec2sink/CamelAwsec2sinkSinkTask.java        | 37 --------------
 .../resources/kamelets/aws-ec2-sink.kamelet.yaml   |  2 +-
 .../CamelAwseventbridgesinkSinkConnector.java      |  8 ++--
 .../CamelAwseventbridgesinkSinkTask.java           | 37 --------------
 .../kamelets/aws-eventbridge-sink.kamelet.yaml     |  2 +-
 .../CamelAwskinesisfirehosesinkSinkConnector.java  |  8 ++--
 .../CamelAwskinesisfirehosesinkSinkTask.java       | 37 --------------
 .../aws-kinesis-firehose-sink.kamelet.yaml         |  2 +-
 .../CamelAwskinesissinkSinkConnector.java          |  8 ++--
 .../CamelAwskinesissinkSinkTask.java               | 37 --------------
 .../kamelets/aws-kinesis-sink.kamelet.yaml         |  2 +-
 .../CamelAwskinesissourceSourceConnector.java      |  8 ++--
 .../CamelAwskinesissourceSourceTask.java           | 37 --------------
 .../kamelets/aws-kinesis-source.kamelet.yaml       |  2 +-
 .../CamelAwslambdasinkSinkConnector.java           |  8 ++--
 .../awslambdasink/CamelAwslambdasinkSinkTask.java  | 37 --------------
 .../kamelets/aws-lambda-sink.kamelet.yaml          |  2 +-
 .../CamelAwspollysinkSinkConnector.java            |  8 ++--
 .../awspollysink/CamelAwspollysinkSinkTask.java    | 37 --------------
 .../resources/kamelets/aws-polly-sink.kamelet.yaml |  2 +-
 .../CamelAwsredshiftsinkSinkConnector.java         |  8 ++--
 .../CamelAwsredshiftsinkSinkTask.java              | 37 --------------
 .../kamelets/aws-redshift-sink.kamelet.yaml        |  4 +-
 .../CamelAwsredshiftsourceSourceConnector.java     |  8 ++--
 .../CamelAwsredshiftsourceSourceTask.java          | 37 --------------
 .../kamelets/aws-redshift-source.kamelet.yaml      | 14 +++---
 .../CamelAwss3eventbasedsourceSourceConnector.java |  8 ++--
 .../CamelAwss3eventbasedsourceSourceTask.java      | 37 --------------
 .../aws-s3-event-based-source.kamelet.yaml         |  4 +-
 .../awss3sink/CamelAwss3sinkSinkConnector.java     |  8 ++--
 .../awss3sink/CamelAwss3sinkSinkTask.java          | 37 --------------
 .../resources/kamelets/aws-s3-sink.kamelet.yaml    |  2 +-
 .../CamelAwss3sourceSourceConnector.java           |  8 ++--
 .../awss3source/CamelAwss3sourceSourceTask.java    | 37 --------------
 .../resources/kamelets/aws-s3-source.kamelet.yaml  |  2 +-
 ...CamelAwss3streaminguploadsinkSinkConnector.java |  8 ++--
 .../CamelAwss3streaminguploadsinkSinkTask.java     | 37 --------------
 .../aws-s3-streaming-upload-sink.kamelet.yaml      |  2 +-
 .../CamelAwssecretsmanagersinkSinkConnector.java   |  8 ++--
 .../CamelAwssecretsmanagersinkSinkTask.java        | 37 --------------
 .../kamelets/aws-secrets-manager-sink.kamelet.yaml |  2 +-
 .../awssessink/CamelAwssessinkSinkConnector.java   |  8 ++--
 .../awssessink/CamelAwssessinkSinkTask.java        | 37 --------------
 .../resources/kamelets/aws-ses-sink.kamelet.yaml   |  2 +-
 .../CamelAwssnsfifosinkSinkConnector.java          |  8 ++--
 .../CamelAwssnsfifosinkSinkTask.java               | 37 --------------
 .../kamelets/aws-sns-fifo-sink.kamelet.yaml        |  2 +-
 .../awssnssink/CamelAwssnssinkSinkConnector.java   |  8 ++--
 .../awssnssink/CamelAwssnssinkSinkTask.java        | 37 --------------
 .../resources/kamelets/aws-sns-sink.kamelet.yaml   |  2 +-
 .../CamelAwssqsbatchsinkSinkConnector.java         |  8 ++--
 .../CamelAwssqsbatchsinkSinkTask.java              | 37 --------------
 .../kamelets/aws-sqs-batch-sink.kamelet.yaml       |  2 +-
 .../CamelAwssqsfifosinkSinkConnector.java          |  8 ++--
 .../CamelAwssqsfifosinkSinkTask.java               | 37 --------------
 .../kamelets/aws-sqs-fifo-sink.kamelet.yaml        |  2 +-
 .../awssqssink/CamelAwssqssinkSinkConnector.java   |  8 ++--
 .../awssqssink/CamelAwssqssinkSinkTask.java        | 37 --------------
 .../resources/kamelets/aws-sqs-sink.kamelet.yaml   |  2 +-
 .../CamelAwssqssourceSourceConnector.java          |  8 ++--
 .../awssqssource/CamelAwssqssourceSourceTask.java  | 37 --------------
 .../resources/kamelets/aws-sqs-source.kamelet.yaml |  2 +-
 .../CamelAwstimestreamquerysinkSinkConnector.java  |  8 ++--
 .../CamelAwstimestreamquerysinkSinkTask.java       | 37 --------------
 .../aws-timestream-query-sink.kamelet.yaml         |  2 +-
 .../aws2iam/CamelAws2iamSinkConnector.java         |  8 ++--
 .../aws2iam/CamelAws2iamSinkTask.java              | 39 ---------------
 .../aws2kms/CamelAws2kmsSinkConnector.java         |  8 ++--
 .../aws2kms/CamelAws2kmsSinkTask.java              | 39 ---------------
 .../CamelAzurecosmosdbsinkSinkConnector.java       |  8 ++--
 .../CamelAzurecosmosdbsinkSinkTask.java            | 37 --------------
 .../kamelets/azure-cosmosdb-sink.kamelet.yaml      |  2 +-
 .../CamelAzurecosmosdbsourceSourceConnector.java   |  8 ++--
 .../CamelAzurecosmosdbsourceSourceTask.java        | 37 --------------
 .../kamelets/azure-cosmosdb-source.kamelet.yaml    |  2 +-
 .../CamelAzureeventhubssinkSinkConnector.java      |  8 ++--
 .../CamelAzureeventhubssinkSinkTask.java           | 37 --------------
 .../kamelets/azure-eventhubs-sink.kamelet.yaml     |  2 +-
 .../CamelAzureeventhubssourceSourceConnector.java  |  8 ++--
 .../CamelAzureeventhubssourceSourceTask.java       | 37 --------------
 .../kamelets/azure-eventhubs-source.kamelet.yaml   |  2 +-
 .../CamelAzurefunctionssinkSinkConnector.java      |  8 ++--
 .../CamelAzurefunctionssinkSinkTask.java           | 37 --------------
 .../kamelets/azure-functions-sink.kamelet.yaml     |  2 +-
 .../CamelAzureservicebussinkSinkConnector.java     |  8 ++--
 .../CamelAzureservicebussinkSinkTask.java          | 37 --------------
 .../kamelets/azure-servicebus-sink.kamelet.yaml    |  2 +-
 .../CamelAzureservicebussourceSourceConnector.java |  8 ++--
 .../CamelAzureservicebussourceSourceTask.java      | 37 --------------
 .../kamelets/azure-servicebus-source.kamelet.yaml  |  2 +-
 ...melAzurestorageblobappendsinkSinkConnector.java |  8 ++--
 .../CamelAzurestorageblobappendsinkSinkTask.java   | 37 --------------
 .../azure-storage-blob-append-sink.kamelet.yaml    |  2 +-
 ...storageblobchangefeedsourceSourceConnector.java |  8 ++--
 ...AzurestorageblobchangefeedsourceSourceTask.java | 39 ---------------
 ...ure-storage-blob-changefeed-source.kamelet.yaml |  2 +-
 ...storageblobeventbasedsourceSourceConnector.java |  8 ++--
 ...AzurestorageblobeventbasedsourceSourceTask.java | 39 ---------------
 ...re-storage-blob-event-based-source.kamelet.yaml |  2 +-
 .../CamelAzurestorageblobsinkSinkConnector.java    |  8 ++--
 .../CamelAzurestorageblobsinkSinkTask.java         | 37 --------------
 .../kamelets/azure-storage-blob-sink.kamelet.yaml  |  2 +-
 ...CamelAzurestorageblobsourceSourceConnector.java |  8 ++--
 .../CamelAzurestorageblobsourceSourceTask.java     | 37 --------------
 .../azure-storage-blob-source.kamelet.yaml         |  2 +-
 ...CamelAzurestoragedatalakesinkSinkConnector.java |  8 ++--
 .../CamelAzurestoragedatalakesinkSinkTask.java     | 37 --------------
 .../azure-storage-datalake-sink.kamelet.yaml       |  2 +-
 ...lAzurestoragedatalakesourceSourceConnector.java |  8 ++--
 .../CamelAzurestoragedatalakesourceSourceTask.java | 39 ---------------
 .../azure-storage-datalake-source.kamelet.yaml     |  2 +-
 .../CamelAzurestoragefilessinkSinkConnector.java   |  8 ++--
 .../CamelAzurestoragefilessinkSinkTask.java        | 37 --------------
 .../kamelets/azure-storage-files-sink.kamelet.yaml |  2 +-
 ...amelAzurestoragefilessourceSourceConnector.java |  8 ++--
 .../CamelAzurestoragefilessourceSourceTask.java    | 37 --------------
 .../azure-storage-files-source.kamelet.yaml        |  2 +-
 .../CamelAzurestoragequeuesinkSinkConnector.java   |  8 ++--
 .../CamelAzurestoragequeuesinkSinkTask.java        | 37 --------------
 .../kamelets/azure-storage-queue-sink.kamelet.yaml |  2 +-
 ...amelAzurestoragequeuesourceSourceConnector.java |  8 ++--
 .../CamelAzurestoragequeuesourceSourceTask.java    | 37 --------------
 .../azure-storage-queue-source.kamelet.yaml        |  2 +-
 .../CamelBitcoinsourceSourceConnector.java         |  8 ++--
 .../CamelBitcoinsourceSourceTask.java              | 37 --------------
 .../resources/kamelets/bitcoin-source.kamelet.yaml |  2 +-
 .../CamelCassandrasinkSinkConnector.java           |  8 ++--
 .../cassandrasink/CamelCassandrasinkSinkTask.java  | 37 --------------
 .../resources/kamelets/cassandra-sink.kamelet.yaml |  2 +-
 .../CamelCassandrasourceSourceConnector.java       |  8 ++--
 .../CamelCassandrasourceSourceTask.java            | 37 --------------
 .../kamelets/cassandra-source.kamelet.yaml         |  2 +-
 .../cephsink/CamelCephsinkSinkConnector.java       |  8 ++--
 .../cephsink/CamelCephsinkSinkTask.java            | 37 --------------
 .../main/resources/kamelets/ceph-sink.kamelet.yaml |  2 +-
 .../cephsource/CamelCephsourceSourceConnector.java |  8 ++--
 .../cephsource/CamelCephsourceSourceTask.java      | 37 --------------
 .../resources/kamelets/ceph-source.kamelet.yaml    |  2 +-
 .../CamelChucknorrissourceSourceConnector.java     |  8 ++--
 .../CamelChucknorrissourceSourceTask.java          | 37 --------------
 .../kamelets/chuck-norris-source.kamelet.yaml      |  2 +-
 .../CamelCouchbasesinkSinkConnector.java           |  8 ++--
 .../couchbasesink/CamelCouchbasesinkSinkTask.java  | 37 --------------
 .../resources/kamelets/couchbase-sink.kamelet.yaml |  2 +-
 .../CamelCountersourceSourceConnector.java         |  8 ++--
 .../CamelCountersourceSourceTask.java              | 37 --------------
 .../resources/kamelets/counter-source.kamelet.yaml |  2 +-
 .../cronsource/CamelCronsourceSourceConnector.java |  8 ++--
 .../cronsource/CamelCronsourceSourceTask.java      | 37 --------------
 .../resources/kamelets/cron-source.kamelet.yaml    |  2 +-
 .../kafkaconnector/cxf/CamelCxfSinkConnector.java  |  8 ++--
 .../camel/kafkaconnector/cxf/CamelCxfSinkTask.java | 39 ---------------
 .../cxf/CamelCxfSourceConnector.java               |  8 ++--
 .../kafkaconnector/cxf/CamelCxfSourceTask.java     | 39 ---------------
 .../cxfrs/CamelCxfrsSinkConnector.java             |  8 ++--
 .../kafkaconnector/cxfrs/CamelCxfrsSinkTask.java   | 39 ---------------
 .../cxfrs/CamelCxfrsSourceConnector.java           |  8 ++--
 .../kafkaconnector/cxfrs/CamelCxfrsSourceTask.java | 39 ---------------
 .../CamelDatabrickssinkSinkConnector.java          |  8 ++--
 .../CamelDatabrickssinkSinkTask.java               | 37 --------------
 .../kamelets/databricks-sink.kamelet.yaml          |  2 +-
 .../CamelDatabrickssourceSourceConnector.java      |  8 ++--
 .../CamelDatabrickssourceSourceTask.java           | 37 --------------
 .../kamelets/databricks-source.kamelet.yaml        |  2 +-
 .../dropboxsink/CamelDropboxsinkSinkConnector.java |  8 ++--
 .../dropboxsink/CamelDropboxsinkSinkTask.java      | 37 --------------
 .../resources/kamelets/dropbox-sink.kamelet.yaml   |  2 +-
 .../CamelDropboxsourceSourceConnector.java         |  8 ++--
 .../CamelDropboxsourceSourceTask.java              | 37 --------------
 .../resources/kamelets/dropbox-source.kamelet.yaml |  2 +-
 .../CamelEarthquakesourceSourceConnector.java      |  8 ++--
 .../CamelEarthquakesourceSourceTask.java           | 37 --------------
 .../kamelets/earthquake-source.kamelet.yaml        |  2 +-
 .../CamelElasticsearchindexsinkSinkConnector.java  |  8 ++--
 .../CamelElasticsearchindexsinkSinkTask.java       | 37 --------------
 .../kamelets/elasticsearch-index-sink.kamelet.yaml | 10 ++--
 ...elElasticsearchsearchsourceSourceConnector.java |  8 ++--
 .../CamelElasticsearchsearchsourceSourceTask.java  | 37 --------------
 .../elasticsearch-search-source.kamelet.yaml       |  2 +-
 .../execsink/CamelExecsinkSinkConnector.java       |  8 ++--
 .../execsink/CamelExecsinkSinkTask.java            | 37 --------------
 .../main/resources/kamelets/exec-sink.kamelet.yaml |  2 +-
 .../fhirsink/CamelFhirsinkSinkConnector.java       |  8 ++--
 .../fhirsink/CamelFhirsinkSinkTask.java            | 37 --------------
 .../main/resources/kamelets/fhir-sink.kamelet.yaml |  2 +-
 .../fhirsource/CamelFhirsourceSourceConnector.java |  8 ++--
 .../fhirsource/CamelFhirsourceSourceTask.java      | 37 --------------
 .../resources/kamelets/fhir-source.kamelet.yaml    |  2 +-
 .../file/CamelFileSinkConnector.java               |  8 ++--
 .../kafkaconnector/file/CamelFileSinkTask.java     | 39 ---------------
 .../file/CamelFileSourceConnector.java             |  8 ++--
 .../kafkaconnector/file/CamelFileSourceTask.java   | 39 ---------------
 .../CamelFilewatchsourceSourceConnector.java       |  8 ++--
 .../CamelFilewatchsourceSourceTask.java            | 37 --------------
 .../kamelets/file-watch-source.kamelet.yaml        |  2 +-
 .../ftpsink/CamelFtpsinkSinkConnector.java         |  8 ++--
 .../ftpsink/CamelFtpsinkSinkTask.java              | 37 --------------
 .../main/resources/kamelets/ftp-sink.kamelet.yaml  |  2 +-
 .../ftpsource/CamelFtpsourceSourceConnector.java   |  8 ++--
 .../ftpsource/CamelFtpsourceSourceTask.java        | 37 --------------
 .../resources/kamelets/ftp-source.kamelet.yaml     |  2 +-
 .../ftpssink/CamelFtpssinkSinkConnector.java       |  8 ++--
 .../ftpssink/CamelFtpssinkSinkTask.java            | 37 --------------
 .../main/resources/kamelets/ftps-sink.kamelet.yaml |  2 +-
 .../ftpssource/CamelFtpssourceSourceConnector.java |  8 ++--
 .../ftpssource/CamelFtpssourceSourceTask.java      | 37 --------------
 .../resources/kamelets/ftps-source.kamelet.yaml    |  2 +-
 .../CamelGooglebigquerysinkSinkConnector.java      |  8 ++--
 .../CamelGooglebigquerysinkSinkTask.java           | 37 --------------
 .../kamelets/google-bigquery-sink.kamelet.yaml     |  2 +-
 .../CamelGooglecalendarsourceSourceConnector.java  |  8 ++--
 .../CamelGooglecalendarsourceSourceTask.java       | 37 --------------
 .../kamelets/google-calendar-source.kamelet.yaml   |  2 +-
 .../CamelGooglefunctionssinkSinkConnector.java     |  8 ++--
 .../CamelGooglefunctionssinkSinkTask.java          | 37 --------------
 .../kamelets/google-functions-sink.kamelet.yaml    |  2 +-
 .../CamelGooglemailsourceSourceConnector.java      |  8 ++--
 .../CamelGooglemailsourceSourceTask.java           | 37 --------------
 .../kamelets/google-mail-source.kamelet.yaml       |  2 +-
 .../CamelGooglepubsubsinkSinkConnector.java        |  8 ++--
 .../CamelGooglepubsubsinkSinkTask.java             | 37 --------------
 .../kamelets/google-pubsub-sink.kamelet.yaml       |  2 +-
 .../CamelGooglepubsubsourceSourceConnector.java    |  8 ++--
 .../CamelGooglepubsubsourceSourceTask.java         | 37 --------------
 .../kamelets/google-pubsub-source.kamelet.yaml     |  2 +-
 .../CamelGooglesheetssinkSinkConnector.java        |  8 ++--
 .../CamelGooglesheetssinkSinkTask.java             | 37 --------------
 .../kamelets/google-sheets-sink.kamelet.yaml       |  2 +-
 .../CamelGooglesheetssourceSourceConnector.java    |  8 ++--
 .../CamelGooglesheetssourceSourceTask.java         | 37 --------------
 .../kamelets/google-sheets-source.kamelet.yaml     |  2 +-
 ...oglestorageeventbasedsourceSourceConnector.java |  8 ++--
 ...melGooglestorageeventbasedsourceSourceTask.java | 39 ---------------
 .../google-storage-event-based-source.kamelet.yaml |  2 +-
 .../CamelGooglestoragesinkSinkConnector.java       |  8 ++--
 .../CamelGooglestoragesinkSinkTask.java            | 37 --------------
 .../kamelets/google-storage-sink.kamelet.yaml      |  2 +-
 .../CamelGooglestoragesourceSourceConnector.java   |  8 ++--
 .../CamelGooglestoragesourceSourceTask.java        | 37 --------------
 .../kamelets/google-storage-source.kamelet.yaml    |  2 +-
 .../CamelGooglevertexaisinkSinkConnector.java      |  8 ++--
 .../CamelGooglevertexaisinkSinkTask.java           | 37 --------------
 .../kamelets/google-vertexai-sink.kamelet.yaml     |  2 +-
 .../graphqlsink/CamelGraphqlsinkSinkConnector.java |  8 ++--
 .../graphqlsink/CamelGraphqlsinkSinkTask.java      | 37 --------------
 .../resources/kamelets/graphql-sink.kamelet.yaml   |  2 +-
 .../CamelHttpsecuredsinkSinkConnector.java         |  8 ++--
 .../CamelHttpsecuredsinkSinkTask.java              | 37 --------------
 .../kamelets/http-secured-sink.kamelet.yaml        |  2 +-
 .../CamelHttpsecuredsourceSourceConnector.java     |  8 ++--
 .../CamelHttpsecuredsourceSourceTask.java          | 37 --------------
 .../kamelets/http-secured-source.kamelet.yaml      |  2 +-
 .../httpsink/CamelHttpsinkSinkConnector.java       |  8 ++--
 .../httpsink/CamelHttpsinkSinkTask.java            | 37 --------------
 .../main/resources/kamelets/http-sink.kamelet.yaml |  2 +-
 .../httpsource/CamelHttpsourceSourceConnector.java |  8 ++--
 .../httpsource/CamelHttpsourceSourceTask.java      | 37 --------------
 .../resources/kamelets/http-source.kamelet.yaml    |  2 +-
 .../https/CamelHttpsSinkConnector.java             |  8 ++--
 .../kafkaconnector/https/CamelHttpsSinkTask.java   | 39 ---------------
 .../ibmcossink/CamelIbmcossinkSinkConnector.java   |  8 ++--
 .../ibmcossink/CamelIbmcossinkSinkTask.java        | 37 --------------
 .../resources/kamelets/ibm-cos-sink.kamelet.yaml   |  2 +-
 .../CamelIbmcossourceSourceConnector.java          |  8 ++--
 .../ibmcossource/CamelIbmcossourceSourceTask.java  | 37 --------------
 .../resources/kamelets/ibm-cos-source.kamelet.yaml |  2 +-
 .../CamelIbmwatsonlanguagesinkSinkConnector.java   |  8 ++--
 .../CamelIbmwatsonlanguagesinkSinkTask.java        | 37 --------------
 .../kamelets/ibm-watson-language-sink.kamelet.yaml |  2 +-
 .../CamelInfinispansinkSinkConnector.java          |  8 ++--
 .../CamelInfinispansinkSinkTask.java               | 37 --------------
 .../kamelets/infinispan-sink.kamelet.yaml          |  2 +-
 .../CamelInfinispansourceSourceConnector.java      |  8 ++--
 .../CamelInfinispansourceSourceTask.java           | 37 --------------
 .../kamelets/infinispan-source.kamelet.yaml        |  2 +-
 .../jdbc/CamelJdbcSinkConnector.java               |  8 ++--
 .../kafkaconnector/jdbc/CamelJdbcSinkTask.java     | 39 ---------------
 .../CamelJmsamqp10sinkSinkConnector.java           |  8 ++--
 .../jmsamqp10sink/CamelJmsamqp10sinkSinkTask.java  | 37 --------------
 .../kamelets/jms-amqp-10-sink.kamelet.yaml         |  2 +-
 .../CamelJmsamqp10sourceSourceConnector.java       |  8 ++--
 .../CamelJmsamqp10sourceSourceTask.java            | 37 --------------
 .../kamelets/jms-amqp-10-source.kamelet.yaml       |  2 +-
 .../CamelJmsapacheartemissinkSinkConnector.java    |  8 ++--
 .../CamelJmsapacheartemissinkSinkTask.java         | 37 --------------
 .../kamelets/jms-apache-artemis-sink.kamelet.yaml  |  4 +-
 ...CamelJmsapacheartemissourceSourceConnector.java |  8 ++--
 .../CamelJmsapacheartemissourceSourceTask.java     | 37 --------------
 .../jms-apache-artemis-source.kamelet.yaml         |  4 +-
 .../CamelJmsibmmqsinkSinkConnector.java            |  8 ++--
 .../jmsibmmqsink/CamelJmsibmmqsinkSinkTask.java    | 37 --------------
 .../kamelets/jms-ibm-mq-sink.kamelet.yaml          |  2 +-
 .../CamelJmsibmmqsourceSourceConnector.java        |  8 ++--
 .../CamelJmsibmmqsourceSourceTask.java             | 37 --------------
 .../kamelets/jms-ibm-mq-source.kamelet.yaml        |  2 +-
 ...melJmspooledapacheartemissinkSinkConnector.java |  8 ++--
 .../CamelJmspooledapacheartemissinkSinkTask.java   | 37 --------------
 .../jms-pooled-apache-artemis-sink.kamelet.yaml    |  5 +-
 ...mspooledapacheartemissourceSourceConnector.java |  8 ++--
 ...amelJmspooledapacheartemissourceSourceTask.java | 39 ---------------
 .../jms-pooled-apache-artemis-source.kamelet.yaml  |  5 +-
 ...picurioregistrynotsecuredsinkSinkConnector.java |  8 ++--
 ...afkaapicurioregistrynotsecuredsinkSinkTask.java | 39 ---------------
 ...apicurio-registry-not-secured-sink.kamelet.yaml | 10 ++--
 ...rioregistrynotsecuredsourceSourceConnector.java |  8 ++--
 ...apicurioregistrynotsecuredsourceSourceTask.java | 39 ---------------
 ...icurio-registry-not-secured-source.kamelet.yaml |  2 +-
 ...lKafkaazureschemaregistrysinkSinkConnector.java |  8 ++--
 .../CamelKafkaazureschemaregistrysinkSinkTask.java | 37 --------------
 .../kafka-azure-schema-registry-sink.kamelet.yaml  | 10 ++--
 ...kaazureschemaregistrysourceSourceConnector.java |  8 ++--
 ...elKafkaazureschemaregistrysourceSourceTask.java | 39 ---------------
 ...kafka-azure-schema-registry-source.kamelet.yaml |  2 +-
 ...rioregistrynotsecuredsourceSourceConnector.java |  8 ++--
 ...apicurioregistrynotsecuredsourceSourceTask.java | 39 ---------------
 ...icurio-registry-not-secured-source.kamelet.yaml |  2 +-
 ...batchapicurioregistrysourceSourceConnector.java |  8 ++--
 ...KafkabatchapicurioregistrysourceSourceTask.java | 39 ---------------
 ...fka-batch-apicurio-registry-source.kamelet.yaml |  2 +-
 ...chazureschemaregistrysourceSourceConnector.java |  8 ++--
 ...kabatchazureschemaregistrysourceSourceTask.java | 39 ---------------
 ...batch-azure-schema-registry-source.kamelet.yaml |  2 +-
 .../CamelKafkabatchsourceSourceConnector.java      |  8 ++--
 .../CamelKafkabatchsourceSourceTask.java           | 37 --------------
 .../kamelets/kafka-batch-source.kamelet.yaml       |  2 +-
 ...dapicurioregistryjsonsourceSourceConnector.java |  8 ++--
 ...ecuredapicurioregistryjsonsourceSourceTask.java | 39 ---------------
 ...ured-apicurio-registry-json-source.kamelet.yaml |  2 +-
 ...otsecuredapicurioregistrysinkSinkConnector.java |  8 ++--
 ...afkanotsecuredapicurioregistrysinkSinkTask.java | 39 ---------------
 ...not-secured-apicurio-registry-sink.kamelet.yaml | 10 ++--
 ...curedapicurioregistrysourceSourceConnector.java |  8 ++--
 ...notsecuredapicurioregistrysourceSourceTask.java | 39 ---------------
 ...t-secured-apicurio-registry-source.kamelet.yaml |  2 +-
 .../kafkasink/CamelKafkasinkSinkConnector.java     |  8 ++--
 .../kafkasink/CamelKafkasinkSinkTask.java          | 37 --------------
 .../resources/kamelets/kafka-sink.kamelet.yaml     | 10 ++--
 .../CamelKafkasourceSourceConnector.java           |  8 ++--
 .../kafkasource/CamelKafkasourceSourceTask.java    | 37 --------------
 .../resources/kamelets/kafka-source.kamelet.yaml   |  2 +-
 ...lKubernetesnamespacessourceSourceConnector.java |  8 ++--
 .../CamelKubernetesnamespacessourceSourceTask.java | 39 ---------------
 .../kubernetes-namespaces-source.kamelet.yaml      |  2 +-
 .../CamelKubernetesnodessourceSourceConnector.java |  8 ++--
 .../CamelKubernetesnodessourceSourceTask.java      | 37 --------------
 .../kamelets/kubernetes-nodes-source.kamelet.yaml  |  2 +-
 .../CamelKubernetespodssourceSourceConnector.java  |  8 ++--
 .../CamelKubernetespodssourceSourceTask.java       | 37 --------------
 .../kamelets/kubernetes-pods-source.kamelet.yaml   |  2 +-
 .../logsink/CamelLogsinkSinkConnector.java         |  8 ++--
 .../logsink/CamelLogsinkSinkTask.java              | 37 --------------
 .../main/resources/kamelets/log-sink.kamelet.yaml  |  2 +-
 .../CamelMailimapsourceSourceConnector.java        |  8 ++--
 .../CamelMailimapsourceSourceTask.java             | 37 --------------
 .../kamelets/mail-imap-source.kamelet.yaml         |  2 +-
 .../mailsink/CamelMailsinkSinkConnector.java       |  8 ++--
 .../mailsink/CamelMailsinkSinkTask.java            | 37 --------------
 .../main/resources/kamelets/mail-sink.kamelet.yaml |  2 +-
 .../mariadbsink/CamelMariadbsinkSinkConnector.java |  8 ++--
 .../mariadbsink/CamelMariadbsinkSinkTask.java      | 37 --------------
 .../resources/kamelets/mariadb-sink.kamelet.yaml   |  2 +-
 .../CamelMariadbsourceSourceConnector.java         |  8 ++--
 .../CamelMariadbsourceSourceTask.java              | 37 --------------
 .../resources/kamelets/mariadb-source.kamelet.yaml |  2 +-
 .../miniosink/CamelMiniosinkSinkConnector.java     |  8 ++--
 .../miniosink/CamelMiniosinkSinkTask.java          | 37 --------------
 .../resources/kamelets/minio-sink.kamelet.yaml     |  2 +-
 .../CamelMiniosourceSourceConnector.java           |  8 ++--
 .../miniosource/CamelMiniosourceSourceTask.java    | 37 --------------
 .../resources/kamelets/minio-source.kamelet.yaml   |  2 +-
 ...lMongodbchangesstreamsourceSourceConnector.java |  8 ++--
 .../CamelMongodbchangesstreamsourceSourceTask.java | 39 ---------------
 .../mongodb-changes-stream-source.kamelet.yaml     |  2 +-
 .../mongodbsink/CamelMongodbsinkSinkConnector.java |  8 ++--
 .../mongodbsink/CamelMongodbsinkSinkTask.java      | 37 --------------
 .../resources/kamelets/mongodb-sink.kamelet.yaml   |  2 +-
 .../CamelMongodbsourceSourceConnector.java         |  8 ++--
 .../CamelMongodbsourceSourceTask.java              | 37 --------------
 .../resources/kamelets/mongodb-source.kamelet.yaml |  2 +-
 .../mqttsink/CamelMqttsinkSinkConnector.java       |  8 ++--
 .../mqttsink/CamelMqttsinkSinkTask.java            | 37 --------------
 .../main/resources/kamelets/mqtt-sink.kamelet.yaml |  2 +-
 .../mqttsource/CamelMqttsourceSourceConnector.java |  8 ++--
 .../mqttsource/CamelMqttsourceSourceTask.java      | 37 --------------
 .../resources/kamelets/mqtt-source.kamelet.yaml    |  2 +-
 .../mqtt5sink/CamelMqtt5sinkSinkConnector.java     |  8 ++--
 .../mqtt5sink/CamelMqtt5sinkSinkTask.java          | 37 --------------
 .../resources/kamelets/mqtt5-sink.kamelet.yaml     |  2 +-
 .../CamelMqtt5sourceSourceConnector.java           |  8 ++--
 .../mqtt5source/CamelMqtt5sourceSourceTask.java    | 37 --------------
 .../resources/kamelets/mqtt5-source.kamelet.yaml   |  2 +-
 .../mysqlsink/CamelMysqlsinkSinkConnector.java     |  8 ++--
 .../mysqlsink/CamelMysqlsinkSinkTask.java          | 37 --------------
 .../resources/kamelets/mysql-sink.kamelet.yaml     |  2 +-
 .../CamelMysqlsourceSourceConnector.java           |  8 ++--
 .../mysqlsource/CamelMysqlsourceSourceTask.java    | 37 --------------
 .../resources/kamelets/mysql-source.kamelet.yaml   |  2 +-
 .../natssink/CamelNatssinkSinkConnector.java       |  8 ++--
 .../natssink/CamelNatssinkSinkTask.java            | 37 --------------
 .../main/resources/kamelets/nats-sink.kamelet.yaml |  2 +-
 .../natssource/CamelNatssourceSourceConnector.java |  8 ++--
 .../natssource/CamelNatssourceSourceTask.java      | 37 --------------
 .../resources/kamelets/nats-source.kamelet.yaml    |  2 +-
 .../nettyhttp/CamelNettyhttpSinkConnector.java     |  8 ++--
 .../nettyhttp/CamelNettyhttpSinkTask.java          | 39 ---------------
 .../nettyhttp/CamelNettyhttpSourceConnector.java   |  8 ++--
 .../nettyhttp/CamelNettyhttpSourceTask.java        | 39 ---------------
 .../netty/CamelNettySinkConnector.java             |  8 ++--
 .../kafkaconnector/netty/CamelNettySinkTask.java   | 39 ---------------
 .../netty/CamelNettySourceConnector.java           |  8 ++--
 .../kafkaconnector/netty/CamelNettySourceTask.java | 39 ---------------
 .../CamelOpensearchindexsinkSinkConnector.java     |  8 ++--
 .../CamelOpensearchindexsinkSinkTask.java          | 37 --------------
 .../kamelets/opensearch-index-sink.kamelet.yaml    | 10 ++--
 ...CamelOpensearchsearchsourceSourceConnector.java |  8 ++--
 .../CamelOpensearchsearchsourceSourceTask.java     | 37 --------------
 .../kamelets/opensearch-search-source.kamelet.yaml |  2 +-
 .../CamelOracledatabasesinkSinkConnector.java      |  8 ++--
 .../CamelOracledatabasesinkSinkTask.java           | 37 --------------
 .../kamelets/oracle-database-sink.kamelet.yaml     |  2 +-
 .../CamelOracledatabasesourceSourceConnector.java  |  8 ++--
 .../CamelOracledatabasesourceSourceTask.java       | 37 --------------
 .../kamelets/oracle-database-source.kamelet.yaml   |  2 +-
 .../CamelPostgresqlsinkSinkConnector.java          |  8 ++--
 .../CamelPostgresqlsinkSinkTask.java               | 37 --------------
 .../kamelets/postgresql-sink.kamelet.yaml          |  4 +-
 .../CamelPostgresqlsourceSourceConnector.java      |  8 ++--
 .../CamelPostgresqlsourceSourceTask.java           | 37 --------------
 .../kamelets/postgresql-source.kamelet.yaml        |  4 +-
 .../pulsarsink/CamelPulsarsinkSinkConnector.java   |  8 ++--
 .../pulsarsink/CamelPulsarsinkSinkTask.java        | 37 --------------
 .../resources/kamelets/pulsar-sink.kamelet.yaml    |  8 +---
 .../CamelPulsarsourceSourceConnector.java          |  8 ++--
 .../pulsarsource/CamelPulsarsourceSourceTask.java  | 37 --------------
 .../resources/kamelets/pulsar-source.kamelet.yaml  |  2 +-
 .../redissink/CamelRedissinkSinkConnector.java     |  8 ++--
 .../redissink/CamelRedissinkSinkTask.java          | 37 --------------
 .../resources/kamelets/redis-sink.kamelet.yaml     |  2 +-
 .../CamelRedissourceSourceConnector.java           |  8 ++--
 .../redissource/CamelRedissourceSourceTask.java    | 37 --------------
 .../resources/kamelets/redis-source.kamelet.yaml   |  2 +-
 .../CamelRestopenapisinkSinkConnector.java         |  8 ++--
 .../CamelRestopenapisinkSinkTask.java              | 37 --------------
 .../kamelets/rest-openapi-sink.kamelet.yaml        |  2 +-
 ...SalesforcecompositeupsertsinkSinkConnector.java |  8 ++--
 ...CamelSalesforcecompositeupsertsinkSinkTask.java | 37 --------------
 .../salesforce-composite-upsert-sink.kamelet.yaml  |  2 +-
 .../CamelSalesforcecreatesinkSinkConnector.java    |  8 ++--
 .../CamelSalesforcecreatesinkSinkTask.java         | 37 --------------
 .../kamelets/salesforce-create-sink.kamelet.yaml   |  2 +-
 .../CamelSalesforcedeletesinkSinkConnector.java    |  8 ++--
 .../CamelSalesforcedeletesinkSinkTask.java         | 37 --------------
 .../kamelets/salesforce-delete-sink.kamelet.yaml   | 10 ++--
 .../CamelSalesforcesourceSourceConnector.java      |  8 ++--
 .../CamelSalesforcesourceSourceTask.java           | 37 --------------
 .../kamelets/salesforce-source.kamelet.yaml        |  2 +-
 .../CamelSalesforceupdatesinkSinkConnector.java    |  8 ++--
 .../CamelSalesforceupdatesinkSinkTask.java         | 37 --------------
 .../kamelets/salesforce-update-sink.kamelet.yaml   |  6 +--
 .../scpsink/CamelScpsinkSinkConnector.java         |  8 ++--
 .../scpsink/CamelScpsinkSinkTask.java              | 37 --------------
 .../main/resources/kamelets/scp-sink.kamelet.yaml  |  9 ++--
 .../sftpsink/CamelSftpsinkSinkConnector.java       |  8 ++--
 .../sftpsink/CamelSftpsinkSinkTask.java            | 37 --------------
 .../main/resources/kamelets/sftp-sink.kamelet.yaml |  5 +-
 .../sftpsource/CamelSftpsourceSourceConnector.java |  8 ++--
 .../sftpsource/CamelSftpsourceSourceTask.java      | 37 --------------
 .../resources/kamelets/sftp-source.kamelet.yaml    |  5 +-
 .../sjms2/CamelSjms2SinkConnector.java             |  8 ++--
 .../kafkaconnector/sjms2/CamelSjms2SinkTask.java   | 39 ---------------
 .../sjms2/CamelSjms2SourceConnector.java           |  8 ++--
 .../kafkaconnector/sjms2/CamelSjms2SourceTask.java | 39 ---------------
 .../slacksink/CamelSlacksinkSinkConnector.java     |  8 ++--
 .../slacksink/CamelSlacksinkSinkTask.java          | 37 --------------
 .../resources/kamelets/slack-sink.kamelet.yaml     | 19 +-------
 .../CamelSlacksourceSourceConnector.java           |  8 ++--
 .../slacksource/CamelSlacksourceSourceTask.java    | 37 --------------
 .../resources/kamelets/slack-source.kamelet.yaml   |  2 +-
 .../CamelSnowflakesinkSinkConnector.java           |  8 ++--
 .../snowflakesink/CamelSnowflakesinkSinkTask.java  | 37 --------------
 .../resources/kamelets/snowflake-sink.kamelet.yaml |  2 +-
 .../CamelSnowflakesourceSourceConnector.java       |  8 ++--
 .../CamelSnowflakesourceSourceTask.java            | 37 --------------
 .../kamelets/snowflake-source.kamelet.yaml         |  2 +-
 .../solrsink/CamelSolrsinkSinkConnector.java       |  8 ++--
 .../solrsink/CamelSolrsinkSinkTask.java            | 37 --------------
 .../main/resources/kamelets/solr-sink.kamelet.yaml |  2 +-
 .../solrsource/CamelSolrsourceSourceConnector.java |  8 ++--
 .../solrsource/CamelSolrsourceSourceTask.java      | 37 --------------
 .../resources/kamelets/solr-source.kamelet.yaml    |  2 +-
 .../CamelSplunkhecsinkSinkConnector.java           |  8 ++--
 .../splunkhecsink/CamelSplunkhecsinkSinkTask.java  | 37 --------------
 .../kamelets/splunk-hec-sink.kamelet.yaml          |  2 +-
 .../splunksink/CamelSplunksinkSinkConnector.java   |  8 ++--
 .../splunksink/CamelSplunksinkSinkTask.java        | 37 --------------
 .../resources/kamelets/splunk-sink.kamelet.yaml    |  2 +-
 .../CamelSplunksourceSourceConnector.java          |  8 ++--
 .../splunksource/CamelSplunksourceSourceTask.java  | 37 --------------
 .../resources/kamelets/splunk-source.kamelet.yaml  |  2 +-
 .../CamelSpringrabbitmqsinkSinkConnector.java      |  8 ++--
 .../CamelSpringrabbitmqsinkSinkTask.java           | 37 --------------
 .../kamelets/spring-rabbitmq-sink.kamelet.yaml     |  3 +-
 .../CamelSpringrabbitmqsourceSourceConnector.java  |  8 ++--
 .../CamelSpringrabbitmqsourceSourceTask.java       | 37 --------------
 .../kamelets/spring-rabbitmq-source.kamelet.yaml   |  3 +-
 .../CamelSqlserversinkSinkConnector.java           |  8 ++--
 .../sqlserversink/CamelSqlserversinkSinkTask.java  | 37 --------------
 .../resources/kamelets/sqlserver-sink.kamelet.yaml |  2 +-
 .../CamelSqlserversourceSourceConnector.java       |  8 ++--
 .../CamelSqlserversourceSourceTask.java            | 37 --------------
 .../kamelets/sqlserver-source.kamelet.yaml         |  2 +-
 .../sshsink/CamelSshsinkSinkConnector.java         |  8 ++--
 .../sshsink/CamelSshsinkSinkTask.java              | 37 --------------
 .../main/resources/kamelets/ssh-sink.kamelet.yaml  |  2 +-
 .../sshsource/CamelSshsourceSourceConnector.java   |  8 ++--
 .../sshsource/CamelSshsourceSourceTask.java        | 37 --------------
 .../resources/kamelets/ssh-source.kamelet.yaml     |  2 +-
 .../kafkaconnector/syslog/CamelSyslogSinkTask.java |  5 +-
 .../syslog/CamelSyslogSourceTask.java              |  5 +-
 .../CamelTelegramsinkSinkConnector.java            |  8 ++--
 .../telegramsink/CamelTelegramsinkSinkTask.java    | 37 --------------
 .../resources/kamelets/telegram-sink.kamelet.yaml  |  2 +-
 .../CamelTelegramsourceSourceConnector.java        |  8 ++--
 .../CamelTelegramsourceSourceTask.java             | 37 --------------
 .../kamelets/telegram-source.kamelet.yaml          |  2 +-
 .../CamelTimersourceSourceConnector.java           |  8 ++--
 .../timersource/CamelTimersourceSourceTask.java    | 37 --------------
 .../resources/kamelets/timer-source.kamelet.yaml   |  2 +-
 ...lTwitterdirectmessagesourceSourceConnector.java |  8 ++--
 .../CamelTwitterdirectmessagesourceSourceTask.java | 39 ---------------
 .../twitter-directmessage-source.kamelet.yaml      |  2 +-
 .../CamelTwittersearchsourceSourceConnector.java   |  8 ++--
 .../CamelTwittersearchsourceSourceTask.java        | 37 --------------
 .../kamelets/twitter-search-source.kamelet.yaml    |  2 +-
 .../CamelTwittertimelinesourceSourceConnector.java |  8 ++--
 .../CamelTwittertimelinesourceSourceTask.java      | 37 --------------
 .../kamelets/twitter-timeline-source.kamelet.yaml  |  2 +-
 .../CamelWebhooksourceSourceConnector.java         |  8 ++--
 .../CamelWebhooksourceSourceTask.java              | 37 --------------
 .../resources/kamelets/webhook-source.kamelet.yaml |  2 +-
 .../CamelWttrinsourceSourceConnector.java          |  8 ++--
 .../wttrinsource/CamelWttrinsourceSourceTask.java  | 37 --------------
 .../resources/kamelets/wttrin-source.kamelet.yaml  |  2 +-
 .../camel/kafkaconnector/CamelSinkConnector.java   | 15 +++++-
 .../kafkaconnector/CamelSinkConnectorConfig.java   |  5 ++
 .../apache/camel/kafkaconnector/CamelSinkTask.java |  8 +++-
 .../camel/kafkaconnector/CamelSourceConnector.java | 15 +++++-
 .../kafkaconnector/CamelSourceConnectorConfig.java |  5 ++
 .../camel/kafkaconnector/CamelSourceTask.java      |  8 +++-
 .../CamelKafkaConnectorKameletUpdateMojo.java      | 56 ++++++++--------------
 .../maven/CamelKafkaConnectorUpdateMojo.java       | 50 ++++++++-----------
 573 files changed, 1294 insertions(+), 8111 deletions(-)

diff --git a/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsbedrockagentruntimesink/CamelAwsbedrockagentruntimesinkSinkConnector.java b/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsbedrockagentruntimesink/CamelAwsbedrockagentruntimesinkSinkConnector.java
index b010c82296..6ac0b91f8a 100644
--- a/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsbedrockagentruntimesink/CamelAwsbedrockagentruntimesinkSinkConnector.java
+++ b/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsbedrockagentruntimesink/CamelAwsbedrockagentruntimesinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awsbedrockagentruntimesink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwsbedrockagentruntimesinkSinkConnector
@@ -31,7 +33,7 @@ public class CamelAwsbedrockagentruntimesinkSinkConnector
         return CamelAwsbedrockagentruntimesinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwsbedrockagentruntimesinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-bedrock-agent-runtime-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsbedrockagentruntimesink/CamelAwsbedrockagentruntimesinkSinkTask.java b/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsbedrockagentruntimesink/CamelAwsbedrockagentruntimesinkSinkTask.java
deleted file mode 100644
index 29fd43308b..0000000000
--- a/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsbedrockagentruntimesink/CamelAwsbedrockagentruntimesinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsbedrockagentruntimesink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsbedrockagentruntimesinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwsbedrockagentruntimesinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-bedrock-agent-runtime-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/main/resources/kamelets/aws-bedrock-agent-runtime-sink.kamelet.yaml b/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/main/resources/kamelets/aws-bedrock-agent-runtime-sink.kamelet.yaml
index 5f4e60dac9..b9dde944cd 100644
--- a/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/main/resources/kamelets/aws-bedrock-agent-runtime-sink.kamelet.yaml
+++ b/connectors/camel-aws-bedrock-agent-runtime-sink-kafka-connector/src/main/resources/kamelets/aws-bedrock-agent-runtime-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-bedrock-agent-runtime-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjxzdmcgZGF0YS1uYW1lPSJMYXllciAxIiBpZD0iTGF5ZXJfMSIgdmlld0JveD0iMCAwIDUxMiA1MTIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTQzMC40MiwxOTYuMzJjOC0xMS4zOSwyMS4xNS0zOC4zMywwLTcyLjEzYTUyLjc5LDUyLjc5LDAsMCwwLTE3LjA2LTE3LjMxYy0xLjUzLTgtNy41NC0yNy4yNi0zMS40Mi00My45MUMzNTksNDcsMzI1LjUyLDQ5LjUzLDMxOS40NCw1MC4xNmE2NC4yNyw2NC4yNywwLDAsMC0xNi4wNy0yLjk0Yy0xNy4xNy0uODEtMzAuMzcsMy44OS0zOS43OCwxNC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS Bedrock"
diff --git a/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsbedrocktextsink/CamelAwsbedrocktextsinkSinkConnector.java b/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsbedrocktextsink/CamelAwsbedrocktextsinkSinkConnector.java
index 7f6c620d56..578721f677 100644
--- a/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsbedrocktextsink/CamelAwsbedrocktextsinkSinkConnector.java
+++ b/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsbedrocktextsink/CamelAwsbedrocktextsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awsbedrocktextsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwsbedrocktextsinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAwsbedrocktextsinkSinkConnector extends CamelSinkConnector {
         return CamelAwsbedrocktextsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwsbedrocktextsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-bedrock-text-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsbedrocktextsink/CamelAwsbedrocktextsinkSinkTask.java b/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsbedrocktextsink/CamelAwsbedrocktextsinkSinkTask.java
deleted file mode 100644
index d2ea30857a..0000000000
--- a/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsbedrocktextsink/CamelAwsbedrocktextsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsbedrocktextsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsbedrocktextsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwsbedrocktextsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-bedrock-text-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/main/resources/kamelets/aws-bedrock-text-sink.kamelet.yaml b/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/main/resources/kamelets/aws-bedrock-text-sink.kamelet.yaml
index 264fba6afd..42c3731cc4 100644
--- a/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/main/resources/kamelets/aws-bedrock-text-sink.kamelet.yaml
+++ b/connectors/camel-aws-bedrock-text-sink-kafka-connector/src/main/resources/kamelets/aws-bedrock-text-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-bedrock-text-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjxzdmcgZGF0YS1uYW1lPSJMYXllciAxIiBpZD0iTGF5ZXJfMSIgdmlld0JveD0iMCAwIDUxMiA1MTIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTQzMC40MiwxOTYuMzJjOC0xMS4zOSwyMS4xNS0zOC4zMywwLTcyLjEzYTUyLjc5LDUyLjc5LDAsMCwwLTE3LjA2LTE3LjMxYy0xLjUzLTgtNy41NC0yNy4yNi0zMS40Mi00My45MUMzNTksNDcsMzI1LjUyLDQ5LjUzLDMxOS40NCw1MC4xNmE2NC4yNyw2NC4yNywwLDAsMC0xNi4wNy0yLjk0Yy0xNy4xNy0uODEtMzAuMzcsMy44OS0zOS43OCwxNC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS Bedrock"
diff --git a/connectors/camel-aws-cloudtrail-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscloudtrailsource/CamelAwscloudtrailsourceSourceConnector.java b/connectors/camel-aws-cloudtrail-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscloudtrailsource/CamelAwscloudtrailsourceSourceConnector.java
index 21ec42eb01..2e02adc57d 100644
--- a/connectors/camel-aws-cloudtrail-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscloudtrailsource/CamelAwscloudtrailsourceSourceConnector.java
+++ b/connectors/camel-aws-cloudtrail-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscloudtrailsource/CamelAwscloudtrailsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awscloudtrailsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelAwscloudtrailsourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelAwscloudtrailsourceSourceConnector
         return CamelAwscloudtrailsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwscloudtrailsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:aws-cloudtrail-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-cloudtrail-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscloudtrailsource/CamelAwscloudtrailsourceSourceTask.java b/connectors/camel-aws-cloudtrail-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscloudtrailsource/CamelAwscloudtrailsourceSourceTask.java
deleted file mode 100644
index 99a487b0e0..0000000000
--- a/connectors/camel-aws-cloudtrail-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscloudtrailsource/CamelAwscloudtrailsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awscloudtrailsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwscloudtrailsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwscloudtrailsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:aws-cloudtrail-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-cloudtrail-source-kafka-connector/src/main/resources/kamelets/aws-cloudtrail-source.kamelet.yaml b/connectors/camel-aws-cloudtrail-source-kafka-connector/src/main/resources/kamelets/aws-cloudtrail-source.kamelet.yaml
index 72060edee9..c046186425 100644
--- a/connectors/camel-aws-cloudtrail-source-kafka-connector/src/main/resources/kamelets/aws-cloudtrail-source.kamelet.yaml
+++ b/connectors/camel-aws-cloudtrail-source-kafka-connector/src/main/resources/kamelets/aws-cloudtrail-source.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-cloudtrail-source
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNzQuMzc1IDg1IiBmaWxsPSIjZmZmIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIj48dXNlIHhsaW5rOmhyZWY9IiNBIiB4PSIyLjE4OCIgeT0iMi41Ii8+PHN5bWJvbCBpZD0iQSIgb3ZlcmZsb3c9InZpc2libGUiPjxnIHN0cm9rZT0ibm9uZSI+PHBhdGggZD0iTTkuOTY2IDM1LjQ5M2wtMi4yODguMT [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS Cloudtrail"
diff --git a/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscloudwatchsink/CamelAwscloudwatchsinkSinkConnector.java b/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscloudwatchsink/CamelAwscloudwatchsinkSinkConnector.java
index c250f256f3..31ef1b5ab4 100644
--- a/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscloudwatchsink/CamelAwscloudwatchsinkSinkConnector.java
+++ b/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscloudwatchsink/CamelAwscloudwatchsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awscloudwatchsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwscloudwatchsinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAwscloudwatchsinkSinkConnector extends CamelSinkConnector {
         return CamelAwscloudwatchsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwscloudwatchsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-cloudwatch-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscloudwatchsink/CamelAwscloudwatchsinkSinkTask.java b/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscloudwatchsink/CamelAwscloudwatchsinkSinkTask.java
deleted file mode 100644
index 1f2d7dc063..0000000000
--- a/connectors/camel-aws-cloudwatch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscloudwatchsink/CamelAwscloudwatchsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awscloudwatchsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwscloudwatchsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwscloudwatchsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-cloudwatch-sink";
-    }
-}
\ 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 96060c9988..3e5b52251e 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-comprehend-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscomprehendsink/CamelAwscomprehendsinkSinkConnector.java b/connectors/camel-aws-comprehend-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscomprehendsink/CamelAwscomprehendsinkSinkConnector.java
index 89e9c74763..374ad072c6 100644
--- a/connectors/camel-aws-comprehend-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscomprehendsink/CamelAwscomprehendsinkSinkConnector.java
+++ b/connectors/camel-aws-comprehend-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscomprehendsink/CamelAwscomprehendsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awscomprehendsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwscomprehendsinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAwscomprehendsinkSinkConnector extends CamelSinkConnector {
         return CamelAwscomprehendsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwscomprehendsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-comprehend-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-comprehend-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscomprehendsink/CamelAwscomprehendsinkSinkTask.java b/connectors/camel-aws-comprehend-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscomprehendsink/CamelAwscomprehendsinkSinkTask.java
deleted file mode 100644
index 3a9e82fc7b..0000000000
--- a/connectors/camel-aws-comprehend-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscomprehendsink/CamelAwscomprehendsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awscomprehendsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwscomprehendsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwscomprehendsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-comprehend-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-comprehend-sink-kafka-connector/src/main/resources/kamelets/aws-comprehend-sink.kamelet.yaml b/connectors/camel-aws-comprehend-sink-kafka-connector/src/main/resources/kamelets/aws-comprehend-sink.kamelet.yaml
index 63929b6d81..879c88b75a 100644
--- a/connectors/camel-aws-comprehend-sink-kafka-connector/src/main/resources/kamelets/aws-comprehend-sink.kamelet.yaml
+++ b/connectors/camel-aws-comprehend-sink-kafka-connector/src/main/resources/kamelets/aws-comprehend-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-comprehend-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjxzdmcgZGF0YS1uYW1lPSJMYXllciAxIiBpZD0iTGF5ZXJfMSIgdmlld0JveD0iMCAwIDUxMiA1MTIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTQzMC40MiwxOTYuMzJjOC0xMS4zOSwyMS4xNS0zOC4zMywwLTcyLjEzYTUyLjc5LDUyLjc5LDAsMCwwLTE3LjA2LTE3LjMxYy0xLjUzLTgtNy41NC0yNy4yNi0zMS40Mi00My45MUMzNTksNDcsMzI1LjUyLDQ5LjUzLDMxOS40NCw1MC4xNmE2NC4yNyw2NC4yNywwLDAsMC0xNi4wNy0yLjk0Yy0xNy4xNy0uODEtMzAuMzcsMy44OS0zOS43OCwxNC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS Comprehend"
diff --git a/connectors/camel-aws-ddb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkConnector.java b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkConnector.java
index 92c311311a..542aa6a368 100644
--- a/connectors/camel-aws-ddb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkConnector.java
+++ b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awsddbsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwsddbsinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAwsddbsinkSinkConnector extends CamelSinkConnector {
         return CamelAwsddbsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwsddbsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-ddb-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-ddb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkTask.java b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkTask.java
deleted file mode 100644
index bbf4741f61..0000000000
--- a/connectors/camel-aws-ddb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsddbsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsddbsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwsddbsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-ddb-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/kamelets/aws-ddb-sink.kamelet.yaml b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/kamelets/aws-ddb-sink.kamelet.yaml
index 2ad87cdc93..80abe74866 100644
--- a/connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/kamelets/aws-ddb-sink.kamelet.yaml
+++ b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/kamelets/aws-ddb-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-ddb-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstreamssource/CamelAwsddbstreamssourceSourceConnector.java b/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstreamssource/CamelAwsddbstreamssourceSourceConnector.java
index 3e6fdb8c9f..e45639e9c8 100644
--- a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstreamssource/CamelAwsddbstreamssourceSourceConnector.java
+++ b/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstreamssource/CamelAwsddbstreamssourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awsddbstreamssource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelAwsddbstreamssourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelAwsddbstreamssourceSourceConnector
         return CamelAwsddbstreamssourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwsddbstreamssourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:aws-ddb-streams-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstreamssource/CamelAwsddbstreamssourceSourceTask.java b/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstreamssource/CamelAwsddbstreamssourceSourceTask.java
deleted file mode 100644
index 6cda41180d..0000000000
--- a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstreamssource/CamelAwsddbstreamssourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsddbstreamssource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsddbstreamssourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwsddbstreamssourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:aws-ddb-streams-source";
-    }
-}
\ 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 2de79598b4..91c3683d85 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-ec2-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkConnector.java b/connectors/camel-aws-ec2-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkConnector.java
index 84dc8f15d4..aaa940feea 100644
--- a/connectors/camel-aws-ec2-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkConnector.java
+++ b/connectors/camel-aws-ec2-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awsec2sink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwsec2sinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAwsec2sinkSinkConnector extends CamelSinkConnector {
         return CamelAwsec2sinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwsec2sinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-ec2-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-ec2-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkTask.java b/connectors/camel-aws-ec2-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkTask.java
deleted file mode 100644
index 87f7b875b8..0000000000
--- a/connectors/camel-aws-ec2-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsec2sink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsec2sinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwsec2sinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-ec2-sink";
-    }
-}
\ 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 829c062b85..34676a2a06 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-eventbridge-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseventbridgesink/CamelAwseventbridgesinkSinkConnector.java b/connectors/camel-aws-eventbridge-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseventbridgesink/CamelAwseventbridgesinkSinkConnector.java
index b141640e1f..ea6c4f9879 100644
--- a/connectors/camel-aws-eventbridge-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseventbridgesink/CamelAwseventbridgesinkSinkConnector.java
+++ b/connectors/camel-aws-eventbridge-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseventbridgesink/CamelAwseventbridgesinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awseventbridgesink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwseventbridgesinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAwseventbridgesinkSinkConnector extends CamelSinkConnector {
         return CamelAwseventbridgesinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwseventbridgesinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-eventbridge-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-eventbridge-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseventbridgesink/CamelAwseventbridgesinkSinkTask.java b/connectors/camel-aws-eventbridge-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseventbridgesink/CamelAwseventbridgesinkSinkTask.java
deleted file mode 100644
index 88a40c9a1e..0000000000
--- a/connectors/camel-aws-eventbridge-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseventbridgesink/CamelAwseventbridgesinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awseventbridgesink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwseventbridgesinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwseventbridgesinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-eventbridge-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-eventbridge-sink-kafka-connector/src/main/resources/kamelets/aws-eventbridge-sink.kamelet.yaml b/connectors/camel-aws-eventbridge-sink-kafka-connector/src/main/resources/kamelets/aws-eventbridge-sink.kamelet.yaml
index 30ff56ee7a..6f8a8b8826 100644
--- a/connectors/camel-aws-eventbridge-sink-kafka-connector/src/main/resources/kamelets/aws-eventbridge-sink.kamelet.yaml
+++ b/connectors/camel-aws-eventbridge-sink-kafka-connector/src/main/resources/kamelets/aws-eventbridge-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-eventbridge-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMWVtIiBoZWlnaHQ9IjFlbSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ieE1pZFlNaWQgbWVldCIgdmlld0JveD0iMCAwIDI1NiAyNTYiIHN0eWxlPSItbXMtdHJhbnNmb3JtOiByb3RhdGUoMzYwZGVnKTsgLXdlYmtpdC10cmFuc2Zvcm06IHJvdGF0ZSgzNjBkZWcpOyB0cmFuc2Zvcm06IHJvdGF0ZSgzNjBkZWcpOyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJJY29uaWZ5SWQtMTgyM2Y2NTU1NjktYWYxZGQ1LT [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS Eventbridge"
diff --git a/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehosesink/CamelAwskinesisfirehosesinkSinkConnector.java b/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehosesink/CamelAwskinesisfirehosesinkSinkConnector.java
index f20bfce254..c8f4a460c3 100644
--- a/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehosesink/CamelAwskinesisfirehosesinkSinkConnector.java
+++ b/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehosesink/CamelAwskinesisfirehosesinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awskinesisfirehosesink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwskinesisfirehosesinkSinkConnector
@@ -31,7 +33,7 @@ public class CamelAwskinesisfirehosesinkSinkConnector
         return CamelAwskinesisfirehosesinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwskinesisfirehosesinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-kinesis-firehose-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehosesink/CamelAwskinesisfirehosesinkSinkTask.java b/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehosesink/CamelAwskinesisfirehosesinkSinkTask.java
deleted file mode 100644
index 493b14d974..0000000000
--- a/connectors/camel-aws-kinesis-firehose-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehosesink/CamelAwskinesisfirehosesinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awskinesisfirehosesink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwskinesisfirehosesinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwskinesisfirehosesinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-kinesis-firehose-sink";
-    }
-}
\ 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 4483dcb466..59a673b1d9 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissink/CamelAwskinesissinkSinkConnector.java b/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissink/CamelAwskinesissinkSinkConnector.java
index 1a170d64da..ed883cd456 100644
--- a/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissink/CamelAwskinesissinkSinkConnector.java
+++ b/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissink/CamelAwskinesissinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awskinesissink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwskinesissinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAwskinesissinkSinkConnector extends CamelSinkConnector {
         return CamelAwskinesissinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwskinesissinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-kinesis-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissink/CamelAwskinesissinkSinkTask.java b/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissink/CamelAwskinesissinkSinkTask.java
deleted file mode 100644
index 47ca961abf..0000000000
--- a/connectors/camel-aws-kinesis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissink/CamelAwskinesissinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awskinesissink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwskinesissinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwskinesissinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-kinesis-sink";
-    }
-}
\ 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 41650065ed..32d8b58d70 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-kinesis-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissource/CamelAwskinesissourceSourceConnector.java b/connectors/camel-aws-kinesis-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissource/CamelAwskinesissourceSourceConnector.java
index 74dcd74927..4d7bf43412 100644
--- a/connectors/camel-aws-kinesis-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissource/CamelAwskinesissourceSourceConnector.java
+++ b/connectors/camel-aws-kinesis-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissource/CamelAwskinesissourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awskinesissource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelAwskinesissourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelAwskinesissourceSourceConnector
         return CamelAwskinesissourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwskinesissourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:aws-kinesis-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissource/CamelAwskinesissourceSourceTask.java b/connectors/camel-aws-kinesis-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissource/CamelAwskinesissourceSourceTask.java
deleted file mode 100644
index f36c432835..0000000000
--- a/connectors/camel-aws-kinesis-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesissource/CamelAwskinesissourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awskinesissource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwskinesissourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwskinesissourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:aws-kinesis-source";
-    }
-}
\ 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 f2b8ef3e73..f945932905 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-lambda-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambdasink/CamelAwslambdasinkSinkConnector.java b/connectors/camel-aws-lambda-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambdasink/CamelAwslambdasinkSinkConnector.java
index cac4854f92..cd96af1b38 100644
--- a/connectors/camel-aws-lambda-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambdasink/CamelAwslambdasinkSinkConnector.java
+++ b/connectors/camel-aws-lambda-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambdasink/CamelAwslambdasinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awslambdasink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwslambdasinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAwslambdasinkSinkConnector extends CamelSinkConnector {
         return CamelAwslambdasinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwslambdasinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-lambda-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-lambda-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambdasink/CamelAwslambdasinkSinkTask.java b/connectors/camel-aws-lambda-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambdasink/CamelAwslambdasinkSinkTask.java
deleted file mode 100644
index 1782a1ae58..0000000000
--- a/connectors/camel-aws-lambda-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambdasink/CamelAwslambdasinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awslambdasink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwslambdasinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwslambdasinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-lambda-sink";
-    }
-}
\ 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 0c95ab0d98..eca14510fa 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-polly-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awspollysink/CamelAwspollysinkSinkConnector.java b/connectors/camel-aws-polly-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awspollysink/CamelAwspollysinkSinkConnector.java
index af8fa4393c..6c5d2d7eae 100644
--- a/connectors/camel-aws-polly-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awspollysink/CamelAwspollysinkSinkConnector.java
+++ b/connectors/camel-aws-polly-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awspollysink/CamelAwspollysinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awspollysink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwspollysinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAwspollysinkSinkConnector extends CamelSinkConnector {
         return CamelAwspollysinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwspollysinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-polly-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-polly-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awspollysink/CamelAwspollysinkSinkTask.java b/connectors/camel-aws-polly-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awspollysink/CamelAwspollysinkSinkTask.java
deleted file mode 100644
index 042abd00f7..0000000000
--- a/connectors/camel-aws-polly-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awspollysink/CamelAwspollysinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awspollysink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwspollysinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwspollysinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-polly-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-polly-sink-kafka-connector/src/main/resources/kamelets/aws-polly-sink.kamelet.yaml b/connectors/camel-aws-polly-sink-kafka-connector/src/main/resources/kamelets/aws-polly-sink.kamelet.yaml
index c246046b85..4abab7fb9f 100644
--- a/connectors/camel-aws-polly-sink-kafka-connector/src/main/resources/kamelets/aws-polly-sink.kamelet.yaml
+++ b/connectors/camel-aws-polly-sink-kafka-connector/src/main/resources/kamelets/aws-polly-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-polly-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjxzdmcgZGF0YS1uYW1lPSJMYXllciAxIiBpZD0iTGF5ZXJfMSIgdmlld0JveD0iMCAwIDUxMiA1MTIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTQzMC40MiwxOTYuMzJjOC0xMS4zOSwyMS4xNS0zOC4zMywwLTcyLjEzYTUyLjc5LDUyLjc5LDAsMCwwLTE3LjA2LTE3LjMxYy0xLjUzLTgtNy41NC0yNy4yNi0zMS40Mi00My45MUMzNTksNDcsMzI1LjUyLDQ5LjUzLDMxOS40NCw1MC4xNmE2NC4yNyw2NC4yNywwLDAsMC0xNi4wNy0yLjk0Yy0xNy4xNy0uODEtMzAuMzcsMy44OS0zOS43OCwxNC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS Polly"
diff --git a/connectors/camel-aws-redshift-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsredshiftsink/CamelAwsredshiftsinkSinkConnector.java b/connectors/camel-aws-redshift-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsredshiftsink/CamelAwsredshiftsinkSinkConnector.java
index eda70a9a88..866b3d7a93 100644
--- a/connectors/camel-aws-redshift-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsredshiftsink/CamelAwsredshiftsinkSinkConnector.java
+++ b/connectors/camel-aws-redshift-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsredshiftsink/CamelAwsredshiftsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awsredshiftsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwsredshiftsinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAwsredshiftsinkSinkConnector extends CamelSinkConnector {
         return CamelAwsredshiftsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwsredshiftsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-redshift-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-redshift-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsredshiftsink/CamelAwsredshiftsinkSinkTask.java b/connectors/camel-aws-redshift-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsredshiftsink/CamelAwsredshiftsinkSinkTask.java
deleted file mode 100644
index 33b6c9e501..0000000000
--- a/connectors/camel-aws-redshift-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsredshiftsink/CamelAwsredshiftsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsredshiftsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsredshiftsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwsredshiftsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-redshift-sink";
-    }
-}
\ No newline at end of file
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 e32c117053..703a3002cf 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
@@ -69,7 +69,7 @@ spec:
         example: 'INSERT INTO accounts (username,city) VALUES (:#username,:#city)'
       databaseName:
         title: Database Name
-        description: The name of the AWS RedShift Database.
+        description: The name of the AWS Redshift Database.
         type: string
   types:
     in:
diff --git a/connectors/camel-aws-redshift-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsredshiftsource/CamelAwsredshiftsourceSourceConnector.java b/connectors/camel-aws-redshift-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsredshiftsource/CamelAwsredshiftsourceSourceConnector.java
index 64f50c520e..4e95afa2b9 100644
--- a/connectors/camel-aws-redshift-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsredshiftsource/CamelAwsredshiftsourceSourceConnector.java
+++ b/connectors/camel-aws-redshift-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsredshiftsource/CamelAwsredshiftsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awsredshiftsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelAwsredshiftsourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelAwsredshiftsourceSourceConnector
         return CamelAwsredshiftsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwsredshiftsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:aws-redshift-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-redshift-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsredshiftsource/CamelAwsredshiftsourceSourceTask.java b/connectors/camel-aws-redshift-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsredshiftsource/CamelAwsredshiftsourceSourceTask.java
deleted file mode 100644
index 2d6f30adc6..0000000000
--- a/connectors/camel-aws-redshift-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsredshiftsource/CamelAwsredshiftsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awsredshiftsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwsredshiftsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwsredshiftsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:aws-redshift-source";
-    }
-}
\ No newline at end of file
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 b55d132856..596ad6053e 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
@@ -30,7 +30,7 @@ metadata:
 spec:
   definition:
     title: "AWS Redshift Source"
-    description: Query data from an AWS RedShift Database.
+    description: Query data from an AWS Redshift Database.
     required:
       - serverName
       - username
@@ -51,25 +51,25 @@ spec:
         default: 5439
       username:
         title: Username
-        description: The username to access a secured AWS RedShift Database.
+        description: The username to access a secured AWS Redshift Database.
         type: string
         x-descriptors:
         - urn:camel:group:credentials
       password:
         title: Password
-        description: The password to access a secured AWS RedShift Database.
+        description: The password to access a secured AWS Redshift Database.
         type: string
         format: password
         x-descriptors:
         - urn:camel:group:credentials
       query:
         title: Query
-        description: The query to execute against the AWS RedShift Database.
+        description: The query to execute against the AWS Redshift Database.
         type: string
         example: 'INSERT INTO accounts (username,city) VALUES (:#username,:#city)'
       databaseName:
         title: Database Name
-        description: The name of the AWS RedShift Database.
+        description: The name of the AWS Redshift Database.
         type: string
       consumedQuery:
         title: Consumed Query
@@ -78,7 +78,7 @@ spec:
         example: 'DELETE FROM accounts where user_id = :#user_id'
       delay:
         title: Delay
-        description: The number of milliseconds before the next poll from the AWS RedShift database.
+        description: The number of milliseconds before the next poll from the AWS Redshift database.
         type: integer
         default: 500
   types:
diff --git a/connectors/camel-aws-s3-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3eventbasedsource/CamelAwss3eventbasedsourceSourceConnector.java b/connectors/camel-aws-s3-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3eventbasedsource/CamelAwss3eventbasedsourceSourceConnector.java
index e28920bb73..6e641e6ba7 100644
--- a/connectors/camel-aws-s3-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3eventbasedsource/CamelAwss3eventbasedsourceSourceConnector.java
+++ b/connectors/camel-aws-s3-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3eventbasedsource/CamelAwss3eventbasedsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awss3eventbasedsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelAwss3eventbasedsourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelAwss3eventbasedsourceSourceConnector
         return CamelAwss3eventbasedsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwss3eventbasedsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:aws-s3-event-based-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-s3-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3eventbasedsource/CamelAwss3eventbasedsourceSourceTask.java b/connectors/camel-aws-s3-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3eventbasedsource/CamelAwss3eventbasedsourceSourceTask.java
deleted file mode 100644
index 51b839c865..0000000000
--- a/connectors/camel-aws-s3-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3eventbasedsource/CamelAwss3eventbasedsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awss3eventbasedsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwss3eventbasedsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwss3eventbasedsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:aws-s3-event-based-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-s3-event-based-source-kafka-connector/src/main/resources/kamelets/aws-s3-event-based-source.kamelet.yaml b/connectors/camel-aws-s3-event-based-source-kafka-connector/src/main/resources/kamelets/aws-s3-event-based-source.kamelet.yaml
index 3b896e5c1f..f03ecc6642 100644
--- a/connectors/camel-aws-s3-event-based-source-kafka-connector/src/main/resources/kamelets/aws-s3-event-based-source.kamelet.yaml
+++ b/connectors/camel-aws-s3-event-based-source-kafka-connector/src/main/resources/kamelets/aws-s3-event-based-source.kamelet.yaml
@@ -21,10 +21,10 @@ metadata:
   name: aws-s3-event-based-source
   annotations:
     camel.apache.org/kamelet.support.level: Preview
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: >-
       data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG9kaS5zb3VyY2Vmb3JnZS5uZXQvRFRE [...]
-    camel.apache.org/provider: Apache Software Foundation
+    camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: AWS S3 Event-Based
     camel.apache.org/kamelet.namespace: "AWS"
   labels:
diff --git a/connectors/camel-aws-s3-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkConnector.java b/connectors/camel-aws-s3-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkConnector.java
index c96573ae8a..d0c3f2765f 100644
--- a/connectors/camel-aws-s3-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkConnector.java
+++ b/connectors/camel-aws-s3-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awss3sink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwss3sinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAwss3sinkSinkConnector extends CamelSinkConnector {
         return CamelAwss3sinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwss3sinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-s3-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-s3-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkTask.java b/connectors/camel-aws-s3-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkTask.java
deleted file mode 100644
index bcd76405c3..0000000000
--- a/connectors/camel-aws-s3-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awss3sink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwss3sinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwss3sinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-s3-sink";
-    }
-}
\ 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 b6fb15e9fa..2e5bb691cb 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-s3-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3source/CamelAwss3sourceSourceConnector.java b/connectors/camel-aws-s3-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3source/CamelAwss3sourceSourceConnector.java
index 4b78ea542b..28cdc2d144 100644
--- a/connectors/camel-aws-s3-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3source/CamelAwss3sourceSourceConnector.java
+++ b/connectors/camel-aws-s3-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3source/CamelAwss3sourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awss3source;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelAwss3sourceSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelAwss3sourceSourceConnector extends CamelSourceConnector {
         return CamelAwss3sourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwss3sourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:aws-s3-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-s3-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3source/CamelAwss3sourceSourceTask.java b/connectors/camel-aws-s3-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3source/CamelAwss3sourceSourceTask.java
deleted file mode 100644
index 73fa68f742..0000000000
--- a/connectors/camel-aws-s3-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3source/CamelAwss3sourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awss3source;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwss3sourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwss3sourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:aws-s3-source";
-    }
-}
\ 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 09d353214c..7e10d15672 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
@@ -21,7 +21,7 @@ metadata:
   name: aws-s3-source
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3streaminguploadsink/CamelAwss3streaminguploadsinkSinkConnector.java b/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3streaminguploadsink/CamelAwss3streaminguploadsinkSinkConnector.java
index 257a45f757..a56115aed0 100644
--- a/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3streaminguploadsink/CamelAwss3streaminguploadsinkSinkConnector.java
+++ b/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3streaminguploadsink/CamelAwss3streaminguploadsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awss3streaminguploadsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwss3streaminguploadsinkSinkConnector
@@ -31,7 +33,7 @@ public class CamelAwss3streaminguploadsinkSinkConnector
         return CamelAwss3streaminguploadsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwss3streaminguploadsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-s3-streaming-upload-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3streaminguploadsink/CamelAwss3streaminguploadsinkSinkTask.java b/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3streaminguploadsink/CamelAwss3streaminguploadsinkSinkTask.java
deleted file mode 100644
index a9268adc78..0000000000
--- a/connectors/camel-aws-s3-streaming-upload-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3streaminguploadsink/CamelAwss3streaminguploadsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awss3streaminguploadsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwss3streaminguploadsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwss3streaminguploadsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-s3-streaming-upload-sink";
-    }
-}
\ 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 621f37624a..a3b177f1c9 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanagersink/CamelAwssecretsmanagersinkSinkConnector.java b/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanagersink/CamelAwssecretsmanagersinkSinkConnector.java
index 993831878d..a83014b6b2 100644
--- a/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanagersink/CamelAwssecretsmanagersinkSinkConnector.java
+++ b/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanagersink/CamelAwssecretsmanagersinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awssecretsmanagersink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwssecretsmanagersinkSinkConnector
@@ -31,7 +33,7 @@ public class CamelAwssecretsmanagersinkSinkConnector
         return CamelAwssecretsmanagersinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwssecretsmanagersinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-secrets-manager-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanagersink/CamelAwssecretsmanagersinkSinkTask.java b/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanagersink/CamelAwssecretsmanagersinkSinkTask.java
deleted file mode 100644
index 7a8ff1fbb0..0000000000
--- a/connectors/camel-aws-secrets-manager-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssecretsmanagersink/CamelAwssecretsmanagersinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awssecretsmanagersink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwssecretsmanagersinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwssecretsmanagersinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-secrets-manager-sink";
-    }
-}
\ 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 b3c5d38f76..0e7301f265 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-ses-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssessink/CamelAwssessinkSinkConnector.java b/connectors/camel-aws-ses-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssessink/CamelAwssessinkSinkConnector.java
index 13e29e7d38..f6a20b5fd0 100644
--- a/connectors/camel-aws-ses-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssessink/CamelAwssessinkSinkConnector.java
+++ b/connectors/camel-aws-ses-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssessink/CamelAwssessinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awssessink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwssessinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAwssessinkSinkConnector extends CamelSinkConnector {
         return CamelAwssessinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwssessinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-ses-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-ses-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssessink/CamelAwssessinkSinkTask.java b/connectors/camel-aws-ses-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssessink/CamelAwssessinkSinkTask.java
deleted file mode 100644
index 184ca25b98..0000000000
--- a/connectors/camel-aws-ses-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssessink/CamelAwssessinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awssessink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwssessinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwssessinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-ses-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-ses-sink-kafka-connector/src/main/resources/kamelets/aws-ses-sink.kamelet.yaml b/connectors/camel-aws-ses-sink-kafka-connector/src/main/resources/kamelets/aws-ses-sink.kamelet.yaml
index c2b18a21d8..22b627e568 100644
--- a/connectors/camel-aws-ses-sink-kafka-connector/src/main/resources/kamelets/aws-ses-sink.kamelet.yaml
+++ b/connectors/camel-aws-ses-sink-kafka-connector/src/main/resources/kamelets/aws-ses-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-ses-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnsfifosink/CamelAwssnsfifosinkSinkConnector.java b/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnsfifosink/CamelAwssnsfifosinkSinkConnector.java
index 102d61e35c..0fbd36686d 100644
--- a/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnsfifosink/CamelAwssnsfifosinkSinkConnector.java
+++ b/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnsfifosink/CamelAwssnsfifosinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awssnsfifosink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwssnsfifosinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAwssnsfifosinkSinkConnector extends CamelSinkConnector {
         return CamelAwssnsfifosinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwssnsfifosinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-sns-fifo-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnsfifosink/CamelAwssnsfifosinkSinkTask.java b/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnsfifosink/CamelAwssnsfifosinkSinkTask.java
deleted file mode 100644
index 291723960c..0000000000
--- a/connectors/camel-aws-sns-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnsfifosink/CamelAwssnsfifosinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awssnsfifosink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwssnsfifosinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwssnsfifosinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-sns-fifo-sink";
-    }
-}
\ 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 03d5abf227..c0734ca4e9 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-sns-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnssink/CamelAwssnssinkSinkConnector.java b/connectors/camel-aws-sns-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnssink/CamelAwssnssinkSinkConnector.java
index b488b28a38..bf044f81b5 100644
--- a/connectors/camel-aws-sns-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnssink/CamelAwssnssinkSinkConnector.java
+++ b/connectors/camel-aws-sns-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnssink/CamelAwssnssinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awssnssink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwssnssinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAwssnssinkSinkConnector extends CamelSinkConnector {
         return CamelAwssnssinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwssnssinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-sns-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-sns-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnssink/CamelAwssnssinkSinkTask.java b/connectors/camel-aws-sns-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnssink/CamelAwssnssinkSinkTask.java
deleted file mode 100644
index 26348f3141..0000000000
--- a/connectors/camel-aws-sns-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssnssink/CamelAwssnssinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awssnssink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwssnssinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwssnssinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-sns-sink";
-    }
-}
\ 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 e1c4ceac99..3fc6842f04 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsbatchsink/CamelAwssqsbatchsinkSinkConnector.java b/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsbatchsink/CamelAwssqsbatchsinkSinkConnector.java
index 6b828abd7c..099b1a6fb0 100644
--- a/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsbatchsink/CamelAwssqsbatchsinkSinkConnector.java
+++ b/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsbatchsink/CamelAwssqsbatchsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awssqsbatchsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwssqsbatchsinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAwssqsbatchsinkSinkConnector extends CamelSinkConnector {
         return CamelAwssqsbatchsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwssqsbatchsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-sqs-batch-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsbatchsink/CamelAwssqsbatchsinkSinkTask.java b/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsbatchsink/CamelAwssqsbatchsinkSinkTask.java
deleted file mode 100644
index 23b15d93de..0000000000
--- a/connectors/camel-aws-sqs-batch-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsbatchsink/CamelAwssqsbatchsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awssqsbatchsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwssqsbatchsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwssqsbatchsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-sqs-batch-sink";
-    }
-}
\ 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 06d9d9d0d0..a6e5309d4d 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsfifosink/CamelAwssqsfifosinkSinkConnector.java b/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsfifosink/CamelAwssqsfifosinkSinkConnector.java
index dd81a00e99..4408aa46e9 100644
--- a/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsfifosink/CamelAwssqsfifosinkSinkConnector.java
+++ b/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsfifosink/CamelAwssqsfifosinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awssqsfifosink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwssqsfifosinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAwssqsfifosinkSinkConnector extends CamelSinkConnector {
         return CamelAwssqsfifosinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwssqsfifosinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-sqs-fifo-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsfifosink/CamelAwssqsfifosinkSinkTask.java b/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsfifosink/CamelAwssqsfifosinkSinkTask.java
deleted file mode 100644
index 8182fc2df1..0000000000
--- a/connectors/camel-aws-sqs-fifo-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqsfifosink/CamelAwssqsfifosinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awssqsfifosink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwssqsfifosinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwssqsfifosinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-sqs-fifo-sink";
-    }
-}
\ 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 0a6fddfda5..8664ea1970 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-sqs-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssink/CamelAwssqssinkSinkConnector.java b/connectors/camel-aws-sqs-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssink/CamelAwssqssinkSinkConnector.java
index 4b1f6acce0..f8d503d4b1 100644
--- a/connectors/camel-aws-sqs-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssink/CamelAwssqssinkSinkConnector.java
+++ b/connectors/camel-aws-sqs-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssink/CamelAwssqssinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awssqssink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwssqssinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAwssqssinkSinkConnector extends CamelSinkConnector {
         return CamelAwssqssinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwssqssinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-sqs-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-sqs-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssink/CamelAwssqssinkSinkTask.java b/connectors/camel-aws-sqs-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssink/CamelAwssqssinkSinkTask.java
deleted file mode 100644
index e7cde15d2b..0000000000
--- a/connectors/camel-aws-sqs-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssink/CamelAwssqssinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awssqssink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwssqssinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwssqssinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-sqs-sink";
-    }
-}
\ 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 88c71b251f..b67b86dac7 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-sqs-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssource/CamelAwssqssourceSourceConnector.java b/connectors/camel-aws-sqs-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssource/CamelAwssqssourceSourceConnector.java
index 0810ebd0d3..0545d52d7a 100644
--- a/connectors/camel-aws-sqs-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssource/CamelAwssqssourceSourceConnector.java
+++ b/connectors/camel-aws-sqs-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssource/CamelAwssqssourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awssqssource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelAwssqssourceSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelAwssqssourceSourceConnector extends CamelSourceConnector {
         return CamelAwssqssourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwssqssourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:aws-sqs-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-sqs-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssource/CamelAwssqssourceSourceTask.java b/connectors/camel-aws-sqs-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssource/CamelAwssqssourceSourceTask.java
deleted file mode 100644
index a2baba8d9c..0000000000
--- a/connectors/camel-aws-sqs-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqssource/CamelAwssqssourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awssqssource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwssqssourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwssqssourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:aws-sqs-source";
-    }
-}
\ 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 1a8262d646..0d1f9ff5fb 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,7 +21,7 @@ metadata:
   name: aws-sqs-source
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-aws-timestream-query-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awstimestreamquerysink/CamelAwstimestreamquerysinkSinkConnector.java b/connectors/camel-aws-timestream-query-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awstimestreamquerysink/CamelAwstimestreamquerysinkSinkConnector.java
index 4a3b0227c4..bced809545 100644
--- a/connectors/camel-aws-timestream-query-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awstimestreamquerysink/CamelAwstimestreamquerysinkSinkConnector.java
+++ b/connectors/camel-aws-timestream-query-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awstimestreamquerysink/CamelAwstimestreamquerysinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.awstimestreamquerysink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAwstimestreamquerysinkSinkConnector
@@ -31,7 +33,7 @@ public class CamelAwstimestreamquerysinkSinkConnector
         return CamelAwstimestreamquerysinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAwstimestreamquerysinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:aws-timestream-query-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-timestream-query-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awstimestreamquerysink/CamelAwstimestreamquerysinkSinkTask.java b/connectors/camel-aws-timestream-query-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awstimestreamquerysink/CamelAwstimestreamquerysinkSinkTask.java
deleted file mode 100644
index 59a3414a3f..0000000000
--- a/connectors/camel-aws-timestream-query-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awstimestreamquerysink/CamelAwstimestreamquerysinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.awstimestreamquerysink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAwstimestreamquerysinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAwstimestreamquerysinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:aws-timestream-query-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws-timestream-query-sink-kafka-connector/src/main/resources/kamelets/aws-timestream-query-sink.kamelet.yaml b/connectors/camel-aws-timestream-query-sink-kafka-connector/src/main/resources/kamelets/aws-timestream-query-sink.kamelet.yaml
index ed55178586..3905e9a7d1 100644
--- a/connectors/camel-aws-timestream-query-sink-kafka-connector/src/main/resources/kamelets/aws-timestream-query-sink.kamelet.yaml
+++ b/connectors/camel-aws-timestream-query-sink-kafka-connector/src/main/resources/kamelets/aws-timestream-query-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: aws-timestream-query-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMjU2cHgiIGhlaWdodD0iMjU2cHgiIHZpZXdCb3g9IjAgMCAyNTYgMjU2IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaWRZTWlkIj4KICAgIDx0aXRsZT5BV1MgVGltZXN0cmVhbTwvdGl0bGU+CiAgICA8ZGVmcz4KICAgICAgICA8bGluZWFyR3JhZGllbnQgeDE9IjAlIiB5MT0iMTAwJSIgeDI9IjEwMCUiIHkyPSIwJS [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "AWS Timestream"
diff --git a/connectors/camel-aws2-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2iam/CamelAws2iamSinkConnector.java b/connectors/camel-aws2-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2iam/CamelAws2iamSinkConnector.java
index 21d0e73f39..417cf1992e 100644
--- a/connectors/camel-aws2-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2iam/CamelAws2iamSinkConnector.java
+++ b/connectors/camel-aws2-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2iam/CamelAws2iamSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.aws2iam;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAws2iamSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAws2iamSinkConnector extends CamelSinkConnector {
         return CamelAws2iamSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAws2iamSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "aws2-iam");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws2-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2iam/CamelAws2iamSinkTask.java b/connectors/camel-aws2-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2iam/CamelAws2iamSinkTask.java
deleted file mode 100644
index 017e97bb89..0000000000
--- a/connectors/camel-aws2-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2iam/CamelAws2iamSinkTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.aws2iam;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAws2iamSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAws2iamSinkConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "aws2-iam");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-aws2-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2kms/CamelAws2kmsSinkConnector.java b/connectors/camel-aws2-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2kms/CamelAws2kmsSinkConnector.java
index 807457bcbb..371d4154ef 100644
--- a/connectors/camel-aws2-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2kms/CamelAws2kmsSinkConnector.java
+++ b/connectors/camel-aws2-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2kms/CamelAws2kmsSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.aws2kms;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAws2kmsSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAws2kmsSinkConnector extends CamelSinkConnector {
         return CamelAws2kmsSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAws2kmsSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "aws2-kms");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws2-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2kms/CamelAws2kmsSinkTask.java b/connectors/camel-aws2-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2kms/CamelAws2kmsSinkTask.java
deleted file mode 100644
index be440e16a7..0000000000
--- a/connectors/camel-aws2-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2kms/CamelAws2kmsSinkTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.aws2kms;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAws2kmsSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAws2kmsSinkConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "aws2-kms");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurecosmosdbsink/CamelAzurecosmosdbsinkSinkConnector.java b/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurecosmosdbsink/CamelAzurecosmosdbsinkSinkConnector.java
index 2354021233..4ff83a66a6 100644
--- a/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurecosmosdbsink/CamelAzurecosmosdbsinkSinkConnector.java
+++ b/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurecosmosdbsink/CamelAzurecosmosdbsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.azurecosmosdbsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAzurecosmosdbsinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAzurecosmosdbsinkSinkConnector extends CamelSinkConnector {
         return CamelAzurecosmosdbsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAzurecosmosdbsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:azure-cosmosdb-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurecosmosdbsink/CamelAzurecosmosdbsinkSinkTask.java b/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurecosmosdbsink/CamelAzurecosmosdbsinkSinkTask.java
deleted file mode 100644
index cd530f3bb8..0000000000
--- a/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurecosmosdbsink/CamelAzurecosmosdbsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.azurecosmosdbsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAzurecosmosdbsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAzurecosmosdbsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:azure-cosmosdb-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/main/resources/kamelets/azure-cosmosdb-sink.kamelet.yaml b/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/main/resources/kamelets/azure-cosmosdb-sink.kamelet.yaml
index f5766dd012..125c32b03e 100644
--- a/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/main/resources/kamelets/azure-cosmosdb-sink.kamelet.yaml
+++ b/connectors/camel-azure-cosmosdb-sink-kafka-connector/src/main/resources/kamelets/azure-cosmosdb-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: azure-cosmosdb-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurecosmosdbsource/CamelAzurecosmosdbsourceSourceConnector.java b/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurecosmosdbsource/CamelAzurecosmosdbsourceSourceConnector.java
index 257cdcfa15..a36887a7f7 100644
--- a/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurecosmosdbsource/CamelAzurecosmosdbsourceSourceConnector.java
+++ b/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurecosmosdbsource/CamelAzurecosmosdbsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.azurecosmosdbsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelAzurecosmosdbsourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelAzurecosmosdbsourceSourceConnector
         return CamelAzurecosmosdbsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAzurecosmosdbsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:azure-cosmosdb-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurecosmosdbsource/CamelAzurecosmosdbsourceSourceTask.java b/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurecosmosdbsource/CamelAzurecosmosdbsourceSourceTask.java
deleted file mode 100644
index 2b25627182..0000000000
--- a/connectors/camel-azure-cosmosdb-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurecosmosdbsource/CamelAzurecosmosdbsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.azurecosmosdbsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAzurecosmosdbsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAzurecosmosdbsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:azure-cosmosdb-source";
-    }
-}
\ No newline at end of file
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 67ca92876e..74b09dfe81 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureeventhubssink/CamelAzureeventhubssinkSinkConnector.java b/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureeventhubssink/CamelAzureeventhubssinkSinkConnector.java
index 0a907b1423..53a75e7b50 100644
--- a/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureeventhubssink/CamelAzureeventhubssinkSinkConnector.java
+++ b/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureeventhubssink/CamelAzureeventhubssinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.azureeventhubssink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAzureeventhubssinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAzureeventhubssinkSinkConnector extends CamelSinkConnector {
         return CamelAzureeventhubssinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAzureeventhubssinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:azure-eventhubs-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureeventhubssink/CamelAzureeventhubssinkSinkTask.java b/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureeventhubssink/CamelAzureeventhubssinkSinkTask.java
deleted file mode 100644
index 9b167dbc20..0000000000
--- a/connectors/camel-azure-eventhubs-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureeventhubssink/CamelAzureeventhubssinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.azureeventhubssink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAzureeventhubssinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAzureeventhubssinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:azure-eventhubs-sink";
-    }
-}
\ No newline at end of file
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 507ea6249c..f7dc559336 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureeventhubssource/CamelAzureeventhubssourceSourceConnector.java b/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureeventhubssource/CamelAzureeventhubssourceSourceConnector.java
index 2abc643f78..f40315e994 100644
--- a/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureeventhubssource/CamelAzureeventhubssourceSourceConnector.java
+++ b/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureeventhubssource/CamelAzureeventhubssourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.azureeventhubssource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelAzureeventhubssourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelAzureeventhubssourceSourceConnector
         return CamelAzureeventhubssourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAzureeventhubssourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:azure-eventhubs-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureeventhubssource/CamelAzureeventhubssourceSourceTask.java b/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureeventhubssource/CamelAzureeventhubssourceSourceTask.java
deleted file mode 100644
index efa2f5c496..0000000000
--- a/connectors/camel-azure-eventhubs-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureeventhubssource/CamelAzureeventhubssourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.azureeventhubssource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAzureeventhubssourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAzureeventhubssourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:azure-eventhubs-source";
-    }
-}
\ No newline at end of file
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 3ff4da6b5e..48ee856128 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-azure-functions-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurefunctionssink/CamelAzurefunctionssinkSinkConnector.java b/connectors/camel-azure-functions-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurefunctionssink/CamelAzurefunctionssinkSinkConnector.java
index ec1e73bc78..42fb142431 100644
--- a/connectors/camel-azure-functions-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurefunctionssink/CamelAzurefunctionssinkSinkConnector.java
+++ b/connectors/camel-azure-functions-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurefunctionssink/CamelAzurefunctionssinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.azurefunctionssink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAzurefunctionssinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAzurefunctionssinkSinkConnector extends CamelSinkConnector {
         return CamelAzurefunctionssinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAzurefunctionssinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:azure-functions-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-functions-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurefunctionssink/CamelAzurefunctionssinkSinkTask.java b/connectors/camel-azure-functions-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurefunctionssink/CamelAzurefunctionssinkSinkTask.java
deleted file mode 100644
index 958732a189..0000000000
--- a/connectors/camel-azure-functions-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurefunctionssink/CamelAzurefunctionssinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.azurefunctionssink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAzurefunctionssinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAzurefunctionssinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:azure-functions-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-azure-functions-sink-kafka-connector/src/main/resources/kamelets/azure-functions-sink.kamelet.yaml b/connectors/camel-azure-functions-sink-kafka-connector/src/main/resources/kamelets/azure-functions-sink.kamelet.yaml
index 463bce9d05..ad284d2217 100644
--- a/connectors/camel-azure-functions-sink-kafka-connector/src/main/resources/kamelets/azure-functions-sink.kamelet.yaml
+++ b/connectors/camel-azure-functions-sink-kafka-connector/src/main/resources/kamelets/azure-functions-sink.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: azure-functions-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjE4LjI0IDIxLjQ2IDY0IDY0IiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiPjxwYXRoIGQ9Ik04MS44MzcgNTMuODVjLjU4NS0uNTg1LjQ4Ny0xLjcgMC0yLjMwN2wtMy4wODctMy4wODctMTMuOC0xMy4zODZjLS41ODUtLjU4NS0xLjQ5NS0uNTg1LTIuMiAwLS41ODUuNTg1LS44MTIgMS43IDAgMi4zMDdsMTQuNSAxNC4xOThjLjU4NS41ODUuNTg1IDEuNyAwIDIuMzA3TDYyLjQ0IDY4LjU2OGMtLjU4NS41ODUtLjU4NSAxLjcgMCAyLjMwNy41ODUuNTg1IDEuNy40ODcgMi4yIDBsMTMuOC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Azure Functions"
diff --git a/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussink/CamelAzureservicebussinkSinkConnector.java b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussink/CamelAzureservicebussinkSinkConnector.java
index f05395b646..5e96066567 100644
--- a/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussink/CamelAzureservicebussinkSinkConnector.java
+++ b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussink/CamelAzureservicebussinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.azureservicebussink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAzureservicebussinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelAzureservicebussinkSinkConnector extends CamelSinkConnector {
         return CamelAzureservicebussinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAzureservicebussinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:azure-servicebus-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussink/CamelAzureservicebussinkSinkTask.java b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussink/CamelAzureservicebussinkSinkTask.java
deleted file mode 100644
index 7755ab858e..0000000000
--- a/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussink/CamelAzureservicebussinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.azureservicebussink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAzureservicebussinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAzureservicebussinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:azure-servicebus-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/resources/kamelets/azure-servicebus-sink.kamelet.yaml b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/resources/kamelets/azure-servicebus-sink.kamelet.yaml
index a055fc06fa..51e36f979f 100644
--- a/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/resources/kamelets/azure-servicebus-sink.kamelet.yaml
+++ b/connectors/camel-azure-servicebus-sink-kafka-connector/src/main/resources/kamelets/azure-servicebus-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: azure-servicebus-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-azure-servicebus-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussource/CamelAzureservicebussourceSourceConnector.java b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussource/CamelAzureservicebussourceSourceConnector.java
index 3458d6aaba..6ab1b87a92 100644
--- a/connectors/camel-azure-servicebus-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussource/CamelAzureservicebussourceSourceConnector.java
+++ b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussource/CamelAzureservicebussourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.azureservicebussource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelAzureservicebussourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelAzureservicebussourceSourceConnector
         return CamelAzureservicebussourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAzureservicebussourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:azure-servicebus-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-servicebus-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussource/CamelAzureservicebussourceSourceTask.java b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussource/CamelAzureservicebussourceSourceTask.java
deleted file mode 100644
index a84a7de036..0000000000
--- a/connectors/camel-azure-servicebus-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azureservicebussource/CamelAzureservicebussourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.azureservicebussource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAzureservicebussourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAzureservicebussourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:azure-servicebus-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-azure-servicebus-source-kafka-connector/src/main/resources/kamelets/azure-servicebus-source.kamelet.yaml b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/resources/kamelets/azure-servicebus-source.kamelet.yaml
index c95bd05778..6feb7b670e 100644
--- a/connectors/camel-azure-servicebus-source-kafka-connector/src/main/resources/kamelets/azure-servicebus-source.kamelet.yaml
+++ b/connectors/camel-azure-servicebus-source-kafka-connector/src/main/resources/kamelets/azure-servicebus-source.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: azure-servicebus-source
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobappendsink/CamelAzurestorageblobappendsinkSinkConnector.java b/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobappendsink/CamelAzurestorageblobappendsinkSinkConnector.java
index 86e9f0f8a3..240e9df5a2 100644
--- a/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobappendsink/CamelAzurestorageblobappendsinkSinkConnector.java
+++ b/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobappendsink/CamelAzurestorageblobappendsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.azurestorageblobappendsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAzurestorageblobappendsinkSinkConnector
@@ -31,7 +33,7 @@ public class CamelAzurestorageblobappendsinkSinkConnector
         return CamelAzurestorageblobappendsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAzurestorageblobappendsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:azure-storage-blob-append-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobappendsink/CamelAzurestorageblobappendsinkSinkTask.java b/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobappendsink/CamelAzurestorageblobappendsinkSinkTask.java
deleted file mode 100644
index 46ad6a38d6..0000000000
--- a/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobappendsink/CamelAzurestorageblobappendsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.azurestorageblobappendsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAzurestorageblobappendsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAzurestorageblobappendsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:azure-storage-blob-append-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/main/resources/kamelets/azure-storage-blob-append-sink.kamelet.yaml b/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/main/resources/kamelets/azure-storage-blob-append-sink.kamelet.yaml
index 15c363507f..487e7b2cb6 100644
--- a/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/main/resources/kamelets/azure-storage-blob-append-sink.kamelet.yaml
+++ b/connectors/camel-azure-storage-blob-append-sink-kafka-connector/src/main/resources/kamelets/azure-storage-blob-append-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: azure-storage-blob-append-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobchangefeedsource/CamelAzurestorageblobchangefeedsourceSourceConnector.java b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobchangefeedsource/CamelAzurestorageblobchangefeedsourceSourceConnector.java
index 7fa62cbc0b..10ef1434bc 100644
--- a/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobchangefeedsource/CamelAzurestorageblobchangefeedsourceSourceConnector.java
+++ b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobchangefeedsource/CamelAzurestorageblobchangefeedsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.azurestorageblobchangefeedsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelAzurestorageblobchangefeedsourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelAzurestorageblobchangefeedsourceSourceConnector
         return CamelAzurestorageblobchangefeedsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAzurestorageblobchangefeedsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:azure-storage-blob-changefeed-source");
     }
 }
\ 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/CamelAzurestorageblobchangefeedsourceSourceTask.java b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobchangefeedsource/CamelAzurestorageblobchangefeedsourceSourceTask.java
deleted file mode 100644
index c3ce2a6825..0000000000
--- a/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobchangefeedsource/CamelAzurestorageblobchangefeedsourceSourceTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.azurestorageblobchangefeedsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAzurestorageblobchangefeedsourceSourceTask
-        extends
-            CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAzurestorageblobchangefeedsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:azure-storage-blob-changefeed-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-changefeed-source.kamelet.yaml b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-changefeed-source.kamelet.yaml
index 94bc0aadc4..cf43c829ab 100644
--- a/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-changefeed-source.kamelet.yaml
+++ b/connectors/camel-azure-storage-blob-changefeed-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-changefeed-source.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: azure-storage-blob-changefeed-source
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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 Changefeed"
diff --git a/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobeventbasedsource/CamelAzurestorageblobeventbasedsourceSourceConnector.java b/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobeventbasedsource/CamelAzurestorageblobeventbasedsourceSourceConnector.java
index 73b7461c48..0df043445a 100644
--- a/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobeventbasedsource/CamelAzurestorageblobeventbasedsourceSourceConnector.java
+++ b/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobeventbasedsource/CamelAzurestorageblobeventbasedsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.azurestorageblobeventbasedsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelAzurestorageblobeventbasedsourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelAzurestorageblobeventbasedsourceSourceConnector
         return CamelAzurestorageblobeventbasedsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAzurestorageblobeventbasedsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:azure-storage-blob-event-based-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobeventbasedsource/CamelAzurestorageblobeventbasedsourceSourceTask.java b/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobeventbasedsource/CamelAzurestorageblobeventbasedsourceSourceTask.java
deleted file mode 100644
index 2cb9499e0c..0000000000
--- a/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobeventbasedsource/CamelAzurestorageblobeventbasedsourceSourceTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.azurestorageblobeventbasedsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAzurestorageblobeventbasedsourceSourceTask
-        extends
-            CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAzurestorageblobeventbasedsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:azure-storage-blob-event-based-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-event-based-source.kamelet.yaml b/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-event-based-source.kamelet.yaml
index bdfa855c7e..f043759155 100644
--- a/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-event-based-source.kamelet.yaml
+++ b/connectors/camel-azure-storage-blob-event-based-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-event-based-source.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: azure-storage-blob-event-based-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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 Storage Blob Event Based"
diff --git a/connectors/camel-azure-storage-blob-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobsink/CamelAzurestorageblobsinkSinkConnector.java b/connectors/camel-azure-storage-blob-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobsink/CamelAzurestorageblobsinkSinkConnector.java
index a471dd30ba..09bd2b11f5 100644
--- a/connectors/camel-azure-storage-blob-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobsink/CamelAzurestorageblobsinkSinkConnector.java
+++ b/connectors/camel-azure-storage-blob-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobsink/CamelAzurestorageblobsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.azurestorageblobsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAzurestorageblobsinkSinkConnector
@@ -31,7 +33,7 @@ public class CamelAzurestorageblobsinkSinkConnector
         return CamelAzurestorageblobsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAzurestorageblobsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:azure-storage-blob-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-blob-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobsink/CamelAzurestorageblobsinkSinkTask.java b/connectors/camel-azure-storage-blob-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobsink/CamelAzurestorageblobsinkSinkTask.java
deleted file mode 100644
index b3e9898136..0000000000
--- a/connectors/camel-azure-storage-blob-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobsink/CamelAzurestorageblobsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.azurestorageblobsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAzurestorageblobsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAzurestorageblobsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:azure-storage-blob-sink";
-    }
-}
\ No newline at end of file
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 47826faa57..094992d69b 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobsource/CamelAzurestorageblobsourceSourceConnector.java b/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobsource/CamelAzurestorageblobsourceSourceConnector.java
index 7aa03bd06d..f5f02379de 100644
--- a/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobsource/CamelAzurestorageblobsourceSourceConnector.java
+++ b/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobsource/CamelAzurestorageblobsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.azurestorageblobsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelAzurestorageblobsourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelAzurestorageblobsourceSourceConnector
         return CamelAzurestorageblobsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAzurestorageblobsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:azure-storage-blob-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobsource/CamelAzurestorageblobsourceSourceTask.java b/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobsource/CamelAzurestorageblobsourceSourceTask.java
deleted file mode 100644
index 9921472448..0000000000
--- a/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblobsource/CamelAzurestorageblobsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.azurestorageblobsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAzurestorageblobsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAzurestorageblobsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:azure-storage-blob-source";
-    }
-}
\ No newline at end of file
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 abfe5ec446..45e2289353 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-azure-storage-datalake-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragedatalakesink/CamelAzurestoragedatalakesinkSinkConnector.java b/connectors/camel-azure-storage-datalake-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragedatalakesink/CamelAzurestoragedatalakesinkSinkConnector.java
index 0b6f8536a7..c7c8f858e9 100644
--- a/connectors/camel-azure-storage-datalake-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragedatalakesink/CamelAzurestoragedatalakesinkSinkConnector.java
+++ b/connectors/camel-azure-storage-datalake-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragedatalakesink/CamelAzurestoragedatalakesinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.azurestoragedatalakesink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAzurestoragedatalakesinkSinkConnector
@@ -31,7 +33,7 @@ public class CamelAzurestoragedatalakesinkSinkConnector
         return CamelAzurestoragedatalakesinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAzurestoragedatalakesinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:azure-storage-datalake-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-datalake-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragedatalakesink/CamelAzurestoragedatalakesinkSinkTask.java b/connectors/camel-azure-storage-datalake-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragedatalakesink/CamelAzurestoragedatalakesinkSinkTask.java
deleted file mode 100644
index d9bcd77280..0000000000
--- a/connectors/camel-azure-storage-datalake-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragedatalakesink/CamelAzurestoragedatalakesinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.azurestoragedatalakesink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAzurestoragedatalakesinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAzurestoragedatalakesinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:azure-storage-datalake-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-datalake-sink-kafka-connector/src/main/resources/kamelets/azure-storage-datalake-sink.kamelet.yaml b/connectors/camel-azure-storage-datalake-sink-kafka-connector/src/main/resources/kamelets/azure-storage-datalake-sink.kamelet.yaml
index e1f5dc7d93..e5e20a1b28 100644
--- a/connectors/camel-azure-storage-datalake-sink-kafka-connector/src/main/resources/kamelets/azure-storage-datalake-sink.kamelet.yaml
+++ b/connectors/camel-azure-storage-datalake-sink-kafka-connector/src/main/resources/kamelets/azure-storage-datalake-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: azure-storage-datalake-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAyNi4wLjMsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4wIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiDQoJIHZpZXdCb3g9IjAgMCAxMTU4LjIgODYwLjQiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Azure Storage Blob Data Lake"
diff --git a/connectors/camel-azure-storage-datalake-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragedatalakesource/CamelAzurestoragedatalakesourceSourceConnector.java b/connectors/camel-azure-storage-datalake-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragedatalakesource/CamelAzurestoragedatalakesourceSourceConnector.java
index d78989d61d..937bc258b9 100644
--- a/connectors/camel-azure-storage-datalake-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragedatalakesource/CamelAzurestoragedatalakesourceSourceConnector.java
+++ b/connectors/camel-azure-storage-datalake-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragedatalakesource/CamelAzurestoragedatalakesourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.azurestoragedatalakesource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelAzurestoragedatalakesourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelAzurestoragedatalakesourceSourceConnector
         return CamelAzurestoragedatalakesourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAzurestoragedatalakesourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:azure-storage-datalake-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-datalake-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragedatalakesource/CamelAzurestoragedatalakesourceSourceTask.java b/connectors/camel-azure-storage-datalake-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragedatalakesource/CamelAzurestoragedatalakesourceSourceTask.java
deleted file mode 100644
index 3cc6ed46cb..0000000000
--- a/connectors/camel-azure-storage-datalake-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragedatalakesource/CamelAzurestoragedatalakesourceSourceTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.azurestoragedatalakesource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAzurestoragedatalakesourceSourceTask
-        extends
-            CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAzurestoragedatalakesourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:azure-storage-datalake-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-datalake-source-kafka-connector/src/main/resources/kamelets/azure-storage-datalake-source.kamelet.yaml b/connectors/camel-azure-storage-datalake-source-kafka-connector/src/main/resources/kamelets/azure-storage-datalake-source.kamelet.yaml
index 96767c1d76..281cab2be1 100644
--- a/connectors/camel-azure-storage-datalake-source-kafka-connector/src/main/resources/kamelets/azure-storage-datalake-source.kamelet.yaml
+++ b/connectors/camel-azure-storage-datalake-source-kafka-connector/src/main/resources/kamelets/azure-storage-datalake-source.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: azure-storage-datalake-source
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAyNi4wLjMsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4wIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiDQoJIHZpZXdCb3g9IjAgMCAxMTU4LjIgODYwLjQiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Azure Storage Blob Data Lake"
diff --git a/connectors/camel-azure-storage-files-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragefilessink/CamelAzurestoragefilessinkSinkConnector.java b/connectors/camel-azure-storage-files-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragefilessink/CamelAzurestoragefilessinkSinkConnector.java
index 19ffa47aef..c5e03b45a1 100644
--- a/connectors/camel-azure-storage-files-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragefilessink/CamelAzurestoragefilessinkSinkConnector.java
+++ b/connectors/camel-azure-storage-files-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragefilessink/CamelAzurestoragefilessinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.azurestoragefilessink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAzurestoragefilessinkSinkConnector
@@ -31,7 +33,7 @@ public class CamelAzurestoragefilessinkSinkConnector
         return CamelAzurestoragefilessinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAzurestoragefilessinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:azure-storage-files-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-files-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragefilessink/CamelAzurestoragefilessinkSinkTask.java b/connectors/camel-azure-storage-files-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragefilessink/CamelAzurestoragefilessinkSinkTask.java
deleted file mode 100644
index e3b4fc727a..0000000000
--- a/connectors/camel-azure-storage-files-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragefilessink/CamelAzurestoragefilessinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.azurestoragefilessink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAzurestoragefilessinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAzurestoragefilessinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:azure-storage-files-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-files-sink-kafka-connector/src/main/resources/kamelets/azure-storage-files-sink.kamelet.yaml b/connectors/camel-azure-storage-files-sink-kafka-connector/src/main/resources/kamelets/azure-storage-files-sink.kamelet.yaml
index 5e9644fe3f..fe89e4d18d 100644
--- a/connectors/camel-azure-storage-files-sink-kafka-connector/src/main/resources/kamelets/azure-storage-files-sink.kamelet.yaml
+++ b/connectors/camel-azure-storage-files-sink-kafka-connector/src/main/resources/kamelets/azure-storage-files-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: azure-storage-files-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-azure-storage-files-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragefilessource/CamelAzurestoragefilessourceSourceConnector.java b/connectors/camel-azure-storage-files-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragefilessource/CamelAzurestoragefilessourceSourceConnector.java
index 13a48d32a5..d57cfacdf3 100644
--- a/connectors/camel-azure-storage-files-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragefilessource/CamelAzurestoragefilessourceSourceConnector.java
+++ b/connectors/camel-azure-storage-files-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragefilessource/CamelAzurestoragefilessourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.azurestoragefilessource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelAzurestoragefilessourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelAzurestoragefilessourceSourceConnector
         return CamelAzurestoragefilessourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAzurestoragefilessourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:azure-storage-files-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-files-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragefilessource/CamelAzurestoragefilessourceSourceTask.java b/connectors/camel-azure-storage-files-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragefilessource/CamelAzurestoragefilessourceSourceTask.java
deleted file mode 100644
index 8c83233e81..0000000000
--- a/connectors/camel-azure-storage-files-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragefilessource/CamelAzurestoragefilessourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.azurestoragefilessource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAzurestoragefilessourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAzurestoragefilessourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:azure-storage-files-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-files-source-kafka-connector/src/main/resources/kamelets/azure-storage-files-source.kamelet.yaml b/connectors/camel-azure-storage-files-source-kafka-connector/src/main/resources/kamelets/azure-storage-files-source.kamelet.yaml
index e3088bd550..1bb515ff5c 100644
--- a/connectors/camel-azure-storage-files-source-kafka-connector/src/main/resources/kamelets/azure-storage-files-source.kamelet.yaml
+++ b/connectors/camel-azure-storage-files-source-kafka-connector/src/main/resources/kamelets/azure-storage-files-source.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: azure-storage-files-source
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-azure-storage-queue-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragequeuesink/CamelAzurestoragequeuesinkSinkConnector.java b/connectors/camel-azure-storage-queue-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragequeuesink/CamelAzurestoragequeuesinkSinkConnector.java
index 4e7489e504..a18d4b6b52 100644
--- a/connectors/camel-azure-storage-queue-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragequeuesink/CamelAzurestoragequeuesinkSinkConnector.java
+++ b/connectors/camel-azure-storage-queue-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragequeuesink/CamelAzurestoragequeuesinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.azurestoragequeuesink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelAzurestoragequeuesinkSinkConnector
@@ -31,7 +33,7 @@ public class CamelAzurestoragequeuesinkSinkConnector
         return CamelAzurestoragequeuesinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAzurestoragequeuesinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:azure-storage-queue-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-queue-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragequeuesink/CamelAzurestoragequeuesinkSinkTask.java b/connectors/camel-azure-storage-queue-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragequeuesink/CamelAzurestoragequeuesinkSinkTask.java
deleted file mode 100644
index 0e43fb5ae4..0000000000
--- a/connectors/camel-azure-storage-queue-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragequeuesink/CamelAzurestoragequeuesinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.azurestoragequeuesink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAzurestoragequeuesinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAzurestoragequeuesinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:azure-storage-queue-sink";
-    }
-}
\ No newline at end of file
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 93798a5ede..38aed88bd8 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragequeuesource/CamelAzurestoragequeuesourceSourceConnector.java b/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragequeuesource/CamelAzurestoragequeuesourceSourceConnector.java
index b371ea657f..50b51e9300 100644
--- a/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragequeuesource/CamelAzurestoragequeuesourceSourceConnector.java
+++ b/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragequeuesource/CamelAzurestoragequeuesourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.azurestoragequeuesource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelAzurestoragequeuesourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelAzurestoragequeuesourceSourceConnector
         return CamelAzurestoragequeuesourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelAzurestoragequeuesourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:azure-storage-queue-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragequeuesource/CamelAzurestoragequeuesourceSourceTask.java b/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragequeuesource/CamelAzurestoragequeuesourceSourceTask.java
deleted file mode 100644
index aa94b5fa10..0000000000
--- a/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestoragequeuesource/CamelAzurestoragequeuesourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.azurestoragequeuesource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelAzurestoragequeuesourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelAzurestoragequeuesourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:azure-storage-queue-source";
-    }
-}
\ No newline at end of file
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 b86e2ff9fd..4e8e39516c 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-bitcoin-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/bitcoinsource/CamelBitcoinsourceSourceConnector.java b/connectors/camel-bitcoin-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/bitcoinsource/CamelBitcoinsourceSourceConnector.java
index e3131d9a5f..a4e754636d 100644
--- a/connectors/camel-bitcoin-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/bitcoinsource/CamelBitcoinsourceSourceConnector.java
+++ b/connectors/camel-bitcoin-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/bitcoinsource/CamelBitcoinsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.bitcoinsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelBitcoinsourceSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelBitcoinsourceSourceConnector extends CamelSourceConnector {
         return CamelBitcoinsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelBitcoinsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:bitcoin-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-bitcoin-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/bitcoinsource/CamelBitcoinsourceSourceTask.java b/connectors/camel-bitcoin-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/bitcoinsource/CamelBitcoinsourceSourceTask.java
deleted file mode 100644
index f36c43ec0f..0000000000
--- a/connectors/camel-bitcoin-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/bitcoinsource/CamelBitcoinsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.bitcoinsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelBitcoinsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelBitcoinsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:bitcoin-source";
-    }
-}
\ No newline at end of file
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 fbeae5ecd5..e89b33646c 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-cassandra-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasink/CamelCassandrasinkSinkConnector.java b/connectors/camel-cassandra-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasink/CamelCassandrasinkSinkConnector.java
index bc4ddf4bca..3a020df189 100644
--- a/connectors/camel-cassandra-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasink/CamelCassandrasinkSinkConnector.java
+++ b/connectors/camel-cassandra-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasink/CamelCassandrasinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.cassandrasink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelCassandrasinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelCassandrasinkSinkConnector extends CamelSinkConnector {
         return CamelCassandrasinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelCassandrasinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:cassandra-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-cassandra-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasink/CamelCassandrasinkSinkTask.java b/connectors/camel-cassandra-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasink/CamelCassandrasinkSinkTask.java
deleted file mode 100644
index 7b0a6f6b1c..0000000000
--- a/connectors/camel-cassandra-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasink/CamelCassandrasinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.cassandrasink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelCassandrasinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelCassandrasinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:cassandra-sink";
-    }
-}
\ No newline at end of file
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 ecebfb7d89..cffd33fb9a 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-cassandra-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasource/CamelCassandrasourceSourceConnector.java b/connectors/camel-cassandra-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasource/CamelCassandrasourceSourceConnector.java
index 609b77bd8a..1d7a1013a3 100644
--- a/connectors/camel-cassandra-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasource/CamelCassandrasourceSourceConnector.java
+++ b/connectors/camel-cassandra-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasource/CamelCassandrasourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.cassandrasource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelCassandrasourceSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelCassandrasourceSourceConnector extends CamelSourceConnector {
         return CamelCassandrasourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelCassandrasourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:cassandra-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-cassandra-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasource/CamelCassandrasourceSourceTask.java b/connectors/camel-cassandra-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasource/CamelCassandrasourceSourceTask.java
deleted file mode 100644
index 6dd537a8b9..0000000000
--- a/connectors/camel-cassandra-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cassandrasource/CamelCassandrasourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.cassandrasource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelCassandrasourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelCassandrasourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:cassandra-source";
-    }
-}
\ No newline at end of file
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 f24035b903..842486bbf0 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-ceph-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cephsink/CamelCephsinkSinkConnector.java b/connectors/camel-ceph-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cephsink/CamelCephsinkSinkConnector.java
index d89ee2e0da..914e2ab2cf 100644
--- a/connectors/camel-ceph-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cephsink/CamelCephsinkSinkConnector.java
+++ b/connectors/camel-ceph-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cephsink/CamelCephsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.cephsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelCephsinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelCephsinkSinkConnector extends CamelSinkConnector {
         return CamelCephsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelCephsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:ceph-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-ceph-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cephsink/CamelCephsinkSinkTask.java b/connectors/camel-ceph-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cephsink/CamelCephsinkSinkTask.java
deleted file mode 100644
index 52a59ebe16..0000000000
--- a/connectors/camel-ceph-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cephsink/CamelCephsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.cephsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelCephsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelCephsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:ceph-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-ceph-sink-kafka-connector/src/main/resources/kamelets/ceph-sink.kamelet.yaml b/connectors/camel-ceph-sink-kafka-connector/src/main/resources/kamelets/ceph-sink.kamelet.yaml
index 40f4f6d212..d3e13cce5e 100644
--- a/connectors/camel-ceph-sink-kafka-connector/src/main/resources/kamelets/ceph-sink.kamelet.yaml
+++ b/connectors/camel-ceph-sink-kafka-connector/src/main/resources/kamelets/ceph-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: ceph-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4gPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNjAiIGhlaWdodD0iMTU3IiB2aWV3Qm94PSIwIDAgMTYwIDE1NyIgZmlsbD0ibm9uZSI+PGcgY2xpcC1wYXRoPSJ1cmwoI2NsaXAwKSI+PHBhdGggZD0iTTc5LjgxNTIgOTYuMDczOUM4OC42ODM2IDk2LjA3MzkgOTUuNzA0NCA4OS4wNTMxIDk1LjcwNDQgODAuMTg0OEM5NS43MDQ0IDcxLjMxNjQgODguNjgzNiA2NC4yOTU2IDc5LjgxNTIgNjQuMjk1NkM3MC45NDY5IDY0LjI5NTYgNjMuOTI2MSA3MS4zMTY0IDYzLj [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Ceph"
diff --git a/connectors/camel-ceph-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cephsource/CamelCephsourceSourceConnector.java b/connectors/camel-ceph-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cephsource/CamelCephsourceSourceConnector.java
index 4e3f628d8c..c8c184c195 100644
--- a/connectors/camel-ceph-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cephsource/CamelCephsourceSourceConnector.java
+++ b/connectors/camel-ceph-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cephsource/CamelCephsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.cephsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelCephsourceSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelCephsourceSourceConnector extends CamelSourceConnector {
         return CamelCephsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelCephsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:ceph-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-ceph-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cephsource/CamelCephsourceSourceTask.java b/connectors/camel-ceph-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cephsource/CamelCephsourceSourceTask.java
deleted file mode 100644
index bf337dac11..0000000000
--- a/connectors/camel-ceph-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cephsource/CamelCephsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.cephsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelCephsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelCephsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:ceph-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-ceph-source-kafka-connector/src/main/resources/kamelets/ceph-source.kamelet.yaml b/connectors/camel-ceph-source-kafka-connector/src/main/resources/kamelets/ceph-source.kamelet.yaml
index 7adebe4906..8e32999076 100644
--- a/connectors/camel-ceph-source-kafka-connector/src/main/resources/kamelets/ceph-source.kamelet.yaml
+++ b/connectors/camel-ceph-source-kafka-connector/src/main/resources/kamelets/ceph-source.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: ceph-source
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4gPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNjAiIGhlaWdodD0iMTU3IiB2aWV3Qm94PSIwIDAgMTYwIDE1NyIgZmlsbD0ibm9uZSI+PGcgY2xpcC1wYXRoPSJ1cmwoI2NsaXAwKSI+PHBhdGggZD0iTTc5LjgxNTIgOTYuMDczOUM4OC42ODM2IDk2LjA3MzkgOTUuNzA0NCA4OS4wNTMxIDk1LjcwNDQgODAuMTg0OEM5NS43MDQ0IDcxLjMxNjQgODguNjgzNiA2NC4yOTU2IDc5LjgxNTIgNjQuMjk1NkM3MC45NDY5IDY0LjI5NTYgNjMuOTI2MSA3MS4zMTY0IDYzLj [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Ceph"
diff --git a/connectors/camel-chuck-norris-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/chucknorrissource/CamelChucknorrissourceSourceConnector.java b/connectors/camel-chuck-norris-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/chucknorrissource/CamelChucknorrissourceSourceConnector.java
index 306091cc12..e5d31bdb8b 100644
--- a/connectors/camel-chuck-norris-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/chucknorrissource/CamelChucknorrissourceSourceConnector.java
+++ b/connectors/camel-chuck-norris-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/chucknorrissource/CamelChucknorrissourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.chucknorrissource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelChucknorrissourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelChucknorrissourceSourceConnector
         return CamelChucknorrissourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelChucknorrissourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:chuck-norris-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-chuck-norris-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/chucknorrissource/CamelChucknorrissourceSourceTask.java b/connectors/camel-chuck-norris-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/chucknorrissource/CamelChucknorrissourceSourceTask.java
deleted file mode 100644
index a42593a781..0000000000
--- a/connectors/camel-chuck-norris-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/chucknorrissource/CamelChucknorrissourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.chucknorrissource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelChucknorrissourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelChucknorrissourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:chuck-norris-source";
-    }
-}
\ No newline at end of file
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 39b043f5fe..97339b3d48 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-couchbase-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbasesink/CamelCouchbasesinkSinkConnector.java b/connectors/camel-couchbase-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbasesink/CamelCouchbasesinkSinkConnector.java
index 5451115d57..fbf685e6a6 100644
--- a/connectors/camel-couchbase-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbasesink/CamelCouchbasesinkSinkConnector.java
+++ b/connectors/camel-couchbase-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbasesink/CamelCouchbasesinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.couchbasesink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelCouchbasesinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelCouchbasesinkSinkConnector extends CamelSinkConnector {
         return CamelCouchbasesinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelCouchbasesinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:couchbase-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-couchbase-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbasesink/CamelCouchbasesinkSinkTask.java b/connectors/camel-couchbase-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbasesink/CamelCouchbasesinkSinkTask.java
deleted file mode 100644
index 1b90c0c6cd..0000000000
--- a/connectors/camel-couchbase-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbasesink/CamelCouchbasesinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.couchbasesink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelCouchbasesinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelCouchbasesinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:couchbase-sink";
-    }
-}
\ No newline at end of file
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 66190651dd..6a996ac49a 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-counter-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/countersource/CamelCountersourceSourceConnector.java b/connectors/camel-counter-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/countersource/CamelCountersourceSourceConnector.java
index 7480df4751..47e2b00ed3 100644
--- a/connectors/camel-counter-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/countersource/CamelCountersourceSourceConnector.java
+++ b/connectors/camel-counter-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/countersource/CamelCountersourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.countersource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelCountersourceSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelCountersourceSourceConnector extends CamelSourceConnector {
         return CamelCountersourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelCountersourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:counter-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-counter-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/countersource/CamelCountersourceSourceTask.java b/connectors/camel-counter-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/countersource/CamelCountersourceSourceTask.java
deleted file mode 100644
index 6e43e7d81e..0000000000
--- a/connectors/camel-counter-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/countersource/CamelCountersourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.countersource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelCountersourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelCountersourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:counter-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-counter-source-kafka-connector/src/main/resources/kamelets/counter-source.kamelet.yaml b/connectors/camel-counter-source-kafka-connector/src/main/resources/kamelets/counter-source.kamelet.yaml
index 7c07211f6a..45a8a528c8 100644
--- a/connectors/camel-counter-source-kafka-connector/src/main/resources/kamelets/counter-source.kamelet.yaml
+++ b/connectors/camel-counter-source-kafka-connector/src/main/resources/kamelets/counter-source.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: counter-source
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gU3ZnIFZlY3RvciBJY29ucyA6IGh0dHA6Ly93d3cub25saW5ld2ViZm9udHMuY29tL2ljb24gLS0+DQo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPg0KPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm9 [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Timer"
diff --git a/connectors/camel-cron-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cronsource/CamelCronsourceSourceConnector.java b/connectors/camel-cron-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cronsource/CamelCronsourceSourceConnector.java
index 058728577f..2dda461f73 100644
--- a/connectors/camel-cron-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cronsource/CamelCronsourceSourceConnector.java
+++ b/connectors/camel-cron-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cronsource/CamelCronsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.cronsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelCronsourceSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelCronsourceSourceConnector extends CamelSourceConnector {
         return CamelCronsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelCronsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:cron-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-cron-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cronsource/CamelCronsourceSourceTask.java b/connectors/camel-cron-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cronsource/CamelCronsourceSourceTask.java
deleted file mode 100644
index dee6b47f31..0000000000
--- a/connectors/camel-cron-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cronsource/CamelCronsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.cronsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelCronsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelCronsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:cron-source";
-    }
-}
\ No newline at end of file
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 63d05eca5c..5ef1d51635 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-cxf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxf/CamelCxfSinkConnector.java b/connectors/camel-cxf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxf/CamelCxfSinkConnector.java
index fa0212b5ff..32399fbcba 100644
--- a/connectors/camel-cxf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxf/CamelCxfSinkConnector.java
+++ b/connectors/camel-cxf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxf/CamelCxfSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.cxf;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelCxfSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelCxfSinkConnector extends CamelSinkConnector {
         return CamelCxfSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelCxfSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "cxf");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-cxf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxf/CamelCxfSinkTask.java b/connectors/camel-cxf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxf/CamelCxfSinkTask.java
deleted file mode 100644
index af1b476bc8..0000000000
--- a/connectors/camel-cxf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxf/CamelCxfSinkTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.cxf;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelCxfSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelCxfSinkConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "cxf");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-cxf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxf/CamelCxfSourceConnector.java b/connectors/camel-cxf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxf/CamelCxfSourceConnector.java
index 0530d70793..5256adb612 100644
--- a/connectors/camel-cxf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxf/CamelCxfSourceConnector.java
+++ b/connectors/camel-cxf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxf/CamelCxfSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.cxf;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelCxfSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelCxfSourceConnector extends CamelSourceConnector {
         return CamelCxfSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelCxfSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_COMPONENT_CONF, "cxf");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-cxf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxf/CamelCxfSourceTask.java b/connectors/camel-cxf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxf/CamelCxfSourceTask.java
deleted file mode 100644
index e23d71c079..0000000000
--- a/connectors/camel-cxf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxf/CamelCxfSourceTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.cxf;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelCxfSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelCxfSourceConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSourceConnectorConfig.CAMEL_SOURCE_COMPONENT_CONF, "cxf");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-cxfrs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxfrs/CamelCxfrsSinkConnector.java b/connectors/camel-cxfrs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxfrs/CamelCxfrsSinkConnector.java
index 795284f326..5f873f42be 100644
--- a/connectors/camel-cxfrs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxfrs/CamelCxfrsSinkConnector.java
+++ b/connectors/camel-cxfrs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxfrs/CamelCxfrsSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.cxfrs;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelCxfrsSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelCxfrsSinkConnector extends CamelSinkConnector {
         return CamelCxfrsSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelCxfrsSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "cxfrs");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-cxfrs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxfrs/CamelCxfrsSinkTask.java b/connectors/camel-cxfrs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxfrs/CamelCxfrsSinkTask.java
deleted file mode 100644
index f8ed73e304..0000000000
--- a/connectors/camel-cxfrs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxfrs/CamelCxfrsSinkTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.cxfrs;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelCxfrsSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelCxfrsSinkConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "cxfrs");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-cxfrs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxfrs/CamelCxfrsSourceConnector.java b/connectors/camel-cxfrs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxfrs/CamelCxfrsSourceConnector.java
index 553aab8b11..22f89f9dee 100644
--- a/connectors/camel-cxfrs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxfrs/CamelCxfrsSourceConnector.java
+++ b/connectors/camel-cxfrs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxfrs/CamelCxfrsSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.cxfrs;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelCxfrsSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelCxfrsSourceConnector extends CamelSourceConnector {
         return CamelCxfrsSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelCxfrsSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_COMPONENT_CONF, "cxfrs");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-cxfrs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxfrs/CamelCxfrsSourceTask.java b/connectors/camel-cxfrs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxfrs/CamelCxfrsSourceTask.java
deleted file mode 100644
index 3711c4a922..0000000000
--- a/connectors/camel-cxfrs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/cxfrs/CamelCxfrsSourceTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.cxfrs;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelCxfrsSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelCxfrsSourceConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSourceConnectorConfig.CAMEL_SOURCE_COMPONENT_CONF, "cxfrs");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-databricks-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/databrickssink/CamelDatabrickssinkSinkConnector.java b/connectors/camel-databricks-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/databrickssink/CamelDatabrickssinkSinkConnector.java
index 67b13e0d08..a4dfaca009 100644
--- a/connectors/camel-databricks-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/databrickssink/CamelDatabrickssinkSinkConnector.java
+++ b/connectors/camel-databricks-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/databrickssink/CamelDatabrickssinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.databrickssink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelDatabrickssinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelDatabrickssinkSinkConnector extends CamelSinkConnector {
         return CamelDatabrickssinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelDatabrickssinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:databricks-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-databricks-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/databrickssink/CamelDatabrickssinkSinkTask.java b/connectors/camel-databricks-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/databrickssink/CamelDatabrickssinkSinkTask.java
deleted file mode 100644
index 3fe6d7934e..0000000000
--- a/connectors/camel-databricks-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/databrickssink/CamelDatabrickssinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.databrickssink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelDatabrickssinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelDatabrickssinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:databricks-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-databricks-sink-kafka-connector/src/main/resources/kamelets/databricks-sink.kamelet.yaml b/connectors/camel-databricks-sink-kafka-connector/src/main/resources/kamelets/databricks-sink.kamelet.yaml
index 3f828e7380..92f0e54f5d 100644
--- a/connectors/camel-databricks-sink-kafka-connector/src/main/resources/kamelets/databricks-sink.kamelet.yaml
+++ b/connectors/camel-databricks-sink-kafka-connector/src/main/resources/kamelets/databricks-sink.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: databricks-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0MCA0MCIgd2lkdGg9IjQwIiBoZWlnaHQ9IjQwIj4KICA8cGF0aCBmaWxsPSIjRkYzNjIxIiBkPSJNMjAgMEw0MCA4LjI3VjEzLjFMMjAgMjAuNUwwIDEzLjFWOC4yN0wyMCAwWiIvPgogIDxwYXRoIGZpbGw9IiNGRjM2MjEiIGQ9Ik0wIDEzLjFMMjAgMjAuNVYyNi45TDAgMTkuNVYxMy4xWiIvPgogIDxwYXRoIGZpbGw9IiNGRjM2MjEiIGQ9Ik00MCAxMy4xTDIwIDIwLjVWMjYuOUw0MCAxOS41VjEzLjFaIi8+CiAgPHBhdGggZmlsbD0iI0ZGMzYyMSIgZD0iTTAgMTkuNUwyMC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "SQL"
diff --git a/connectors/camel-databricks-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/databrickssource/CamelDatabrickssourceSourceConnector.java b/connectors/camel-databricks-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/databrickssource/CamelDatabrickssourceSourceConnector.java
index 9fdd929a9a..43c3028dd9 100644
--- a/connectors/camel-databricks-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/databrickssource/CamelDatabrickssourceSourceConnector.java
+++ b/connectors/camel-databricks-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/databrickssource/CamelDatabrickssourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.databrickssource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelDatabrickssourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelDatabrickssourceSourceConnector
         return CamelDatabrickssourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelDatabrickssourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:databricks-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-databricks-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/databrickssource/CamelDatabrickssourceSourceTask.java b/connectors/camel-databricks-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/databrickssource/CamelDatabrickssourceSourceTask.java
deleted file mode 100644
index af064b0625..0000000000
--- a/connectors/camel-databricks-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/databrickssource/CamelDatabrickssourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.databrickssource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelDatabrickssourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelDatabrickssourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:databricks-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-databricks-source-kafka-connector/src/main/resources/kamelets/databricks-source.kamelet.yaml b/connectors/camel-databricks-source-kafka-connector/src/main/resources/kamelets/databricks-source.kamelet.yaml
index bf970f83a3..f95e9ebd6e 100644
--- a/connectors/camel-databricks-source-kafka-connector/src/main/resources/kamelets/databricks-source.kamelet.yaml
+++ b/connectors/camel-databricks-source-kafka-connector/src/main/resources/kamelets/databricks-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: databricks-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0MCA0MCIgd2lkdGg9IjQwIiBoZWlnaHQ9IjQwIj4KICA8cGF0aCBmaWxsPSIjRkYzNjIxIiBkPSJNMjAgMEw0MCA4LjI3VjEzLjFMMjAgMjAuNUwwIDEzLjFWOC4yN0wyMCAwWiIvPgogIDxwYXRoIGZpbGw9IiNGRjM2MjEiIGQ9Ik0wIDEzLjFMMjAgMjAuNVYyNi45TDAgMTkuNVYxMy4xWiIvPgogIDxwYXRoIGZpbGw9IiNGRjM2MjEiIGQ9Ik00MCAxMy4xTDIwIDIwLjVWMjYuOUw0MCAxOS41VjEzLjFaIi8+CiAgPHBhdGggZmlsbD0iI0ZGMzYyMSIgZD0iTTAgMTkuNUwyMC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "SQL"
diff --git a/connectors/camel-dropbox-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/dropboxsink/CamelDropboxsinkSinkConnector.java b/connectors/camel-dropbox-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/dropboxsink/CamelDropboxsinkSinkConnector.java
index dc6d78e737..f02cf10eb2 100644
--- a/connectors/camel-dropbox-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/dropboxsink/CamelDropboxsinkSinkConnector.java
+++ b/connectors/camel-dropbox-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/dropboxsink/CamelDropboxsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.dropboxsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelDropboxsinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelDropboxsinkSinkConnector extends CamelSinkConnector {
         return CamelDropboxsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelDropboxsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:dropbox-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-dropbox-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/dropboxsink/CamelDropboxsinkSinkTask.java b/connectors/camel-dropbox-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/dropboxsink/CamelDropboxsinkSinkTask.java
deleted file mode 100644
index ad8763650b..0000000000
--- a/connectors/camel-dropbox-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/dropboxsink/CamelDropboxsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.dropboxsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelDropboxsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelDropboxsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:dropbox-sink";
-    }
-}
\ No newline at end of file
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 a91db682a5..684e2fd41f 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-dropbox-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/dropboxsource/CamelDropboxsourceSourceConnector.java b/connectors/camel-dropbox-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/dropboxsource/CamelDropboxsourceSourceConnector.java
index a88c8a3f98..371d1c86af 100644
--- a/connectors/camel-dropbox-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/dropboxsource/CamelDropboxsourceSourceConnector.java
+++ b/connectors/camel-dropbox-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/dropboxsource/CamelDropboxsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.dropboxsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelDropboxsourceSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelDropboxsourceSourceConnector extends CamelSourceConnector {
         return CamelDropboxsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelDropboxsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:dropbox-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-dropbox-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/dropboxsource/CamelDropboxsourceSourceTask.java b/connectors/camel-dropbox-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/dropboxsource/CamelDropboxsourceSourceTask.java
deleted file mode 100644
index f1091853c1..0000000000
--- a/connectors/camel-dropbox-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/dropboxsource/CamelDropboxsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.dropboxsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelDropboxsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelDropboxsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:dropbox-source";
-    }
-}
\ No newline at end of file
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 8199c2844b..aaf1c81d22 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-earthquake-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/earthquakesource/CamelEarthquakesourceSourceConnector.java b/connectors/camel-earthquake-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/earthquakesource/CamelEarthquakesourceSourceConnector.java
index 9230dc2570..db633585a6 100644
--- a/connectors/camel-earthquake-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/earthquakesource/CamelEarthquakesourceSourceConnector.java
+++ b/connectors/camel-earthquake-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/earthquakesource/CamelEarthquakesourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.earthquakesource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelEarthquakesourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelEarthquakesourceSourceConnector
         return CamelEarthquakesourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelEarthquakesourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:earthquake-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-earthquake-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/earthquakesource/CamelEarthquakesourceSourceTask.java b/connectors/camel-earthquake-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/earthquakesource/CamelEarthquakesourceSourceTask.java
deleted file mode 100644
index 974bcfc239..0000000000
--- a/connectors/camel-earthquake-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/earthquakesource/CamelEarthquakesourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.earthquakesource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelEarthquakesourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelEarthquakesourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:earthquake-source";
-    }
-}
\ No newline at end of file
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 ab9d9e4063..ad6920bafc 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-elasticsearch-index-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/elasticsearchindexsink/CamelElasticsearchindexsinkSinkConnector.java b/connectors/camel-elasticsearch-index-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/elasticsearchindexsink/CamelElasticsearchindexsinkSinkConnector.java
index 958ea0d012..31bcbbe2f4 100644
--- a/connectors/camel-elasticsearch-index-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/elasticsearchindexsink/CamelElasticsearchindexsinkSinkConnector.java
+++ b/connectors/camel-elasticsearch-index-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/elasticsearchindexsink/CamelElasticsearchindexsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.elasticsearchindexsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelElasticsearchindexsinkSinkConnector
@@ -31,7 +33,7 @@ public class CamelElasticsearchindexsinkSinkConnector
         return CamelElasticsearchindexsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelElasticsearchindexsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:elasticsearch-index-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-elasticsearch-index-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/elasticsearchindexsink/CamelElasticsearchindexsinkSinkTask.java b/connectors/camel-elasticsearch-index-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/elasticsearchindexsink/CamelElasticsearchindexsinkSinkTask.java
deleted file mode 100644
index 04a458d574..0000000000
--- a/connectors/camel-elasticsearch-index-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/elasticsearchindexsink/CamelElasticsearchindexsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.elasticsearchindexsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelElasticsearchindexsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelElasticsearchindexsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:elasticsearch-index-sink";
-    }
-}
\ No newline at end of file
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 18bb9e0314..ce9669921c 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.group: "ElasticSearch"
     camel.apache.org/kamelet.namespace: "Search"
     camel.apache.org/provider: "Apache Software Foundation"
@@ -100,24 +100,24 @@ spec:
           - simple: "${header[indexId]}"
             steps:
             - setHeader:
-                name: "indexId"
+                name: "CamelElasticsearchIndexId"
                 simple: "${header[indexId]}"
           - simple: "${header[ce-indexid]}"
             steps:
             - setHeader:
-                name: "indexId"
+                name: "CamelElasticsearchIndexId"
                 simple: "${header[ce-indexid]}"
       - choice:
           when:
           - simple: "${header[indexName]}"
             steps:
             - setHeader:
-                name: "indexName"
+                name: "CamelElasticsearchIndexName"
                 simple: "${header[indexName]}"
           - simple: "${header[ce-indexname]}"
             steps:
             - setHeader:
-                name: "indexName"
+                name: "CamelElasticsearchIndexName"
                 simple: "${header[ce-indexname]}"
       - unmarshal:
           json: {}
diff --git a/connectors/camel-elasticsearch-search-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/elasticsearchsearchsource/CamelElasticsearchsearchsourceSourceConnector.java b/connectors/camel-elasticsearch-search-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/elasticsearchsearchsource/CamelElasticsearchsearchsourceSourceConnector.java
index 4763cea608..a543eee071 100644
--- a/connectors/camel-elasticsearch-search-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/elasticsearchsearchsource/CamelElasticsearchsearchsourceSourceConnector.java
+++ b/connectors/camel-elasticsearch-search-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/elasticsearchsearchsource/CamelElasticsearchsearchsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.elasticsearchsearchsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelElasticsearchsearchsourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelElasticsearchsearchsourceSourceConnector
         return CamelElasticsearchsearchsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelElasticsearchsearchsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:elasticsearch-search-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-elasticsearch-search-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/elasticsearchsearchsource/CamelElasticsearchsearchsourceSourceTask.java b/connectors/camel-elasticsearch-search-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/elasticsearchsearchsource/CamelElasticsearchsearchsourceSourceTask.java
deleted file mode 100644
index 9858790adb..0000000000
--- a/connectors/camel-elasticsearch-search-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/elasticsearchsearchsource/CamelElasticsearchsearchsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.elasticsearchsearchsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelElasticsearchsearchsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelElasticsearchsearchsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:elasticsearch-search-source";
-    }
-}
\ No newline at end of file
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 989b6ea5e1..7a6bfcab5b 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.group: "ElasticSearch"
     camel.apache.org/kamelet.namespace: "Search"
     camel.apache.org/provider: "Apache Software Foundation"
diff --git a/connectors/camel-exec-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/execsink/CamelExecsinkSinkConnector.java b/connectors/camel-exec-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/execsink/CamelExecsinkSinkConnector.java
index 35d58f40cf..f818e3f1b9 100644
--- a/connectors/camel-exec-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/execsink/CamelExecsinkSinkConnector.java
+++ b/connectors/camel-exec-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/execsink/CamelExecsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.execsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelExecsinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelExecsinkSinkConnector extends CamelSinkConnector {
         return CamelExecsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelExecsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:exec-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-exec-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/execsink/CamelExecsinkSinkTask.java b/connectors/camel-exec-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/execsink/CamelExecsinkSinkTask.java
deleted file mode 100644
index 5a58522bb2..0000000000
--- a/connectors/camel-exec-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/execsink/CamelExecsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.execsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelExecsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelExecsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:exec-sink";
-    }
-}
\ No newline at end of file
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 3205465976..3c5b4087b0 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-fhir-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/fhirsink/CamelFhirsinkSinkConnector.java b/connectors/camel-fhir-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/fhirsink/CamelFhirsinkSinkConnector.java
index 261c1de955..3289ce906d 100644
--- a/connectors/camel-fhir-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/fhirsink/CamelFhirsinkSinkConnector.java
+++ b/connectors/camel-fhir-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/fhirsink/CamelFhirsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.fhirsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelFhirsinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelFhirsinkSinkConnector extends CamelSinkConnector {
         return CamelFhirsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelFhirsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:fhir-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-fhir-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/fhirsink/CamelFhirsinkSinkTask.java b/connectors/camel-fhir-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/fhirsink/CamelFhirsinkSinkTask.java
deleted file mode 100644
index 43984f8b9a..0000000000
--- a/connectors/camel-fhir-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/fhirsink/CamelFhirsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.fhirsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelFhirsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelFhirsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:fhir-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-fhir-sink-kafka-connector/src/main/resources/kamelets/fhir-sink.kamelet.yaml b/connectors/camel-fhir-sink-kafka-connector/src/main/resources/kamelets/fhir-sink.kamelet.yaml
index 0427448a3c..4eb4091150 100644
--- a/connectors/camel-fhir-sink-kafka-connector/src/main/resources/kamelets/fhir-sink.kamelet.yaml
+++ b/connectors/camel-fhir-sink-kafka-connector/src/main/resources/kamelets/fhir-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: fhir-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-fhir-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/fhirsource/CamelFhirsourceSourceConnector.java b/connectors/camel-fhir-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/fhirsource/CamelFhirsourceSourceConnector.java
index b1c997285f..93c1aaef91 100644
--- a/connectors/camel-fhir-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/fhirsource/CamelFhirsourceSourceConnector.java
+++ b/connectors/camel-fhir-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/fhirsource/CamelFhirsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.fhirsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelFhirsourceSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelFhirsourceSourceConnector extends CamelSourceConnector {
         return CamelFhirsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelFhirsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:fhir-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-fhir-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/fhirsource/CamelFhirsourceSourceTask.java b/connectors/camel-fhir-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/fhirsource/CamelFhirsourceSourceTask.java
deleted file mode 100644
index b80c4e7587..0000000000
--- a/connectors/camel-fhir-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/fhirsource/CamelFhirsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.fhirsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelFhirsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelFhirsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:fhir-source";
-    }
-}
\ No newline at end of file
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 c65fb6ab46..ea3506443b 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSinkConnector.java b/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSinkConnector.java
index e4f5b8cd7a..7f023e8d52 100644
--- a/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSinkConnector.java
+++ b/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.file;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelFileSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelFileSinkConnector extends CamelSinkConnector {
         return CamelFileSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelFileSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "file");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSinkTask.java b/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSinkTask.java
deleted file mode 100644
index 23eb2b689e..0000000000
--- a/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSinkTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.file;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelFileSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelFileSinkConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "file");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSourceConnector.java b/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSourceConnector.java
index eaa7b5321c..7503e998fa 100644
--- a/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSourceConnector.java
+++ b/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.file;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelFileSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelFileSourceConnector extends CamelSourceConnector {
         return CamelFileSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelFileSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_COMPONENT_CONF, "file");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSourceTask.java b/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSourceTask.java
deleted file mode 100644
index 77a8400e5a..0000000000
--- a/connectors/camel-file-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/file/CamelFileSourceTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.file;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelFileSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelFileSourceConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSourceConnectorConfig.CAMEL_SOURCE_COMPONENT_CONF, "file");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-file-watch-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/filewatchsource/CamelFilewatchsourceSourceConnector.java b/connectors/camel-file-watch-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/filewatchsource/CamelFilewatchsourceSourceConnector.java
index 9dcb45fc88..ba621b20f8 100644
--- a/connectors/camel-file-watch-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/filewatchsource/CamelFilewatchsourceSourceConnector.java
+++ b/connectors/camel-file-watch-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/filewatchsource/CamelFilewatchsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.filewatchsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelFilewatchsourceSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelFilewatchsourceSourceConnector extends CamelSourceConnector {
         return CamelFilewatchsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelFilewatchsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:file-watch-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-file-watch-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/filewatchsource/CamelFilewatchsourceSourceTask.java b/connectors/camel-file-watch-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/filewatchsource/CamelFilewatchsourceSourceTask.java
deleted file mode 100644
index f4c2816b6b..0000000000
--- a/connectors/camel-file-watch-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/filewatchsource/CamelFilewatchsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.filewatchsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelFilewatchsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelFilewatchsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:file-watch-source";
-    }
-}
\ No newline at end of file
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 254d594ea9..1d28b45388 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-ftp-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpsink/CamelFtpsinkSinkConnector.java b/connectors/camel-ftp-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpsink/CamelFtpsinkSinkConnector.java
index d66df2b5cc..a5f0c46e40 100644
--- a/connectors/camel-ftp-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpsink/CamelFtpsinkSinkConnector.java
+++ b/connectors/camel-ftp-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpsink/CamelFtpsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.ftpsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelFtpsinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelFtpsinkSinkConnector extends CamelSinkConnector {
         return CamelFtpsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelFtpsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:ftp-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-ftp-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpsink/CamelFtpsinkSinkTask.java b/connectors/camel-ftp-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpsink/CamelFtpsinkSinkTask.java
deleted file mode 100644
index cd63046e66..0000000000
--- a/connectors/camel-ftp-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpsink/CamelFtpsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.ftpsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelFtpsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelFtpsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:ftp-sink";
-    }
-}
\ No newline at end of file
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 ef5b5714d4..7f2c9098ec 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-ftp-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpsource/CamelFtpsourceSourceConnector.java b/connectors/camel-ftp-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpsource/CamelFtpsourceSourceConnector.java
index 73b1e81244..59eabca354 100644
--- a/connectors/camel-ftp-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpsource/CamelFtpsourceSourceConnector.java
+++ b/connectors/camel-ftp-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpsource/CamelFtpsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.ftpsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelFtpsourceSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelFtpsourceSourceConnector extends CamelSourceConnector {
         return CamelFtpsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelFtpsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:ftp-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-ftp-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpsource/CamelFtpsourceSourceTask.java b/connectors/camel-ftp-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpsource/CamelFtpsourceSourceTask.java
deleted file mode 100644
index fb5650b20d..0000000000
--- a/connectors/camel-ftp-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpsource/CamelFtpsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.ftpsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelFtpsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelFtpsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:ftp-source";
-    }
-}
\ No newline at end of file
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 32a5c29e72..63bacf269d 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-ftps-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpssink/CamelFtpssinkSinkConnector.java b/connectors/camel-ftps-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpssink/CamelFtpssinkSinkConnector.java
index 2a24a5fbff..ed87e09d84 100644
--- a/connectors/camel-ftps-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpssink/CamelFtpssinkSinkConnector.java
+++ b/connectors/camel-ftps-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpssink/CamelFtpssinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.ftpssink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelFtpssinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelFtpssinkSinkConnector extends CamelSinkConnector {
         return CamelFtpssinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelFtpssinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:ftps-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-ftps-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpssink/CamelFtpssinkSinkTask.java b/connectors/camel-ftps-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpssink/CamelFtpssinkSinkTask.java
deleted file mode 100644
index af46a7ea7b..0000000000
--- a/connectors/camel-ftps-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpssink/CamelFtpssinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.ftpssink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelFtpssinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelFtpssinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:ftps-sink";
-    }
-}
\ No newline at end of file
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 b4f9918f9c..7faee0eabf 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-ftps-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpssource/CamelFtpssourceSourceConnector.java b/connectors/camel-ftps-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpssource/CamelFtpssourceSourceConnector.java
index 3bc9d6b2d0..f7a0f6b365 100644
--- a/connectors/camel-ftps-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpssource/CamelFtpssourceSourceConnector.java
+++ b/connectors/camel-ftps-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpssource/CamelFtpssourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.ftpssource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelFtpssourceSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelFtpssourceSourceConnector extends CamelSourceConnector {
         return CamelFtpssourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelFtpssourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:ftps-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-ftps-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpssource/CamelFtpssourceSourceTask.java b/connectors/camel-ftps-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpssource/CamelFtpssourceSourceTask.java
deleted file mode 100644
index dcf9fa4cb4..0000000000
--- a/connectors/camel-ftps-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftpssource/CamelFtpssourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.ftpssource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelFtpssourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelFtpssourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:ftps-source";
-    }
-}
\ No newline at end of file
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 95c44cd64d..bb057b7ad0 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: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.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"
diff --git a/connectors/camel-google-bigquery-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlebigquerysink/CamelGooglebigquerysinkSinkConnector.java b/connectors/camel-google-bigquery-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlebigquerysink/CamelGooglebigquerysinkSinkConnector.java
index 3c2af602ea..0d114c8046 100644
--- a/connectors/camel-google-bigquery-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlebigquerysink/CamelGooglebigquerysinkSinkConnector.java
+++ b/connectors/camel-google-bigquery-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlebigquerysink/CamelGooglebigquerysinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.googlebigquerysink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelGooglebigquerysinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelGooglebigquerysinkSinkConnector extends CamelSinkConnector {
         return CamelGooglebigquerysinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelGooglebigquerysinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:google-bigquery-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-google-bigquery-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlebigquerysink/CamelGooglebigquerysinkSinkTask.java b/connectors/camel-google-bigquery-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlebigquerysink/CamelGooglebigquerysinkSinkTask.java
deleted file mode 100644
index db5cb2ae99..0000000000
--- a/connectors/camel-google-bigquery-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlebigquerysink/CamelGooglebigquerysinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.googlebigquerysink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGooglebigquerysinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelGooglebigquerysinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:google-bigquery-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-google-bigquery-sink-kafka-connector/src/main/resources/kamelets/google-bigquery-sink.kamelet.yaml b/connectors/camel-google-bigquery-sink-kafka-connector/src/main/resources/kamelets/google-bigquery-sink.kamelet.yaml
index f1dace901c..d4738887bf 100644
--- a/connectors/camel-google-bigquery-sink-kafka-connector/src/main/resources/kamelets/google-bigquery-sink.kamelet.yaml
+++ b/connectors/camel-google-bigquery-sink-kafka-connector/src/main/resources/kamelets/google-bigquery-sink.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: google-bigquery-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHdpZHRoPSIyNTAwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgICAgdmlld0JveD0iLTEuNjMzMjM1NDMzMzI4MjU2IDcuMDMyNjA5MzMwMzE1NjU2NSAxMzEuMjY1NzQ2ODI0MTY4NzYgMTE0LjYzNDM5MDY2OTY4NDM1IiB2ZXJzaW9uPSIxLjAiPgogICAgPGxpbmVhckdyYWRpZW50IGlkPSJhIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjY0IiB4Mj0iNjQiIHkxPSI3LjAzNCIgeTI9IjEyMC43ODkiPgogICAgICAgIDxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0iIzQzODdmZCIvPgogIC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Google Big Query"
diff --git a/connectors/camel-google-calendar-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlecalendarsource/CamelGooglecalendarsourceSourceConnector.java b/connectors/camel-google-calendar-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlecalendarsource/CamelGooglecalendarsourceSourceConnector.java
index fb231a1937..ce3adeb32f 100644
--- a/connectors/camel-google-calendar-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlecalendarsource/CamelGooglecalendarsourceSourceConnector.java
+++ b/connectors/camel-google-calendar-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlecalendarsource/CamelGooglecalendarsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.googlecalendarsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelGooglecalendarsourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelGooglecalendarsourceSourceConnector
         return CamelGooglecalendarsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelGooglecalendarsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:google-calendar-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-google-calendar-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlecalendarsource/CamelGooglecalendarsourceSourceTask.java b/connectors/camel-google-calendar-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlecalendarsource/CamelGooglecalendarsourceSourceTask.java
deleted file mode 100644
index 8895a041f9..0000000000
--- a/connectors/camel-google-calendar-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlecalendarsource/CamelGooglecalendarsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.googlecalendarsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGooglecalendarsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelGooglecalendarsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:google-calendar-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-google-calendar-source-kafka-connector/src/main/resources/kamelets/google-calendar-source.kamelet.yaml b/connectors/camel-google-calendar-source-kafka-connector/src/main/resources/kamelets/google-calendar-source.kamelet.yaml
index 2089df3e4c..a9856b591a 100644
--- a/connectors/camel-google-calendar-source-kafka-connector/src/main/resources/kamelets/google-calendar-source.kamelet.yaml
+++ b/connectors/camel-google-calendar-source-kafka-connector/src/main/resources/kamelets/google-calendar-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: google-calendar-source
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjE4NiAzOCA3NiA3NiI+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTI0NCA1NmgtNDB2NDBoNDBWNTZ6Ii8+PHBhdGggZmlsbD0iI0VBNDMzNSIgZD0iTTI0NCAxMTRsMTgtMThoLTE4djE4eiIvPjxwYXRoIGZpbGw9IiNGQkJDMDQiIGQ9Ik0yNjIgNTZoLTE4djQwaDE4VjU2eiIvPjxwYXRoIGZpbGw9IiMzNEE4NTMiIGQ9Ik0yNDQgOTZoLTQwdjE4aDQwVjk2eiIvPjxwYXRoIGZpbGw9IiMxODgwMzgiIGQ9Ik0xODYgOTZ2MTJjMCAzLjMxNSAyLjY4NSA2IDYgNmgxMlY5NmgtMTh6Ii8+PH [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Google Calendar"
diff --git a/connectors/camel-google-functions-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctionssink/CamelGooglefunctionssinkSinkConnector.java b/connectors/camel-google-functions-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctionssink/CamelGooglefunctionssinkSinkConnector.java
index c0cbbd2988..ddd832f3ff 100644
--- a/connectors/camel-google-functions-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctionssink/CamelGooglefunctionssinkSinkConnector.java
+++ b/connectors/camel-google-functions-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctionssink/CamelGooglefunctionssinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.googlefunctionssink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelGooglefunctionssinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelGooglefunctionssinkSinkConnector extends CamelSinkConnector {
         return CamelGooglefunctionssinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelGooglefunctionssinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:google-functions-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-google-functions-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctionssink/CamelGooglefunctionssinkSinkTask.java b/connectors/camel-google-functions-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctionssink/CamelGooglefunctionssinkSinkTask.java
deleted file mode 100644
index cdc1fac75c..0000000000
--- a/connectors/camel-google-functions-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlefunctionssink/CamelGooglefunctionssinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.googlefunctionssink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGooglefunctionssinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelGooglefunctionssinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:google-functions-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-google-functions-sink-kafka-connector/src/main/resources/kamelets/google-functions-sink.kamelet.yaml b/connectors/camel-google-functions-sink-kafka-connector/src/main/resources/kamelets/google-functions-sink.kamelet.yaml
index d51ce03d5c..e2d22b0cd7 100644
--- a/connectors/camel-google-functions-sink-kafka-connector/src/main/resources/kamelets/google-functions-sink.kamelet.yaml
+++ b/connectors/camel-google-functions-sink-kafka-connector/src/main/resources/kamelets/google-functions-sink.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: google-functions-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMjU2cHgiIGhlaWdodD0iMjMxcHgiIHZpZXdCb3g9IjAgMCAyNTYgMjMxIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaWRZTWlkIj4KICAgIDxkZWZzPgogICAgICAgIDxwYXRoIGQ9Ik0yNTIuOTI1ODU0LDEwMy4yMzcwNzcgTDIwMC4zMjczNDQsMTEuNzU5NjY3IEMxOTYuMzAyNTc5LDQuNjIyMjU3MDMgMTg4LjgwMD [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Google Functions"
diff --git a/connectors/camel-google-mail-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlemailsource/CamelGooglemailsourceSourceConnector.java b/connectors/camel-google-mail-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlemailsource/CamelGooglemailsourceSourceConnector.java
index ff59c3ae7c..15538bb3de 100644
--- a/connectors/camel-google-mail-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlemailsource/CamelGooglemailsourceSourceConnector.java
+++ b/connectors/camel-google-mail-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlemailsource/CamelGooglemailsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.googlemailsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelGooglemailsourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelGooglemailsourceSourceConnector
         return CamelGooglemailsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelGooglemailsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:google-mail-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-google-mail-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlemailsource/CamelGooglemailsourceSourceTask.java b/connectors/camel-google-mail-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlemailsource/CamelGooglemailsourceSourceTask.java
deleted file mode 100644
index 9186b00ecf..0000000000
--- a/connectors/camel-google-mail-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlemailsource/CamelGooglemailsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.googlemailsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGooglemailsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelGooglemailsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:google-mail-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-google-mail-source-kafka-connector/src/main/resources/kamelets/google-mail-source.kamelet.yaml b/connectors/camel-google-mail-source-kafka-connector/src/main/resources/kamelets/google-mail-source.kamelet.yaml
index c7800a12e1..5c5996aad0 100644
--- a/connectors/camel-google-mail-source-kafka-connector/src/main/resources/kamelets/google-mail-source.kamelet.yaml
+++ b/connectors/camel-google-mail-source-kafka-connector/src/main/resources/kamelets/google-mail-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: google-mail-source
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjUyIDQyIDg4IDY2Ij4KPHBhdGggZmlsbD0iIzQyODVmNCIgZD0iTTU4IDEwOGgxNFY3NEw1MiA1OXY0M2MwIDMuMzIgMi42OSA2IDYgNiIvPgo8cGF0aCBmaWxsPSIjMzRhODUzIiBkPSJNMTIwIDEwOGgxNGMzLjMyIDAgNi0yLjY5IDYtNlY1OWwtMjAgMTUiLz4KPHBhdGggZmlsbD0iI2ZiYmMwNCIgZD0iTTEyMCA0OHYyNmwyMC0xNXYtOGMwLTcuNDItOC40Ny0xMS42NS0xNC40LTcuMiIvPgo8cGF0aCBmaWxsPSIjZWE0MzM1IiBkPSJNNzIgNzRWNDhsMjQgMTggMjQtMTh2MjZMOT [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Google Mail"
diff --git a/connectors/camel-google-pubsub-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsubsink/CamelGooglepubsubsinkSinkConnector.java b/connectors/camel-google-pubsub-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsubsink/CamelGooglepubsubsinkSinkConnector.java
index bc33098763..000a33d81b 100644
--- a/connectors/camel-google-pubsub-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsubsink/CamelGooglepubsubsinkSinkConnector.java
+++ b/connectors/camel-google-pubsub-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsubsink/CamelGooglepubsubsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.googlepubsubsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelGooglepubsubsinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelGooglepubsubsinkSinkConnector extends CamelSinkConnector {
         return CamelGooglepubsubsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelGooglepubsubsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:google-pubsub-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-google-pubsub-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsubsink/CamelGooglepubsubsinkSinkTask.java b/connectors/camel-google-pubsub-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsubsink/CamelGooglepubsubsinkSinkTask.java
deleted file mode 100644
index ed8ad8ba7a..0000000000
--- a/connectors/camel-google-pubsub-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsubsink/CamelGooglepubsubsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.googlepubsubsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGooglepubsubsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelGooglepubsubsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:google-pubsub-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-google-pubsub-sink-kafka-connector/src/main/resources/kamelets/google-pubsub-sink.kamelet.yaml b/connectors/camel-google-pubsub-sink-kafka-connector/src/main/resources/kamelets/google-pubsub-sink.kamelet.yaml
index cfc19c27eb..72d821bfc7 100644
--- a/connectors/camel-google-pubsub-sink-kafka-connector/src/main/resources/kamelets/google-pubsub-sink.kamelet.yaml
+++ b/connectors/camel-google-pubsub-sink-kafka-connector/src/main/resources/kamelets/google-pubsub-sink.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: google-pubsub-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHZpZXdCb3g9Ii0xLjYzMzIzNTQzIDcuMDMyNjA5MzMgMTMxLjI2NTc0NjgyIDExNC40MzkzOTA2NyIgd2lkdGg9IjI1MDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxsaW5lYXJHcmFkaWVudCBpZD0iYSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSI2NCIgeDI9IjY0IiB5MT0iNy4wMzQiIHkyPSIxMjAuNzg5Ij48c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM0Mzg3ZmQiLz48c3RvcCBvZmZzZXQ9IjEiIHN0b3 [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Google Pubsub"
diff --git a/connectors/camel-google-pubsub-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsubsource/CamelGooglepubsubsourceSourceConnector.java b/connectors/camel-google-pubsub-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsubsource/CamelGooglepubsubsourceSourceConnector.java
index 4fcea3fb1a..0dc240dcda 100644
--- a/connectors/camel-google-pubsub-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsubsource/CamelGooglepubsubsourceSourceConnector.java
+++ b/connectors/camel-google-pubsub-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsubsource/CamelGooglepubsubsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.googlepubsubsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelGooglepubsubsourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelGooglepubsubsourceSourceConnector
         return CamelGooglepubsubsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelGooglepubsubsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:google-pubsub-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-google-pubsub-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsubsource/CamelGooglepubsubsourceSourceTask.java b/connectors/camel-google-pubsub-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsubsource/CamelGooglepubsubsourceSourceTask.java
deleted file mode 100644
index 90398266f9..0000000000
--- a/connectors/camel-google-pubsub-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlepubsubsource/CamelGooglepubsubsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.googlepubsubsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGooglepubsubsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelGooglepubsubsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:google-pubsub-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-google-pubsub-source-kafka-connector/src/main/resources/kamelets/google-pubsub-source.kamelet.yaml b/connectors/camel-google-pubsub-source-kafka-connector/src/main/resources/kamelets/google-pubsub-source.kamelet.yaml
index 54c296cb58..9ce1bc0d18 100644
--- a/connectors/camel-google-pubsub-source-kafka-connector/src/main/resources/kamelets/google-pubsub-source.kamelet.yaml
+++ b/connectors/camel-google-pubsub-source-kafka-connector/src/main/resources/kamelets/google-pubsub-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: google-pubsub-source
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHZpZXdCb3g9Ii0xLjYzMzIzNTQzIDcuMDMyNjA5MzMgMTMxLjI2NTc0NjgyIDExNC40MzkzOTA2NyIgd2lkdGg9IjI1MDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxsaW5lYXJHcmFkaWVudCBpZD0iYSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSI2NCIgeDI9IjY0IiB5MT0iNy4wMzQiIHkyPSIxMjAuNzg5Ij48c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM0Mzg3ZmQiLz48c3RvcCBvZmZzZXQ9IjEiIHN0b3 [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Google Pubsub"
diff --git a/connectors/camel-google-sheets-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlesheetssink/CamelGooglesheetssinkSinkConnector.java b/connectors/camel-google-sheets-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlesheetssink/CamelGooglesheetssinkSinkConnector.java
index 2eb585d1f7..949a48ba79 100644
--- a/connectors/camel-google-sheets-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlesheetssink/CamelGooglesheetssinkSinkConnector.java
+++ b/connectors/camel-google-sheets-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlesheetssink/CamelGooglesheetssinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.googlesheetssink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelGooglesheetssinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelGooglesheetssinkSinkConnector extends CamelSinkConnector {
         return CamelGooglesheetssinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelGooglesheetssinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:google-sheets-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-google-sheets-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlesheetssink/CamelGooglesheetssinkSinkTask.java b/connectors/camel-google-sheets-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlesheetssink/CamelGooglesheetssinkSinkTask.java
deleted file mode 100644
index e819132648..0000000000
--- a/connectors/camel-google-sheets-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlesheetssink/CamelGooglesheetssinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.googlesheetssink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGooglesheetssinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelGooglesheetssinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:google-sheets-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-google-sheets-sink-kafka-connector/src/main/resources/kamelets/google-sheets-sink.kamelet.yaml b/connectors/camel-google-sheets-sink-kafka-connector/src/main/resources/kamelets/google-sheets-sink.kamelet.yaml
index ca2df05e6d..1fb52a6e5e 100644
--- a/connectors/camel-google-sheets-sink-kafka-connector/src/main/resources/kamelets/google-sheets-sink.kamelet.yaml
+++ b/connectors/camel-google-sheets-sink-kafka-connector/src/main/resources/kamelets/google-sheets-sink.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: google-sheets-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI1LjAuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgoJIHZpZXdCb3g9IjAgMCA2NCA4OCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgNjQgODg7Ii [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Google Sheets"
diff --git a/connectors/camel-google-sheets-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlesheetssource/CamelGooglesheetssourceSourceConnector.java b/connectors/camel-google-sheets-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlesheetssource/CamelGooglesheetssourceSourceConnector.java
index f4e90d4ffe..a9f35c1ca1 100644
--- a/connectors/camel-google-sheets-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlesheetssource/CamelGooglesheetssourceSourceConnector.java
+++ b/connectors/camel-google-sheets-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlesheetssource/CamelGooglesheetssourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.googlesheetssource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelGooglesheetssourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelGooglesheetssourceSourceConnector
         return CamelGooglesheetssourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelGooglesheetssourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:google-sheets-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-google-sheets-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlesheetssource/CamelGooglesheetssourceSourceTask.java b/connectors/camel-google-sheets-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlesheetssource/CamelGooglesheetssourceSourceTask.java
deleted file mode 100644
index ba8a9c7e69..0000000000
--- a/connectors/camel-google-sheets-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlesheetssource/CamelGooglesheetssourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.googlesheetssource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGooglesheetssourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelGooglesheetssourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:google-sheets-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-google-sheets-source-kafka-connector/src/main/resources/kamelets/google-sheets-source.kamelet.yaml b/connectors/camel-google-sheets-source-kafka-connector/src/main/resources/kamelets/google-sheets-source.kamelet.yaml
index 509a28672a..63921b1bf5 100644
--- a/connectors/camel-google-sheets-source-kafka-connector/src/main/resources/kamelets/google-sheets-source.kamelet.yaml
+++ b/connectors/camel-google-sheets-source-kafka-connector/src/main/resources/kamelets/google-sheets-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: google-sheets-source
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI1LjAuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgoJIHZpZXdCb3g9IjAgMCA2NCA4OCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgNjQgODg7Ii [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Google Sheets"
diff --git a/connectors/camel-google-storage-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorageeventbasedsource/CamelGooglestorageeventbasedsourceSourceConnector.java b/connectors/camel-google-storage-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorageeventbasedsource/CamelGooglestorageeventbasedsourceSourceConnector.java
index c57785d855..d550a6db33 100644
--- a/connectors/camel-google-storage-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorageeventbasedsource/CamelGooglestorageeventbasedsourceSourceConnector.java
+++ b/connectors/camel-google-storage-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorageeventbasedsource/CamelGooglestorageeventbasedsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.googlestorageeventbasedsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelGooglestorageeventbasedsourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelGooglestorageeventbasedsourceSourceConnector
         return CamelGooglestorageeventbasedsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelGooglestorageeventbasedsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:google-storage-event-based-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-google-storage-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorageeventbasedsource/CamelGooglestorageeventbasedsourceSourceTask.java b/connectors/camel-google-storage-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorageeventbasedsource/CamelGooglestorageeventbasedsourceSourceTask.java
deleted file mode 100644
index f525b3ab7b..0000000000
--- a/connectors/camel-google-storage-event-based-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestorageeventbasedsource/CamelGooglestorageeventbasedsourceSourceTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.googlestorageeventbasedsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGooglestorageeventbasedsourceSourceTask
-        extends
-            CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelGooglestorageeventbasedsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:google-storage-event-based-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-google-storage-event-based-source-kafka-connector/src/main/resources/kamelets/google-storage-event-based-source.kamelet.yaml b/connectors/camel-google-storage-event-based-source-kafka-connector/src/main/resources/kamelets/google-storage-event-based-source.kamelet.yaml
index ba362ebba6..b9c085d91c 100644
--- a/connectors/camel-google-storage-event-based-source-kafka-connector/src/main/resources/kamelets/google-storage-event-based-source.kamelet.yaml
+++ b/connectors/camel-google-storage-event-based-source-kafka-connector/src/main/resources/kamelets/google-storage-event-based-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: google-storage-event-based-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjI1MDAiIHZpZXdCb3g9Ii0xLjYzMzIzNTQzIDcuMDMyNjA5MzMgMTMxLjI2NTc0NjgyIDExNC40MzkzOTA2NyIgd2lkdGg9IjI1MDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxsaW5lYXJHcmFkaWVudCBpZD0iYSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSI2NCIgeDI9IjY0IiB5MT0iNy4wMzQiIHkyPSIxMjAuNzg5Ij48c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM0Mzg3ZmQiLz48c3RvcCBvZmZzZXQ9IjEiIHN0b3 [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Google Storage Event-based"
diff --git a/connectors/camel-google-storage-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestoragesink/CamelGooglestoragesinkSinkConnector.java b/connectors/camel-google-storage-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestoragesink/CamelGooglestoragesinkSinkConnector.java
index 9bea2ceb3e..0443846805 100644
--- a/connectors/camel-google-storage-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestoragesink/CamelGooglestoragesinkSinkConnector.java
+++ b/connectors/camel-google-storage-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestoragesink/CamelGooglestoragesinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.googlestoragesink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelGooglestoragesinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelGooglestoragesinkSinkConnector extends CamelSinkConnector {
         return CamelGooglestoragesinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelGooglestoragesinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:google-storage-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-google-storage-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestoragesink/CamelGooglestoragesinkSinkTask.java b/connectors/camel-google-storage-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestoragesink/CamelGooglestoragesinkSinkTask.java
deleted file mode 100644
index bd18654c6e..0000000000
--- a/connectors/camel-google-storage-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestoragesink/CamelGooglestoragesinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.googlestoragesink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGooglestoragesinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelGooglestoragesinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:google-storage-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-google-storage-sink-kafka-connector/src/main/resources/kamelets/google-storage-sink.kamelet.yaml b/connectors/camel-google-storage-sink-kafka-connector/src/main/resources/kamelets/google-storage-sink.kamelet.yaml
index a17e6d79ea..3043e4a850 100644
--- a/connectors/camel-google-storage-sink-kafka-connector/src/main/resources/kamelets/google-storage-sink.kamelet.yaml
+++ b/connectors/camel-google-storage-sink-kafka-connector/src/main/resources/kamelets/google-storage-sink.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: google-storage-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiBoZWlnaHQ9IjgwMCIgd2lkdGg9IjEyMDAiIHZpZXdCb3g9Ii0xOS4yMDAxNSAtMjguNDgzIDE2Ni40MDEzIDE3MC44OTgiPjxnIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTcuMDM0KSI+PGxpbmVhckdyYWRpZW50IHkyPSIxMjAuNzg5IiB4Mj0iNjQiIHkxPSI3LjAzNCIgeDE9IjY0IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgaWQ9ImEiPjxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0iIzQzODdmZCIvPj [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Google Storage"
diff --git a/connectors/camel-google-storage-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestoragesource/CamelGooglestoragesourceSourceConnector.java b/connectors/camel-google-storage-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestoragesource/CamelGooglestoragesourceSourceConnector.java
index 845d4919ba..d93644df27 100644
--- a/connectors/camel-google-storage-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestoragesource/CamelGooglestoragesourceSourceConnector.java
+++ b/connectors/camel-google-storage-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestoragesource/CamelGooglestoragesourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.googlestoragesource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelGooglestoragesourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelGooglestoragesourceSourceConnector
         return CamelGooglestoragesourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelGooglestoragesourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:google-storage-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-google-storage-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestoragesource/CamelGooglestoragesourceSourceTask.java b/connectors/camel-google-storage-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestoragesource/CamelGooglestoragesourceSourceTask.java
deleted file mode 100644
index cbdc417f7f..0000000000
--- a/connectors/camel-google-storage-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlestoragesource/CamelGooglestoragesourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.googlestoragesource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGooglestoragesourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelGooglestoragesourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:google-storage-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-google-storage-source-kafka-connector/src/main/resources/kamelets/google-storage-source.kamelet.yaml b/connectors/camel-google-storage-source-kafka-connector/src/main/resources/kamelets/google-storage-source.kamelet.yaml
index 8857c55b6b..929c603f53 100644
--- a/connectors/camel-google-storage-source-kafka-connector/src/main/resources/kamelets/google-storage-source.kamelet.yaml
+++ b/connectors/camel-google-storage-source-kafka-connector/src/main/resources/kamelets/google-storage-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: google-storage-source
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiBoZWlnaHQ9IjgwMCIgd2lkdGg9IjEyMDAiIHZpZXdCb3g9Ii0xOS4yMDAxNSAtMjguNDgzIDE2Ni40MDEzIDE3MC44OTgiPjxnIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTcuMDM0KSI+PGxpbmVhckdyYWRpZW50IHkyPSIxMjAuNzg5IiB4Mj0iNjQiIHkxPSI3LjAzNCIgeDE9IjY0IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgaWQ9ImEiPjxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0iIzQzODdmZCIvPj [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Google Storage"
diff --git a/connectors/camel-google-vertexai-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlevertexaisink/CamelGooglevertexaisinkSinkConnector.java b/connectors/camel-google-vertexai-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlevertexaisink/CamelGooglevertexaisinkSinkConnector.java
index a7d17f9566..6451955d86 100644
--- a/connectors/camel-google-vertexai-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlevertexaisink/CamelGooglevertexaisinkSinkConnector.java
+++ b/connectors/camel-google-vertexai-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlevertexaisink/CamelGooglevertexaisinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.googlevertexaisink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelGooglevertexaisinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelGooglevertexaisinkSinkConnector extends CamelSinkConnector {
         return CamelGooglevertexaisinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelGooglevertexaisinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:google-vertexai-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-google-vertexai-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlevertexaisink/CamelGooglevertexaisinkSinkTask.java b/connectors/camel-google-vertexai-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlevertexaisink/CamelGooglevertexaisinkSinkTask.java
deleted file mode 100644
index aef467a44b..0000000000
--- a/connectors/camel-google-vertexai-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/googlevertexaisink/CamelGooglevertexaisinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.googlevertexaisink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGooglevertexaisinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelGooglevertexaisinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:google-vertexai-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-google-vertexai-sink-kafka-connector/src/main/resources/kamelets/google-vertexai-sink.kamelet.yaml b/connectors/camel-google-vertexai-sink-kafka-connector/src/main/resources/kamelets/google-vertexai-sink.kamelet.yaml
index 1569e95265..56bfc6a740 100644
--- a/connectors/camel-google-vertexai-sink-kafka-connector/src/main/resources/kamelets/google-vertexai-sink.kamelet.yaml
+++ b/connectors/camel-google-vertexai-sink-kafka-connector/src/main/resources/kamelets/google-vertexai-sink.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: google-vertexai-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMjU2cHgiIGhlaWdodD0iMjMxcHgiIHZpZXdCb3g9IjAgMCAyNTYgMjMxIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaWRZTWlkIj4KICAgIDxkZWZzPgogICAgICAgIDxwYXRoIGQ9Ik0yNTIuOTI1ODU0LDEwMy4yMzcwNzcgTDIwMC4zMjczNDQsMTEuNzU5NjY3IEMxOTYuMzAyNTc5LDQuNjIyMjU3MDMgMTg4LjgwMD [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Google Vertex AI"
diff --git a/connectors/camel-graphql-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/graphqlsink/CamelGraphqlsinkSinkConnector.java b/connectors/camel-graphql-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/graphqlsink/CamelGraphqlsinkSinkConnector.java
index 8def08f207..a7fa8809aa 100644
--- a/connectors/camel-graphql-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/graphqlsink/CamelGraphqlsinkSinkConnector.java
+++ b/connectors/camel-graphql-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/graphqlsink/CamelGraphqlsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.graphqlsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelGraphqlsinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelGraphqlsinkSinkConnector extends CamelSinkConnector {
         return CamelGraphqlsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelGraphqlsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:graphql-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-graphql-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/graphqlsink/CamelGraphqlsinkSinkTask.java b/connectors/camel-graphql-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/graphqlsink/CamelGraphqlsinkSinkTask.java
deleted file mode 100644
index 944c5606fb..0000000000
--- a/connectors/camel-graphql-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/graphqlsink/CamelGraphqlsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.graphqlsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelGraphqlsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelGraphqlsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:graphql-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-graphql-sink-kafka-connector/src/main/resources/kamelets/graphql-sink.kamelet.yaml b/connectors/camel-graphql-sink-kafka-connector/src/main/resources/kamelets/graphql-sink.kamelet.yaml
index 6bf2f68632..c18a46afbe 100644
--- a/connectors/camel-graphql-sink-kafka-connector/src/main/resources/kamelets/graphql-sink.kamelet.yaml
+++ b/connectors/camel-graphql-sink-kafka-connector/src/main/resources/kamelets/graphql-sink.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: graphql-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0MjAiCmhlaWdodD0iNDIwIiBzdHJva2U9IiMwMDAiIGZpbGw9Im5vbmUiPgo8cGF0aCBzdHJva2Utd2lkdGg9IjI2IgpkPSJNMjA5LDE1YTE5NSwxOTUgMCAxLDAgMiwweiIvPgo8cGF0aCBzdHJva2Utd2lkdGg9IjE4IgpkPSJtMjEwLDE1djM5MG0xOTUtMTk1SDE1TTU5LDkwYTI2MCwyNjAgMCAwLDAgMzAyLDAgbTAsMjQwIGEyNjAsMjYwIDAgMCwwLTMwMiwwTTE5NSwyMGEyNTAsMjUwIDAgMCwwIDAsMzgyIG0zMC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Graphql"
diff --git a/connectors/camel-http-secured-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsecuredsink/CamelHttpsecuredsinkSinkConnector.java b/connectors/camel-http-secured-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsecuredsink/CamelHttpsecuredsinkSinkConnector.java
index a69cf3b155..e745de5495 100644
--- a/connectors/camel-http-secured-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsecuredsink/CamelHttpsecuredsinkSinkConnector.java
+++ b/connectors/camel-http-secured-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsecuredsink/CamelHttpsecuredsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.httpsecuredsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelHttpsecuredsinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelHttpsecuredsinkSinkConnector extends CamelSinkConnector {
         return CamelHttpsecuredsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelHttpsecuredsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:http-secured-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-http-secured-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsecuredsink/CamelHttpsecuredsinkSinkTask.java b/connectors/camel-http-secured-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsecuredsink/CamelHttpsecuredsinkSinkTask.java
deleted file mode 100644
index 023ff24bab..0000000000
--- a/connectors/camel-http-secured-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsecuredsink/CamelHttpsecuredsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.httpsecuredsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelHttpsecuredsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelHttpsecuredsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:http-secured-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-http-secured-sink-kafka-connector/src/main/resources/kamelets/http-secured-sink.kamelet.yaml b/connectors/camel-http-secured-sink-kafka-connector/src/main/resources/kamelets/http-secured-sink.kamelet.yaml
index ae16ff9a9d..b705fcd172 100644
--- a/connectors/camel-http-secured-sink-kafka-connector/src/main/resources/kamelets/http-secured-sink.kamelet.yaml
+++ b/connectors/camel-http-secured-sink-kafka-connector/src/main/resources/kamelets/http-secured-sink.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: http-secured-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0MjAiCmhlaWdodD0iNDIwIiBzdHJva2U9IiMwMDAiIGZpbGw9Im5vbmUiPgo8cGF0aCBzdHJva2Utd2lkdGg9IjI2IgpkPSJNMjA5LDE1YTE5NSwxOTUgMCAxLDAgMiwweiIvPgo8cGF0aCBzdHJva2Utd2lkdGg9IjE4IgpkPSJtMjEwLDE1djM5MG0xOTUtMTk1SDE1TTU5LDkwYTI2MCwyNjAgMCAwLDAgMzAyLDAgbTAsMjQwIGEyNjAsMjYwIDAgMCwwLTMwMiwwTTE5NSwyMGEyNTAsMjUwIDAgMCwwIDAsMzgyIG0zMC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "HTTP"
diff --git a/connectors/camel-http-secured-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsecuredsource/CamelHttpsecuredsourceSourceConnector.java b/connectors/camel-http-secured-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsecuredsource/CamelHttpsecuredsourceSourceConnector.java
index ac4860536b..ec0d4f4580 100644
--- a/connectors/camel-http-secured-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsecuredsource/CamelHttpsecuredsourceSourceConnector.java
+++ b/connectors/camel-http-secured-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsecuredsource/CamelHttpsecuredsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.httpsecuredsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelHttpsecuredsourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelHttpsecuredsourceSourceConnector
         return CamelHttpsecuredsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelHttpsecuredsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:http-secured-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-http-secured-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsecuredsource/CamelHttpsecuredsourceSourceTask.java b/connectors/camel-http-secured-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsecuredsource/CamelHttpsecuredsourceSourceTask.java
deleted file mode 100644
index 1770ff50a0..0000000000
--- a/connectors/camel-http-secured-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsecuredsource/CamelHttpsecuredsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.httpsecuredsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelHttpsecuredsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelHttpsecuredsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:http-secured-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-http-secured-source-kafka-connector/src/main/resources/kamelets/http-secured-source.kamelet.yaml b/connectors/camel-http-secured-source-kafka-connector/src/main/resources/kamelets/http-secured-source.kamelet.yaml
index bf9c312f2e..b9222cf313 100644
--- a/connectors/camel-http-secured-source-kafka-connector/src/main/resources/kamelets/http-secured-source.kamelet.yaml
+++ b/connectors/camel-http-secured-source-kafka-connector/src/main/resources/kamelets/http-secured-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: http-secured-source
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0MjAiCmhlaWdodD0iNDIwIiBzdHJva2U9IiMwMDAiIGZpbGw9Im5vbmUiPgo8cGF0aCBzdHJva2Utd2lkdGg9IjI2IgpkPSJNMjA5LDE1YTE5NSwxOTUgMCAxLDAgMiwweiIvPgo8cGF0aCBzdHJva2Utd2lkdGg9IjE4IgpkPSJtMjEwLDE1djM5MG0xOTUtMTk1SDE1TTU5LDkwYTI2MCwyNjAgMCAwLDAgMzAyLDAgbTAsMjQwIGEyNjAsMjYwIDAgMCwwLTMwMiwwTTE5NSwyMGEyNTAsMjUwIDAgMCwwIDAsMzgyIG0zMC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "HTTP"
diff --git a/connectors/camel-http-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsink/CamelHttpsinkSinkConnector.java b/connectors/camel-http-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsink/CamelHttpsinkSinkConnector.java
index 748f1d2354..d1b81cc925 100644
--- a/connectors/camel-http-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsink/CamelHttpsinkSinkConnector.java
+++ b/connectors/camel-http-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsink/CamelHttpsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.httpsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelHttpsinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelHttpsinkSinkConnector extends CamelSinkConnector {
         return CamelHttpsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelHttpsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:http-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-http-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsink/CamelHttpsinkSinkTask.java b/connectors/camel-http-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsink/CamelHttpsinkSinkTask.java
deleted file mode 100644
index 175c0a2178..0000000000
--- a/connectors/camel-http-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsink/CamelHttpsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.httpsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelHttpsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelHttpsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:http-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-http-sink-kafka-connector/src/main/resources/kamelets/http-sink.kamelet.yaml b/connectors/camel-http-sink-kafka-connector/src/main/resources/kamelets/http-sink.kamelet.yaml
index 0c534b8f9c..b4ce0b0f40 100644
--- a/connectors/camel-http-sink-kafka-connector/src/main/resources/kamelets/http-sink.kamelet.yaml
+++ b/connectors/camel-http-sink-kafka-connector/src/main/resources/kamelets/http-sink.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: http-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0MjAiCmhlaWdodD0iNDIwIiBzdHJva2U9IiMwMDAiIGZpbGw9Im5vbmUiPgo8cGF0aCBzdHJva2Utd2lkdGg9IjI2IgpkPSJNMjA5LDE1YTE5NSwxOTUgMCAxLDAgMiwweiIvPgo8cGF0aCBzdHJva2Utd2lkdGg9IjE4IgpkPSJtMjEwLDE1djM5MG0xOTUtMTk1SDE1TTU5LDkwYTI2MCwyNjAgMCAwLDAgMzAyLDAgbTAsMjQwIGEyNjAsMjYwIDAgMCwwLTMwMiwwTTE5NSwyMGEyNTAsMjUwIDAgMCwwIDAsMzgyIG0zMC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "HTTP"
diff --git a/connectors/camel-http-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsource/CamelHttpsourceSourceConnector.java b/connectors/camel-http-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsource/CamelHttpsourceSourceConnector.java
index d015781282..93320e03a2 100644
--- a/connectors/camel-http-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsource/CamelHttpsourceSourceConnector.java
+++ b/connectors/camel-http-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsource/CamelHttpsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.httpsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelHttpsourceSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelHttpsourceSourceConnector extends CamelSourceConnector {
         return CamelHttpsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelHttpsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:http-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-http-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsource/CamelHttpsourceSourceTask.java b/connectors/camel-http-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsource/CamelHttpsourceSourceTask.java
deleted file mode 100644
index 85218ffd5b..0000000000
--- a/connectors/camel-http-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/httpsource/CamelHttpsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.httpsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelHttpsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelHttpsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:http-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-http-source-kafka-connector/src/main/resources/kamelets/http-source.kamelet.yaml b/connectors/camel-http-source-kafka-connector/src/main/resources/kamelets/http-source.kamelet.yaml
index ed62330dd0..cc96fd4309 100644
--- a/connectors/camel-http-source-kafka-connector/src/main/resources/kamelets/http-source.kamelet.yaml
+++ b/connectors/camel-http-source-kafka-connector/src/main/resources/kamelets/http-source.kamelet.yaml
@@ -20,7 +20,7 @@ metadata:
   name: http-source
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0MjAiCmhlaWdodD0iNDIwIiBzdHJva2U9IiMwMDAiIGZpbGw9Im5vbmUiPgo8cGF0aCBzdHJva2Utd2lkdGg9IjI2IgpkPSJNMjA5LDE1YTE5NSwxOTUgMCAxLDAgMiwweiIvPgo8cGF0aCBzdHJva2Utd2lkdGg9IjE4IgpkPSJtMjEwLDE1djM5MG0xOTUtMTk1SDE1TTU5LDkwYTI2MCwyNjAgMCAwLDAgMzAyLDAgbTAsMjQwIGEyNjAsMjYwIDAgMCwwLTMwMiwwTTE5NSwyMGEyNTAsMjUwIDAgMCwwIDAsMzgyIG0zMC [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "HTTP"
diff --git a/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkConnector.java b/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkConnector.java
index 0ef84e348c..15353f070c 100644
--- a/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkConnector.java
+++ b/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.https;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelHttpsSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelHttpsSinkConnector extends CamelSinkConnector {
         return CamelHttpsSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelHttpsSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "https");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkTask.java b/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkTask.java
deleted file mode 100644
index 87944736c5..0000000000
--- a/connectors/camel-https-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/https/CamelHttpsSinkTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.https;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelHttpsSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelHttpsSinkConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "https");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-ibm-cos-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmcossink/CamelIbmcossinkSinkConnector.java b/connectors/camel-ibm-cos-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmcossink/CamelIbmcossinkSinkConnector.java
index b7cdfef105..de7bae1a56 100644
--- a/connectors/camel-ibm-cos-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmcossink/CamelIbmcossinkSinkConnector.java
+++ b/connectors/camel-ibm-cos-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmcossink/CamelIbmcossinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.ibmcossink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelIbmcossinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelIbmcossinkSinkConnector extends CamelSinkConnector {
         return CamelIbmcossinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelIbmcossinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:ibm-cos-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-ibm-cos-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmcossink/CamelIbmcossinkSinkTask.java b/connectors/camel-ibm-cos-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmcossink/CamelIbmcossinkSinkTask.java
deleted file mode 100644
index 076525559c..0000000000
--- a/connectors/camel-ibm-cos-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmcossink/CamelIbmcossinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.ibmcossink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelIbmcossinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelIbmcossinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:ibm-cos-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-ibm-cos-sink-kafka-connector/src/main/resources/kamelets/ibm-cos-sink.kamelet.yaml b/connectors/camel-ibm-cos-sink-kafka-connector/src/main/resources/kamelets/ibm-cos-sink.kamelet.yaml
index a8fb59aac4..addcc5ec98 100644
--- a/connectors/camel-ibm-cos-sink-kafka-connector/src/main/resources/kamelets/ibm-cos-sink.kamelet.yaml
+++ b/connectors/camel-ibm-cos-sink-kafka-connector/src/main/resources/kamelets/ibm-cos-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: ibm-cos-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjUwMCIgaGVpZ2h0PSIyNTAwIiB2aWV3Qm94PSIwIDAgMjU2IDI1NiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCI+PHBhdGggZD0iTTAgMGgyNTZ2MjU2SDB6IiBmaWxsPSIjMDUzMzYyIi8+PHBhdGggZD0iTTE4Ny43MzIgMTI1LjkxOGMtLjAzNi0xLjM1Ny0uMDktMi43MTQtLjE4LTQuMDcyLS4wMzYtLjUyMi0uMDkxLTEuMDQ1LS4xMjgtMS41NjctLjA1NC0uNjEzLS4xMDgtMS4yMjYtLjE4LTEuODM5LS4wNzItLjc3LS4xOC0xLjU0LS4yODgtMi4zMWEzOS43NjYgMzkuNz [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "IBM Cloud Object Storage"
diff --git a/connectors/camel-ibm-cos-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmcossource/CamelIbmcossourceSourceConnector.java b/connectors/camel-ibm-cos-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmcossource/CamelIbmcossourceSourceConnector.java
index e7949d3707..1282ff4ae3 100644
--- a/connectors/camel-ibm-cos-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmcossource/CamelIbmcossourceSourceConnector.java
+++ b/connectors/camel-ibm-cos-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmcossource/CamelIbmcossourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.ibmcossource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelIbmcossourceSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelIbmcossourceSourceConnector extends CamelSourceConnector {
         return CamelIbmcossourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelIbmcossourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:ibm-cos-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-ibm-cos-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmcossource/CamelIbmcossourceSourceTask.java b/connectors/camel-ibm-cos-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmcossource/CamelIbmcossourceSourceTask.java
deleted file mode 100644
index a69931f2a3..0000000000
--- a/connectors/camel-ibm-cos-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmcossource/CamelIbmcossourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.ibmcossource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelIbmcossourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelIbmcossourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:ibm-cos-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-ibm-cos-source-kafka-connector/src/main/resources/kamelets/ibm-cos-source.kamelet.yaml b/connectors/camel-ibm-cos-source-kafka-connector/src/main/resources/kamelets/ibm-cos-source.kamelet.yaml
index 8200e0583b..5450bd0c8e 100644
--- a/connectors/camel-ibm-cos-source-kafka-connector/src/main/resources/kamelets/ibm-cos-source.kamelet.yaml
+++ b/connectors/camel-ibm-cos-source-kafka-connector/src/main/resources/kamelets/ibm-cos-source.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: ibm-cos-source
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjUwMCIgaGVpZ2h0PSIyNTAwIiB2aWV3Qm94PSIwIDAgMjU2IDI1NiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCI+PHBhdGggZD0iTTAgMGgyNTZ2MjU2SDB6IiBmaWxsPSIjMDUzMzYyIi8+PHBhdGggZD0iTTE4Ny43MzIgMTI1LjkxOGMtLjAzNi0xLjM1Ny0uMDktMi43MTQtLjE4LTQuMDcyLS4wMzYtLjUyMi0uMDkxLTEuMDQ1LS4xMjgtMS41NjctLjA1NC0uNjEzLS4xMDgtMS4yMjYtLjE4LTEuODM5LS4wNzItLjc3LS4xOC0xLjU0LS4yODgtMi4zMWEzOS43NjYgMzkuNz [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "IBM Cloud Object Storage"
diff --git a/connectors/camel-ibm-watson-language-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmwatsonlanguagesink/CamelIbmwatsonlanguagesinkSinkConnector.java b/connectors/camel-ibm-watson-language-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmwatsonlanguagesink/CamelIbmwatsonlanguagesinkSinkConnector.java
index 7d6cb5675d..59e4a3feb7 100644
--- a/connectors/camel-ibm-watson-language-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmwatsonlanguagesink/CamelIbmwatsonlanguagesinkSinkConnector.java
+++ b/connectors/camel-ibm-watson-language-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmwatsonlanguagesink/CamelIbmwatsonlanguagesinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.ibmwatsonlanguagesink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelIbmwatsonlanguagesinkSinkConnector
@@ -31,7 +33,7 @@ public class CamelIbmwatsonlanguagesinkSinkConnector
         return CamelIbmwatsonlanguagesinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelIbmwatsonlanguagesinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:ibm-watson-language-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-ibm-watson-language-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmwatsonlanguagesink/CamelIbmwatsonlanguagesinkSinkTask.java b/connectors/camel-ibm-watson-language-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmwatsonlanguagesink/CamelIbmwatsonlanguagesinkSinkTask.java
deleted file mode 100644
index 72c2b41764..0000000000
--- a/connectors/camel-ibm-watson-language-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ibmwatsonlanguagesink/CamelIbmwatsonlanguagesinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.ibmwatsonlanguagesink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelIbmwatsonlanguagesinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelIbmwatsonlanguagesinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:ibm-watson-language-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-ibm-watson-language-sink-kafka-connector/src/main/resources/kamelets/ibm-watson-language-sink.kamelet.yaml b/connectors/camel-ibm-watson-language-sink-kafka-connector/src/main/resources/kamelets/ibm-watson-language-sink.kamelet.yaml
index 3fffd07e69..9648663f69 100644
--- a/connectors/camel-ibm-watson-language-sink-kafka-connector/src/main/resources/kamelets/ibm-watson-language-sink.kamelet.yaml
+++ b/connectors/camel-ibm-watson-language-sink-kafka-connector/src/main/resources/kamelets/ibm-watson-language-sink.kamelet.yaml
@@ -21,7 +21,7 @@ metadata:
   name: ibm-watson-language-sink
   annotations:
     camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjU2IiBoZWlnaHQ9IjI1NiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICA8ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgPHBhdGggZD0iTTAgMGgyNTZ2MjU2SDB6Ii8+CiAgICA8cGF0aCBkPSJNMTI4IDIwYTEwOCAxMDggMCAxIDEgMCAyMTYgMTA4IDEwOCAwIDAgMSAwLTIxNnptMCAyNGE4NCA4NCAwIDEgMCAwIDE2OCA4NCA4NCAwIDAgMCAwLTE2OHoiIGZpbGw9IiMwNTNFRkYiLz4KICAgIDxwYXRoIGQ9Ik0xMjggNzJhNTYgNTYgMCAxIDEgMCAxMTIgNTYgNTYgMCAwIDEgMC0xMTJ6bTAgMjRhMz [...]
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "IBM Watson"
diff --git a/connectors/camel-infinispan-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/infinispansink/CamelInfinispansinkSinkConnector.java b/connectors/camel-infinispan-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/infinispansink/CamelInfinispansinkSinkConnector.java
index d797d1bfd9..eb9d7facb7 100644
--- a/connectors/camel-infinispan-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/infinispansink/CamelInfinispansinkSinkConnector.java
+++ b/connectors/camel-infinispan-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/infinispansink/CamelInfinispansinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.infinispansink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelInfinispansinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelInfinispansinkSinkConnector extends CamelSinkConnector {
         return CamelInfinispansinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelInfinispansinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:infinispan-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-infinispan-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/infinispansink/CamelInfinispansinkSinkTask.java b/connectors/camel-infinispan-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/infinispansink/CamelInfinispansinkSinkTask.java
deleted file mode 100644
index 8216fbcbff..0000000000
--- a/connectors/camel-infinispan-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/infinispansink/CamelInfinispansinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.infinispansink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelInfinispansinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelInfinispansinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:infinispan-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-infinispan-sink-kafka-connector/src/main/resources/kamelets/infinispan-sink.kamelet.yaml b/connectors/camel-infinispan-sink-kafka-connector/src/main/resources/kamelets/infinispan-sink.kamelet.yaml
index 9545ea6369..8465970614 100644
--- a/connectors/camel-infinispan-sink-kafka-connector/src/main/resources/kamelets/infinispan-sink.kamelet.yaml
+++ b/connectors/camel-infinispan-sink-kafka-connector/src/main/resources/kamelets/infinispan-sink.kamelet.yaml
@@ -22,7 +22,7 @@ metadata:
     camel.apache.org/kamelet.type: "sink"
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Infinispan"
     camel.apache.org/kamelet.namespace: "Cache"
diff --git a/connectors/camel-infinispan-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/infinispansource/CamelInfinispansourceSourceConnector.java b/connectors/camel-infinispan-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/infinispansource/CamelInfinispansourceSourceConnector.java
index a2f6bd127b..b7e860b603 100644
--- a/connectors/camel-infinispan-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/infinispansource/CamelInfinispansourceSourceConnector.java
+++ b/connectors/camel-infinispan-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/infinispansource/CamelInfinispansourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.infinispansource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelInfinispansourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelInfinispansourceSourceConnector
         return CamelInfinispansourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelInfinispansourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:infinispan-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-infinispan-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/infinispansource/CamelInfinispansourceSourceTask.java b/connectors/camel-infinispan-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/infinispansource/CamelInfinispansourceSourceTask.java
deleted file mode 100644
index f29b9a32bf..0000000000
--- a/connectors/camel-infinispan-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/infinispansource/CamelInfinispansourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.infinispansource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelInfinispansourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelInfinispansourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:infinispan-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-infinispan-source-kafka-connector/src/main/resources/kamelets/infinispan-source.kamelet.yaml b/connectors/camel-infinispan-source-kafka-connector/src/main/resources/kamelets/infinispan-source.kamelet.yaml
index 515ed35fb4..32558004eb 100644
--- a/connectors/camel-infinispan-source-kafka-connector/src/main/resources/kamelets/infinispan-source.kamelet.yaml
+++ b/connectors/camel-infinispan-source-kafka-connector/src/main/resources/kamelets/infinispan-source.kamelet.yaml
@@ -22,7 +22,7 @@ metadata:
     camel.apache.org/kamelet.type: "source"
   annotations:
     camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/provider: "Apache Software Foundation"
     camel.apache.org/kamelet.group: "Infinispan"
     camel.apache.org/kamelet.namespace: "Cache"
diff --git a/connectors/camel-jdbc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jdbc/CamelJdbcSinkConnector.java b/connectors/camel-jdbc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jdbc/CamelJdbcSinkConnector.java
index 2cd0492920..8731cbd8cc 100644
--- a/connectors/camel-jdbc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jdbc/CamelJdbcSinkConnector.java
+++ b/connectors/camel-jdbc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jdbc/CamelJdbcSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.jdbc;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelJdbcSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelJdbcSinkConnector extends CamelSinkConnector {
         return CamelJdbcSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelJdbcSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "jdbc");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-jdbc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jdbc/CamelJdbcSinkTask.java b/connectors/camel-jdbc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jdbc/CamelJdbcSinkTask.java
deleted file mode 100644
index b607b449ad..0000000000
--- a/connectors/camel-jdbc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jdbc/CamelJdbcSinkTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.jdbc;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelJdbcSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelJdbcSinkConnectorConfig(props);
-    }
-    @Override
-    protected Map<String, String> getDefaultConfig() {
-        return new HashMap<String, String>() {{
-            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "jdbc");
-        }};
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-jms-amqp-10-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsamqp10sink/CamelJmsamqp10sinkSinkConnector.java b/connectors/camel-jms-amqp-10-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsamqp10sink/CamelJmsamqp10sinkSinkConnector.java
index f8e60be80e..671f505813 100644
--- a/connectors/camel-jms-amqp-10-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsamqp10sink/CamelJmsamqp10sinkSinkConnector.java
+++ b/connectors/camel-jms-amqp-10-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsamqp10sink/CamelJmsamqp10sinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.jmsamqp10sink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelJmsamqp10sinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelJmsamqp10sinkSinkConnector extends CamelSinkConnector {
         return CamelJmsamqp10sinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelJmsamqp10sinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:jms-amqp-10-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-jms-amqp-10-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsamqp10sink/CamelJmsamqp10sinkSinkTask.java b/connectors/camel-jms-amqp-10-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsamqp10sink/CamelJmsamqp10sinkSinkTask.java
deleted file mode 100644
index 78c5ea9be4..0000000000
--- a/connectors/camel-jms-amqp-10-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsamqp10sink/CamelJmsamqp10sinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.jmsamqp10sink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelJmsamqp10sinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelJmsamqp10sinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:jms-amqp-10-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-jms-amqp-10-sink-kafka-connector/src/main/resources/kamelets/jms-amqp-10-sink.kamelet.yaml b/connectors/camel-jms-amqp-10-sink-kafka-connector/src/main/resources/kamelets/jms-amqp-10-sink.kamelet.yaml
index c40d1ac4a8..d7c21c3cf6 100644
--- a/connectors/camel-jms-amqp-10-sink-kafka-connector/src/main/resources/kamelets/jms-amqp-10-sink.kamelet.yaml
+++ b/connectors/camel-jms-amqp-10-sink-kafka-connector/src/main/resources/kamelets/jms-amqp-10-sink.kamelet.yaml
@@ -22,7 +22,7 @@ metadata:
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjwhLS0gQ3JlYXRlZCB3aXRoIElua3NjYXBlIChodHRwOi8vd3d3Lmlua3NjYXBlLm9yZy8pIC0tPgoKPHN2ZwogICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iCiAgIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiCiAgIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIKICAgeG1sbnM6c3ZnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM9Im [...]
     camel.apache.org/kamelet.support.level: "Stable"
     camel.apache.org/provider: "Apache Software Foundation"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.group: "JMS"
     camel.apache.org/kamelet.namespace: "Messaging"
   labels:
diff --git a/connectors/camel-jms-amqp-10-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsamqp10source/CamelJmsamqp10sourceSourceConnector.java b/connectors/camel-jms-amqp-10-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsamqp10source/CamelJmsamqp10sourceSourceConnector.java
index b0ad617b9c..eba6448e66 100644
--- a/connectors/camel-jms-amqp-10-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsamqp10source/CamelJmsamqp10sourceSourceConnector.java
+++ b/connectors/camel-jms-amqp-10-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsamqp10source/CamelJmsamqp10sourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.jmsamqp10source;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelJmsamqp10sourceSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelJmsamqp10sourceSourceConnector extends CamelSourceConnector {
         return CamelJmsamqp10sourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelJmsamqp10sourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:jms-amqp-10-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-jms-amqp-10-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsamqp10source/CamelJmsamqp10sourceSourceTask.java b/connectors/camel-jms-amqp-10-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsamqp10source/CamelJmsamqp10sourceSourceTask.java
deleted file mode 100644
index 9eebac82b8..0000000000
--- a/connectors/camel-jms-amqp-10-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsamqp10source/CamelJmsamqp10sourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.jmsamqp10source;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelJmsamqp10sourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelJmsamqp10sourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:jms-amqp-10-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-jms-amqp-10-source-kafka-connector/src/main/resources/kamelets/jms-amqp-10-source.kamelet.yaml b/connectors/camel-jms-amqp-10-source-kafka-connector/src/main/resources/kamelets/jms-amqp-10-source.kamelet.yaml
index 0ebf09006b..765ac83ae6 100644
--- a/connectors/camel-jms-amqp-10-source-kafka-connector/src/main/resources/kamelets/jms-amqp-10-source.kamelet.yaml
+++ b/connectors/camel-jms-amqp-10-source-kafka-connector/src/main/resources/kamelets/jms-amqp-10-source.kamelet.yaml
@@ -22,7 +22,7 @@ metadata:
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjwhLS0gQ3JlYXRlZCB3aXRoIElua3NjYXBlIChodHRwOi8vd3d3Lmlua3NjYXBlLm9yZy8pIC0tPgoKPHN2ZwogICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iCiAgIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiCiAgIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIKICAgeG1sbnM6c3ZnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM9Im [...]
     camel.apache.org/kamelet.support.level: "Stable"
     camel.apache.org/provider: "Apache Software Foundation"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.group: "JMS"
     camel.apache.org/kamelet.namespace: "Messaging"
   labels:
diff --git a/connectors/camel-jms-apache-artemis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsapacheartemissink/CamelJmsapacheartemissinkSinkConnector.java b/connectors/camel-jms-apache-artemis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsapacheartemissink/CamelJmsapacheartemissinkSinkConnector.java
index 27fc3923a2..e5d0a6bec5 100644
--- a/connectors/camel-jms-apache-artemis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsapacheartemissink/CamelJmsapacheartemissinkSinkConnector.java
+++ b/connectors/camel-jms-apache-artemis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsapacheartemissink/CamelJmsapacheartemissinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.jmsapacheartemissink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelJmsapacheartemissinkSinkConnector
@@ -31,7 +33,7 @@ public class CamelJmsapacheartemissinkSinkConnector
         return CamelJmsapacheartemissinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelJmsapacheartemissinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:jms-apache-artemis-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-jms-apache-artemis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsapacheartemissink/CamelJmsapacheartemissinkSinkTask.java b/connectors/camel-jms-apache-artemis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsapacheartemissink/CamelJmsapacheartemissinkSinkTask.java
deleted file mode 100644
index 874beec8d3..0000000000
--- a/connectors/camel-jms-apache-artemis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsapacheartemissink/CamelJmsapacheartemissinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.jmsapacheartemissink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelJmsapacheartemissinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelJmsapacheartemissinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:jms-apache-artemis-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-jms-apache-artemis-sink-kafka-connector/src/main/resources/kamelets/jms-apache-artemis-sink.kamelet.yaml b/connectors/camel-jms-apache-artemis-sink-kafka-connector/src/main/resources/kamelets/jms-apache-artemis-sink.kamelet.yaml
index c3f896a479..3ada693f47 100644
--- a/connectors/camel-jms-apache-artemis-sink-kafka-connector/src/main/resources/kamelets/jms-apache-artemis-sink.kamelet.yaml
+++ b/connectors/camel-jms-apache-artemis-sink-kafka-connector/src/main/resources/kamelets/jms-apache-artemis-sink.kamelet.yaml
@@ -22,7 +22,7 @@ metadata:
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjwhLS0gQ3JlYXRlZCB3aXRoIElua3NjYXBlIChodHRwOi8vd3d3Lmlua3NjYXBlLm9yZy8pIC0tPgoKPHN2ZwogICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iCiAgIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiCiAgIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIKICAgeG1sbnM6c3ZnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM9Im [...]
     camel.apache.org/kamelet.support.level: "Stable"
     camel.apache.org/provider: "Apache Software Foundation"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.group: "JMS"
     camel.apache.org/kamelet.namespace: "Messaging"
   labels:
@@ -55,7 +55,7 @@ spec:
   dependencies:
   - "camel:jms"
   - "camel:kamelet"
-  - "mvn:org.apache.activemq:artemis-jakarta-client-all:2.54.0"
+  - "mvn:org.apache.activemq:artemis-jakarta-client-all:2.55.0"
   template:
     beans:
       - name: connectionFactoryBean
diff --git a/connectors/camel-jms-apache-artemis-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsapacheartemissource/CamelJmsapacheartemissourceSourceConnector.java b/connectors/camel-jms-apache-artemis-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsapacheartemissource/CamelJmsapacheartemissourceSourceConnector.java
index e2e7af34b9..29cf131e2b 100644
--- a/connectors/camel-jms-apache-artemis-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsapacheartemissource/CamelJmsapacheartemissourceSourceConnector.java
+++ b/connectors/camel-jms-apache-artemis-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsapacheartemissource/CamelJmsapacheartemissourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.jmsapacheartemissource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelJmsapacheartemissourceSourceConnector
@@ -31,7 +33,7 @@ public class CamelJmsapacheartemissourceSourceConnector
         return CamelJmsapacheartemissourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelJmsapacheartemissourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:jms-apache-artemis-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-jms-apache-artemis-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsapacheartemissource/CamelJmsapacheartemissourceSourceTask.java b/connectors/camel-jms-apache-artemis-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsapacheartemissource/CamelJmsapacheartemissourceSourceTask.java
deleted file mode 100644
index a2374edef0..0000000000
--- a/connectors/camel-jms-apache-artemis-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsapacheartemissource/CamelJmsapacheartemissourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.jmsapacheartemissource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelJmsapacheartemissourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelJmsapacheartemissourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:jms-apache-artemis-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-jms-apache-artemis-source-kafka-connector/src/main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml b/connectors/camel-jms-apache-artemis-source-kafka-connector/src/main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml
index 4e7128bea9..7e5b416e09 100644
--- a/connectors/camel-jms-apache-artemis-source-kafka-connector/src/main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml
+++ b/connectors/camel-jms-apache-artemis-source-kafka-connector/src/main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml
@@ -22,7 +22,7 @@ metadata:
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjwhLS0gQ3JlYXRlZCB3aXRoIElua3NjYXBlIChodHRwOi8vd3d3Lmlua3NjYXBlLm9yZy8pIC0tPgoKPHN2ZwogICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iCiAgIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiCiAgIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIKICAgeG1sbnM6c3ZnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM9Im [...]
     camel.apache.org/kamelet.support.level: "Stable"
     camel.apache.org/provider: "Apache Software Foundation"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.group: "JMS"
     camel.apache.org/kamelet.namespace: "Messaging"
   labels:
@@ -54,7 +54,7 @@ spec:
   dependencies:
   - "camel:jms"
   - "camel:kamelet"
-  - "mvn:org.apache.activemq:artemis-jakarta-client-all:2.54.0"
+  - "mvn:org.apache.activemq:artemis-jakarta-client-all:2.55.0"
   template:
     beans:
       - name: connectionFactoryBean
diff --git a/connectors/camel-jms-ibm-mq-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsibmmqsink/CamelJmsibmmqsinkSinkConnector.java b/connectors/camel-jms-ibm-mq-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsibmmqsink/CamelJmsibmmqsinkSinkConnector.java
index db33994cf7..86fcdf0959 100644
--- a/connectors/camel-jms-ibm-mq-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsibmmqsink/CamelJmsibmmqsinkSinkConnector.java
+++ b/connectors/camel-jms-ibm-mq-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsibmmqsink/CamelJmsibmmqsinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.jmsibmmqsink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 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 CamelJmsibmmqsinkSinkConnector extends CamelSinkConnector {
@@ -29,7 +31,7 @@ public class CamelJmsibmmqsinkSinkConnector extends CamelSinkConnector {
         return CamelJmsibmmqsinkSinkConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelJmsibmmqsinkSinkTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSinkConnectorConfig.CAMEL_SINK_KAMELET_CONF, "kamelet:jms-ibm-mq-sink");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-jms-ibm-mq-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsibmmqsink/CamelJmsibmmqsinkSinkTask.java b/connectors/camel-jms-ibm-mq-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsibmmqsink/CamelJmsibmmqsinkSinkTask.java
deleted file mode 100644
index 0bbee533c3..0000000000
--- a/connectors/camel-jms-ibm-mq-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsibmmqsink/CamelJmsibmmqsinkSinkTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.jmsibmmqsink;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSinkTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelJmsibmmqsinkSinkTask extends CamelSinkTask {
-
-    @Override
-    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
-            Map<String, String> props) {
-        return new CamelJmsibmmqsinkSinkConnectorConfig(props);
-    }
-    @Override
-    protected String getSinkKamelet() {
-        return "kamelet:jms-ibm-mq-sink";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-jms-ibm-mq-sink-kafka-connector/src/main/resources/kamelets/jms-ibm-mq-sink.kamelet.yaml b/connectors/camel-jms-ibm-mq-sink-kafka-connector/src/main/resources/kamelets/jms-ibm-mq-sink.kamelet.yaml
index 0edec92baf..7c4ff57f16 100644
--- a/connectors/camel-jms-ibm-mq-sink-kafka-connector/src/main/resources/kamelets/jms-ibm-mq-sink.kamelet.yaml
+++ b/connectors/camel-jms-ibm-mq-sink-kafka-connector/src/main/resources/kamelets/jms-ibm-mq-sink.kamelet.yaml
@@ -22,7 +22,7 @@ metadata:
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIgogICAgIHZpZXdCb3g9IjAgMCA1NzMuMDggNTc2Ljk3Ij4KICAgIDxkZWZzPgogICAgICAgIDxzdHlsZT4KICAgICAgICAgICAgLmNscy0xe2ZpbGw6I2ZmZjt9LmNscy0ye2ZpbGw6IzVhNzdiNTt9LmNscy0ze2ZpbGw6I2FmYmVlMDt9LmNscy00e2NsaXAtcGF0aDp1cmwoI2NsaXAtcGF0aCk7fS5jbHMtNXtjbGlwLXBhdGg6dXJsKCNjbGlwLXBhdGgtMik7fQogIC [...]
     camel.apache.org/kamelet.support.level: "Stable"
     camel.apache.org/provider: "Apache Software Foundation"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.group: "JMS"
     camel.apache.org/kamelet.namespace: "Messaging"
   labels:
diff --git a/connectors/camel-jms-ibm-mq-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsibmmqsource/CamelJmsibmmqsourceSourceConnector.java b/connectors/camel-jms-ibm-mq-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsibmmqsource/CamelJmsibmmqsourceSourceConnector.java
index b29aedc775..192ffed782 100644
--- a/connectors/camel-jms-ibm-mq-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsibmmqsource/CamelJmsibmmqsourceSourceConnector.java
+++ b/connectors/camel-jms-ibm-mq-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsibmmqsource/CamelJmsibmmqsourceSourceConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.jmsibmmqsource;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
 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 CamelJmsibmmqsourceSourceConnector extends CamelSourceConnector {
@@ -29,7 +31,7 @@ public class CamelJmsibmmqsourceSourceConnector extends CamelSourceConnector {
         return CamelJmsibmmqsourceSourceConnectorConfig.conf();
     }
     @Override
-    public Class<? extends Task> taskClass() {
-        return CamelJmsibmmqsourceSourceTask.class;
+    protected Map<String, String> getConnectorDefaults() {
+        return Collections.singletonMap(CamelSourceConnectorConfig.CAMEL_SOURCE_KAMELET_CONF, "kamelet:jms-ibm-mq-source");
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-jms-ibm-mq-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsibmmqsource/CamelJmsibmmqsourceSourceTask.java b/connectors/camel-jms-ibm-mq-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsibmmqsource/CamelJmsibmmqsourceSourceTask.java
deleted file mode 100644
index f24980f7fe..0000000000
--- a/connectors/camel-jms-ibm-mq-source-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmsibmmqsource/CamelJmsibmmqsourceSourceTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.jmsibmmqsource;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
-import org.apache.camel.kafkaconnector.CamelSourceTask;
-
-@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
-public class CamelJmsibmmqsourceSourceTask extends CamelSourceTask {
-
-    @Override
-    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
-            Map<String, String> props) {
-        return new CamelJmsibmmqsourceSourceConnectorConfig(props);
-    }
-    @Override
-    protected String getSourceKamelet() {
-        return "kamelet:jms-ibm-mq-source";
-    }
-}
\ No newline at end of file
diff --git a/connectors/camel-jms-ibm-mq-source-kafka-connector/src/main/resources/kamelets/jms-ibm-mq-source.kamelet.yaml b/connectors/camel-jms-ibm-mq-source-kafka-connector/src/main/resources/kamelets/jms-ibm-mq-source.kamelet.yaml
index 2a637b0a0d..70c0fb3d00 100644
--- a/connectors/camel-jms-ibm-mq-source-kafka-connector/src/main/resources/kamelets/jms-ibm-mq-source.kamelet.yaml
+++ b/connectors/camel-jms-ibm-mq-source-kafka-connector/src/main/resources/kamelets/jms-ibm-mq-source.kamelet.yaml
@@ -22,7 +22,7 @@ metadata:
     camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIgogICAgIHZpZXdCb3g9IjAgMCA1NzMuMDggNTc2Ljk3Ij4KICAgIDxkZWZzPgogICAgICAgIDxzdHlsZT4KICAgICAgICAgICAgLmNscy0xe2ZpbGw6I2ZmZjt9LmNscy0ye2ZpbGw6IzVhNzdiNTt9LmNscy0ze2ZpbGw6I2FmYmVlMDt9LmNscy00e2NsaXAtcGF0aDp1cmwoI2NsaXAtcGF0aCk7fS5jbHMtNXtjbGlwLXBhdGg6dXJsKCNjbGlwLXBhdGgtMik7fQogIC [...]
     camel.apache.org/kamelet.support.level: "Stable"
     camel.apache.org/provider: "Apache Software Foundation"
-    camel.apache.org/catalog.version: "4.21.0-SNAPSHOT"
+    camel.apache.org/catalog.version: "4.21.0"
     camel.apache.org/kamelet.group: "JMS"
     camel.apache.org/kamelet.namespace: "Messaging"
   labels:
diff --git a/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmspooledapacheartemissink/CamelJmspooledapacheartemissinkSinkConnector.java b/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmspooledapacheartemissink/CamelJmspooledapacheartemissinkSinkConnector.java
index 9ea092ceea..43b30af8dd 100644
--- a/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmspooledapacheartemissink/CamelJmspooledapacheartemissinkSinkConnector.java
+++ b/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/jmspooledapacheartemissink/CamelJmspooledapacheartemissinkSinkConnector.java
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.kafkaconnector.jmspooledapacheartemissink;
 
+import java.util.Collections;
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
 import org.apache.kafka.common.config.ConfigDef;
... 7881 lines suppressed ...