[camel-spring-boot] branch main updated: CAMEL-19135: Reduce number of Category enums for components

[davsclaus]

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

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git


The following commit(s) were added to refs/heads/main by this push:
     new 8ba9fba5a56 CAMEL-19135: Reduce number of Category enums for components
8ba9fba5a56 is described below

commit 8ba9fba5a56d65193a2c44a2c97f48abe5f56d8e
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue May 23 17:04:47 2023 +0200

    CAMEL-19135: Reduce number of Category enums for components
---
 .../org/apache/camel/springboot/catalog/components/arangodb.json      | 2 +-
 .../org/apache/camel/springboot/catalog/components/asterisk.json      | 4 ++--
 .../camel/springboot/catalog/components/atmosphere-websocket.json     | 2 +-
 .../org/apache/camel/springboot/catalog/components/atom.json          | 2 +-
 .../apache/camel/springboot/catalog/components/aws-cloudtrail.json    | 2 +-
 .../org/apache/camel/springboot/catalog/components/aws2-ddb.json      | 2 +-
 .../apache/camel/springboot/catalog/components/aws2-ddbstream.json    | 2 +-
 .../org/apache/camel/springboot/catalog/components/aws2-lambda.json   | 2 +-
 .../org/apache/camel/springboot/catalog/components/bean.json          | 2 +-
 .../org/apache/camel/springboot/catalog/components/bonita.json        | 2 +-
 .../org/apache/camel/springboot/catalog/components/braintree.json     | 2 +-
 .../apache/camel/springboot/catalog/components/caffeine-cache.json    | 2 +-
 .../camel/springboot/catalog/components/caffeine-loadcache.json       | 2 +-
 .../org/apache/camel/springboot/catalog/components/class.json         | 2 +-
 .../org/apache/camel/springboot/catalog/components/cometd.json        | 2 +-
 .../org/apache/camel/springboot/catalog/components/cometds.json       | 2 +-
 .../org/apache/camel/springboot/catalog/components/couchbase.json     | 2 +-
 .../org/apache/camel/springboot/catalog/components/couchdb.json       | 2 +-
 .../resources/org/apache/camel/springboot/catalog/components/cql.json | 2 +-
 .../resources/org/apache/camel/springboot/catalog/components/cxf.json | 2 +-
 .../org/apache/camel/springboot/catalog/components/debezium-db2.json  | 2 +-
 .../apache/camel/springboot/catalog/components/debezium-mongodb.json  | 2 +-
 .../apache/camel/springboot/catalog/components/debezium-mysql.json    | 2 +-
 .../apache/camel/springboot/catalog/components/debezium-oracle.json   | 2 +-
 .../apache/camel/springboot/catalog/components/debezium-postgres.json | 2 +-
 .../camel/springboot/catalog/components/debezium-sqlserver.json       | 2 +-
 .../org/apache/camel/springboot/catalog/components/direct.json        | 2 +-
 .../org/apache/camel/springboot/catalog/components/disruptor-vm.json  | 2 +-
 .../org/apache/camel/springboot/catalog/components/disruptor.json     | 2 +-
 .../resources/org/apache/camel/springboot/catalog/components/djl.json | 2 +-
 .../org/apache/camel/springboot/catalog/components/docker.json        | 2 +-
 .../org/apache/camel/springboot/catalog/components/drill.json         | 2 +-
 .../apache/camel/springboot/catalog/components/dynamic-router.json    | 2 +-
 .../org/apache/camel/springboot/catalog/components/ehcache.json       | 2 +-
 .../org/apache/camel/springboot/catalog/components/exec.json          | 2 +-
 .../org/apache/camel/springboot/catalog/components/flink.json         | 2 +-
 .../org/apache/camel/springboot/catalog/components/geocoder.json      | 2 +-
 .../camel/springboot/catalog/components/google-sheets-stream.json     | 2 +-
 .../org/apache/camel/springboot/catalog/components/google-sheets.json | 2 +-
 .../org/apache/camel/springboot/catalog/components/grape.json         | 2 +-
 .../apache/camel/springboot/catalog/components/guava-eventbus.json    | 2 +-
 .../camel/springboot/catalog/components/hazelcast-atomicvalue.json    | 2 +-
 .../camel/springboot/catalog/components/hazelcast-instance.json       | 2 +-
 .../apache/camel/springboot/catalog/components/hazelcast-list.json    | 2 +-
 .../org/apache/camel/springboot/catalog/components/hazelcast-map.json | 2 +-
 .../camel/springboot/catalog/components/hazelcast-multimap.json       | 2 +-
 .../apache/camel/springboot/catalog/components/hazelcast-queue.json   | 2 +-
 .../camel/springboot/catalog/components/hazelcast-replicatedmap.json  | 2 +-
 .../camel/springboot/catalog/components/hazelcast-ringbuffer.json     | 2 +-
 .../apache/camel/springboot/catalog/components/hazelcast-seda.json    | 2 +-
 .../org/apache/camel/springboot/catalog/components/hazelcast-set.json | 2 +-
 .../apache/camel/springboot/catalog/components/hazelcast-topic.json   | 2 +-
 .../org/apache/camel/springboot/catalog/components/hdfs.json          | 2 +-
 .../apache/camel/springboot/catalog/components/hyperledger-aries.json | 2 +-
 .../org/apache/camel/springboot/catalog/components/ignite-cache.json  | 2 +-
 .../apache/camel/springboot/catalog/components/ignite-compute.json    | 2 +-
 .../org/apache/camel/springboot/catalog/components/ignite-events.json | 2 +-
 .../org/apache/camel/springboot/catalog/components/ignite-idgen.json  | 2 +-
 .../org/apache/camel/springboot/catalog/components/ignite-queue.json  | 2 +-
 .../org/apache/camel/springboot/catalog/components/ignite-set.json    | 2 +-
 .../camel/springboot/catalog/components/infinispan-embedded.json      | 2 +-
 .../org/apache/camel/springboot/catalog/components/infinispan.json    | 2 +-
 .../org/apache/camel/springboot/catalog/components/jcache.json        | 2 +-
 .../org/apache/camel/springboot/catalog/components/jdbc.json          | 2 +-
 .../org/apache/camel/springboot/catalog/components/jira.json          | 2 +-
 .../org/apache/camel/springboot/catalog/components/jooq.json          | 2 +-
 .../resources/org/apache/camel/springboot/catalog/components/jpa.json | 2 +-
 .../camel/springboot/catalog/components/kubernetes-config-maps.json   | 2 +-
 .../springboot/catalog/components/kubernetes-custom-resources.json    | 2 +-
 .../camel/springboot/catalog/components/kubernetes-deployments.json   | 2 +-
 .../apache/camel/springboot/catalog/components/kubernetes-events.json | 2 +-
 .../apache/camel/springboot/catalog/components/kubernetes-hpa.json    | 2 +-
 .../apache/camel/springboot/catalog/components/kubernetes-job.json    | 2 +-
 .../camel/springboot/catalog/components/kubernetes-namespaces.json    | 2 +-
 .../apache/camel/springboot/catalog/components/kubernetes-nodes.json  | 2 +-
 .../catalog/components/kubernetes-persistent-volumes-claims.json      | 2 +-
 .../springboot/catalog/components/kubernetes-persistent-volumes.json  | 2 +-
 .../apache/camel/springboot/catalog/components/kubernetes-pods.json   | 2 +-
 .../catalog/components/kubernetes-replication-controllers.json        | 2 +-
 .../springboot/catalog/components/kubernetes-resources-quota.json     | 2 +-
 .../camel/springboot/catalog/components/kubernetes-secrets.json       | 2 +-
 .../springboot/catalog/components/kubernetes-service-accounts.json    | 2 +-
 .../camel/springboot/catalog/components/kubernetes-services.json      | 2 +-
 .../org/apache/camel/springboot/catalog/components/ldap.json          | 2 +-
 .../org/apache/camel/springboot/catalog/components/ldif.json          | 2 +-
 .../resources/org/apache/camel/springboot/catalog/components/lpr.json | 2 +-
 .../org/apache/camel/springboot/catalog/components/lumberjack.json    | 2 +-
 .../org/apache/camel/springboot/catalog/components/mina.json          | 2 +-
 .../org/apache/camel/springboot/catalog/components/mllp.json          | 2 +-
 .../apache/camel/springboot/catalog/components/mongodb-gridfs.json    | 2 +-
 .../org/apache/camel/springboot/catalog/components/mongodb.json       | 2 +-
 .../org/apache/camel/springboot/catalog/components/mybatis-bean.json  | 2 +-
 .../org/apache/camel/springboot/catalog/components/mybatis.json       | 2 +-
 .../org/apache/camel/springboot/catalog/components/netty.json         | 2 +-
 .../org/apache/camel/springboot/catalog/components/nitrite.json       | 2 +-
 .../org/apache/camel/springboot/catalog/components/oaipmh.json        | 2 +-
 .../camel/springboot/catalog/components/openshift-build-configs.json  | 2 +-
 .../apache/camel/springboot/catalog/components/openshift-builds.json  | 2 +-
 .../springboot/catalog/components/openshift-deploymentconfigs.json    | 2 +-
 .../apache/camel/springboot/catalog/components/openstack-cinder.json  | 2 +-
 .../apache/camel/springboot/catalog/components/openstack-glance.json  | 2 +-
 .../camel/springboot/catalog/components/openstack-keystone.json       | 2 +-
 .../apache/camel/springboot/catalog/components/openstack-neutron.json | 2 +-
 .../apache/camel/springboot/catalog/components/openstack-nova.json    | 2 +-
 .../apache/camel/springboot/catalog/components/openstack-swift.json   | 2 +-
 .../org/apache/camel/springboot/catalog/components/optaplanner.json   | 2 +-
 .../resources/org/apache/camel/springboot/catalog/components/pdf.json | 2 +-
 .../camel/springboot/catalog/components/pg-replication-slot.json      | 2 +-
 .../org/apache/camel/springboot/catalog/components/pgevent.json       | 2 +-
 .../apache/camel/springboot/catalog/components/reactive-streams.json  | 2 +-
 .../resources/org/apache/camel/springboot/catalog/components/ref.json | 2 +-
 .../org/apache/camel/springboot/catalog/components/rest-openapi.json  | 2 +-
 .../resources/org/apache/camel/springboot/catalog/components/rss.json | 2 +-
 .../org/apache/camel/springboot/catalog/components/saga.json          | 2 +-
 .../org/apache/camel/springboot/catalog/components/salesforce.json    | 2 +-
 .../org/apache/camel/springboot/catalog/components/sap-netweaver.json | 2 +-
 .../org/apache/camel/springboot/catalog/components/seda.json          | 2 +-
 .../org/apache/camel/springboot/catalog/components/splunk-hec.json    | 2 +-
 .../org/apache/camel/springboot/catalog/components/spring-batch.json  | 2 +-
 .../org/apache/camel/springboot/catalog/components/spring-event.json  | 2 +-
 .../org/apache/camel/springboot/catalog/components/spring-jdbc.json   | 2 +-
 .../org/apache/camel/springboot/catalog/components/spring-ldap.json   | 2 +-
 .../org/apache/camel/springboot/catalog/components/spring-redis.json  | 2 +-
 .../org/apache/camel/springboot/catalog/components/spring-ws.json     | 2 +-
 .../org/apache/camel/springboot/catalog/components/sql-stored.json    | 2 +-
 .../resources/org/apache/camel/springboot/catalog/components/sql.json | 2 +-
 .../org/apache/camel/springboot/catalog/components/stitch.json        | 2 +-
 .../org/apache/camel/springboot/catalog/components/stream.json        | 2 +-
 .../camel/springboot/catalog/components/twitter-directmessage.json    | 2 +-
 .../apache/camel/springboot/catalog/components/twitter-search.json    | 2 +-
 .../apache/camel/springboot/catalog/components/twitter-timeline.json  | 2 +-
 .../org/apache/camel/springboot/catalog/components/undertow.json      | 2 +-
 .../apache/camel/springboot/catalog/components/vertx-websocket.json   | 2 +-
 .../org/apache/camel/springboot/catalog/components/vertx.json         | 2 +-
 .../org/apache/camel/springboot/catalog/components/web3j.json         | 2 +-
 .../org/apache/camel/springboot/catalog/components/weka.json          | 2 +-
 .../org/apache/camel/springboot/catalog/components/workday.json       | 2 +-
 .../org/apache/camel/springboot/catalog/components/xchange.json       | 2 +-
 .../org/apache/camel/springboot/catalog/components/zeebe.json         | 2 +-
 .../org/apache/camel/springboot/catalog/components/zendesk.json       | 2 +-
 .../component/asterisk/springboot/AsteriskComponentConfiguration.java | 2 +-
 141 files changed, 142 insertions(+), 142 deletions(-)

diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/arangodb.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/arangodb.json
index 8248109d485..53c25a0d87d 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/arangodb.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/arangodb.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on ArangoDb when used as a Document 
Database, or as a Graph Database",
     "deprecated": false,
     "firstVersion": "3.5.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.arangodb.ArangoDbComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/asterisk.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/asterisk.json
index e9106ecd4e6..afda0235f56 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/asterisk.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/asterisk.json
@@ -3,10 +3,10 @@
     "kind": "component",
     "name": "asterisk",
     "title": "Asterisk",
-    "description": "Interact with Asterisk PBX Server.",
+    "description": "Interact with Asterisk PBX Server (VoIP).",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "voip",
+    "label": "mobile",
     "javaType": "org.apache.camel.component.asterisk.AsteriskComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json
index aa386a383ad..35d7ba4c201 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json
@@ -7,7 +7,7 @@
     "deprecated": false,
     "deprecationNote": "",
     "firstVersion": "2.14.0",
-    "label": "websocket",
+    "label": "http,networking",
     "javaType": 
"org.apache.camel.component.atmosphere.websocket.WebsocketComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atom.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atom.json
index 6b2f37b8e96..9a62a416cdb 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atom.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atom.json
@@ -6,7 +6,7 @@
     "description": "Poll Atom RSS feeds.",
     "deprecated": false,
     "firstVersion": "1.2.0",
-    "label": "rss",
+    "label": "document",
     "javaType": "org.apache.camel.component.atom.AtomComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-cloudtrail.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-cloudtrail.json
index e7ebe865d42..6c7e3ebb15c 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-cloudtrail.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-cloudtrail.json
@@ -6,7 +6,7 @@
     "description": "Consume events from Amazon Cloudtrail using AWS SDK 
version 2.x.",
     "deprecated": false,
     "firstVersion": "3.19.0",
-    "label": "cloud,eventbus",
+    "label": "cloud,management,monitoring",
     "javaType": 
"org.apache.camel.component.aws.cloudtrail.CloudtrailComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddb.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddb.json
index d3eb76faa79..800f803922d 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddb.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddb.json
@@ -6,7 +6,7 @@
     "description": "Store and retrieve data from AWS DynamoDB service using 
AWS SDK version 2.x.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "cloud,database,nosql",
+    "label": "cloud,database",
     "javaType": "org.apache.camel.component.aws2.ddb.Ddb2Component",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddbstream.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddbstream.json
index 4e2004b9502..ca1d1b9ee97 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddbstream.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddbstream.json
@@ -6,7 +6,7 @@
     "description": "Receive messages from AWS DynamoDB Stream service using 
AWS SDK version 2.x.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "cloud,messaging,streams",
+    "label": "cloud,messaging",
     "javaType": 
"org.apache.camel.component.aws2.ddbstream.Ddb2StreamComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-lambda.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-lambda.json
index 8f4ba042d65..a802cb5029c 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-lambda.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-lambda.json
@@ -6,7 +6,7 @@
     "description": "Manage and invoke AWS Lambda functions using AWS SDK 
version 2.x.",
     "deprecated": false,
     "firstVersion": "3.2.0",
-    "label": "cloud,computing,serverless",
+    "label": "cloud,serverless",
     "javaType": "org.apache.camel.component.aws2.lambda.Lambda2Component",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bean.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bean.json
index 8538030ca6e..e4908183676 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bean.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bean.json
@@ -6,7 +6,7 @@
     "description": "Invoke methods of Java beans stored in Camel registry.",
     "deprecated": false,
     "firstVersion": "1.0.0",
-    "label": "core,java",
+    "label": "core,script",
     "javaType": "org.apache.camel.component.bean.BeanComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bonita.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bonita.json
index 4e4056d984f..3578480c224 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bonita.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bonita.json
@@ -6,7 +6,7 @@
     "description": "Communicate with a remote Bonita BPM process engine.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "process",
+    "label": "workflow",
     "javaType": "org.apache.camel.component.bonita.BonitaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/braintree.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/braintree.json
index 8f4ef478247..6839d6274f3 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/braintree.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/braintree.json
@@ -6,7 +6,7 @@
     "description": "Process payments using Braintree Payments.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "cloud,payment",
+    "label": "saas",
     "javaType": "org.apache.camel.component.braintree.BraintreeComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-cache.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-cache.json
index 89b2503f572..11abeea10ef 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-cache.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-cache.json
@@ -6,7 +6,7 @@
     "description": "Perform caching operations using Caffeine Cache.",
     "deprecated": false,
     "firstVersion": "2.20.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": 
"org.apache.camel.component.caffeine.cache.CaffeineCacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-loadcache.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-loadcache.json
index bbfd6a98e76..c344ef8bbb3 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-loadcache.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-loadcache.json
@@ -6,7 +6,7 @@
     "description": "Perform caching operations using Caffeine Cache with an 
attached CacheLoader.",
     "deprecated": false,
     "firstVersion": "2.20.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": 
"org.apache.camel.component.caffeine.load.CaffeineLoadCacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/class.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/class.json
index 61840df51bf..20467a85e2d 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/class.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/class.json
@@ -6,7 +6,7 @@
     "description": "Invoke methods of Java beans specified by class name.",
     "deprecated": false,
     "firstVersion": "2.4.0",
-    "label": "core,java",
+    "label": "core,script",
     "javaType": "org.apache.camel.component.beanclass.ClassComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cometd.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cometd.json
index 99c76b1d4fc..bd0ebe0745e 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cometd.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cometd.json
@@ -6,7 +6,7 @@
     "description": "Offers publish\/subscribe, peer-to-peer (via a server), 
and RPC style messaging using the CometD\/Bayeux protocol.",
     "deprecated": false,
     "firstVersion": "2.0.0",
-    "label": "websocket",
+    "label": "networking,messaging",
     "javaType": "org.apache.camel.component.cometd.CometdComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cometds.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cometds.json
index 296fc28e82c..504a847460a 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cometds.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cometds.json
@@ -6,7 +6,7 @@
     "description": "Offers publish\/subscribe, peer-to-peer (via a server), 
and RPC style messaging using the CometD\/Bayeux protocol.",
     "deprecated": false,
     "firstVersion": "2.0.0",
-    "label": "websocket",
+    "label": "networking,messaging",
     "javaType": "org.apache.camel.component.cometd.CometdComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchbase.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchbase.json
index 51ee4b3debf..fb52ba1ec7d 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchbase.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchbase.json
@@ -6,7 +6,7 @@
     "description": "Query Couchbase Views with a poll strategy and\/or perform 
various operations against Couchbase databases.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.couchbase.CouchbaseComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchdb.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchdb.json
index 16d39c8231c..3ef0d84621d 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchdb.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchdb.json
@@ -6,7 +6,7 @@
     "description": "Consume changesets for inserts, updates and deletes in a 
CouchDB database, as well as get, save, update and delete documents from a 
CouchDB database.",
     "deprecated": false,
     "firstVersion": "2.11.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.couchdb.CouchDbComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cql.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cql.json
index 731e52ce6dc..9ddff3fdcf4 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cql.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cql.json
@@ -6,7 +6,7 @@
     "description": "Integrate with Cassandra 2.0 using the CQL3 API (not the 
Thrift API). Based on Cassandra Java Driver provided by DataStax.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "database,nosql",
+    "label": "database,bigdata",
     "javaType": "org.apache.camel.component.cassandra.CassandraComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxf.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxf.json
index 52034134eb8..f9507db18d0 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxf.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxf.json
@@ -6,7 +6,7 @@
     "description": "Expose SOAP WebServices using Apache CXF or connect to 
external WebServices using CXF WS client.",
     "deprecated": false,
     "firstVersion": "1.0.0",
-    "label": "soap,webservice",
+    "label": "http,webservice",
     "javaType": "org.apache.camel.component.cxf.jaxws.CxfComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-db2.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-db2.json
index 0e322942607..8a204d5fa0f 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-db2.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-db2.json
@@ -6,7 +6,7 @@
     "description": "Capture changes from a DB2 database.",
     "deprecated": false,
     "firstVersion": "3.17.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumDb2Component",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mongodb.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mongodb.json
index 8292af22357..6084f57a4d4 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mongodb.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mongodb.json
@@ -6,7 +6,7 @@
     "description": "Capture changes from a MongoDB database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumMongodbComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mysql.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mysql.json
index 8d553863ce6..c9e7d34529b 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mysql.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mysql.json
@@ -6,7 +6,7 @@
     "description": "Capture changes from a MySQL database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumMySqlComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-oracle.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-oracle.json
index e446fcd29e5..ec91f291c9b 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-oracle.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-oracle.json
@@ -6,7 +6,7 @@
     "description": "Capture changes from a Oracle database.",
     "deprecated": false,
     "firstVersion": "3.17.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumOracleComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-postgres.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-postgres.json
index b0cb545968a..4f96a09c7f6 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-postgres.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-postgres.json
@@ -6,7 +6,7 @@
     "description": "Capture changes from a PostgresSQL database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": 
"org.apache.camel.component.debezium.DebeziumPostgresComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-sqlserver.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-sqlserver.json
index a387b53e060..4c6df78dae0 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-sqlserver.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-sqlserver.json
@@ -6,7 +6,7 @@
     "description": "Capture changes from an SQL Server database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": 
"org.apache.camel.component.debezium.DebeziumSqlserverComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/direct.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/direct.json
index c5858137fcc..f77f35a551d 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/direct.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/direct.json
@@ -6,7 +6,7 @@
     "description": "Call another endpoint from the same Camel Context 
synchronously.",
     "deprecated": false,
     "firstVersion": "1.0.0",
-    "label": "core,endpoint",
+    "label": "core,messaging",
     "javaType": "org.apache.camel.component.direct.DirectComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/disruptor-vm.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/disruptor-vm.json
index e1a628ab8ae..da687c8960c 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/disruptor-vm.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/disruptor-vm.json
@@ -6,7 +6,7 @@
     "description": "Provides asynchronous SEDA behavior using LMAX Disruptor.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "endpoint",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.disruptor.vm.DisruptorVmComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/disruptor.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/disruptor.json
index 7a7df0d6414..6231181636d 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/disruptor.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/disruptor.json
@@ -6,7 +6,7 @@
     "description": "Provides asynchronous SEDA behavior using LMAX Disruptor.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "endpoint",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.disruptor.DisruptorComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/djl.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/djl.json
index c2bde9e3203..c7bbef48397 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/djl.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/djl.json
@@ -6,7 +6,7 @@
     "description": "Infer Deep Learning models from message exchanges data 
using Deep Java Library (DJL).",
     "deprecated": false,
     "firstVersion": "3.3.0",
-    "label": "ai,deeplearning",
+    "label": "ai",
     "javaType": "org.apache.camel.component.djl.DJLComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/docker.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/docker.json
index 01859bae663..9f112e05df5 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/docker.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/docker.json
@@ -6,7 +6,7 @@
     "description": "Manage Docker containers.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "cloud,container,paas",
+    "label": "cloud,container",
     "javaType": "org.apache.camel.component.docker.DockerComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/drill.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/drill.json
index 0522ae0e4f3..0395696e8e1 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/drill.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/drill.json
@@ -6,7 +6,7 @@
     "description": "Perform queries against an Apache Drill cluster.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "database,sql",
+    "label": "database,bigdata",
     "javaType": "org.apache.camel.component.drill.DrillComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dynamic-router.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dynamic-router.json
index bb7e16eb3f9..7b502e104a7 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dynamic-router.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dynamic-router.json
@@ -6,7 +6,7 @@
     "description": "The Dynamic Router component routes exchanges to 
recipients, and the recipients (and their rules) may change at runtime.",
     "deprecated": false,
     "firstVersion": "3.15.0",
-    "label": "endpoint,java",
+    "label": "messaging,core",
     "javaType": 
"org.apache.camel.component.dynamicrouter.DynamicRouterComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ehcache.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ehcache.json
index beb0332e157..875550ba05b 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ehcache.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ehcache.json
@@ -6,7 +6,7 @@
     "description": "Perform caching operations using Ehcache.",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ehcache.EhcacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/exec.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/exec.json
index bb06cfb9e0a..3ac6ef20a51 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/exec.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/exec.json
@@ -6,7 +6,7 @@
     "description": "Execute commands on the underlying operating system.",
     "deprecated": false,
     "firstVersion": "2.3.0",
-    "label": "system",
+    "label": "core",
     "javaType": "org.apache.camel.component.exec.ExecComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/flink.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/flink.json
index 8409b312e96..54df58669b6 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/flink.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/flink.json
@@ -6,7 +6,7 @@
     "description": "Send DataSet jobs to an Apache Flink cluster.",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "transformation,bigdata,streams",
+    "label": "transformation,bigdata",
     "javaType": "org.apache.camel.component.flink.FlinkComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/geocoder.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/geocoder.json
index 7f5c22aeee8..e16a7848dbf 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/geocoder.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/geocoder.json
@@ -6,7 +6,7 @@
     "description": "Find geocodes (latitude and longitude) for a given address 
or the other way round.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "api,location",
+    "label": "api,search",
     "javaType": "org.apache.camel.component.geocoder.GeoCoderComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-sheets-stream.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-sheets-stream.json
index aa10e5fe4fa..e0059454440 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-sheets-stream.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-sheets-stream.json
@@ -6,7 +6,7 @@
     "description": "Poll for changes in Google Sheets.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "cloud,sheets",
+    "label": "cloud,document",
     "javaType": 
"org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-sheets.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-sheets.json
index dff6c9fe2e4..4130b2088d1 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-sheets.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-sheets.json
@@ -6,7 +6,7 @@
     "description": "Manage spreadsheets in Google Sheets.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "api,cloud,sheets",
+    "label": "cloud,document",
     "javaType": 
"org.apache.camel.component.google.sheets.GoogleSheetsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/grape.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/grape.json
index 57e1625dc5b..afbc4ba66fe 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/grape.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/grape.json
@@ -6,7 +6,7 @@
     "description": "Fetch, load and manage additional jars dynamically after 
Camel Context was started.",
     "deprecated": false,
     "firstVersion": "2.16.0",
-    "label": "management,deployment",
+    "label": "management",
     "javaType": "org.apache.camel.component.grape.GrapeComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/guava-eventbus.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/guava-eventbus.json
index 3a50880aa57..78fb73739c9 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/guava-eventbus.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/guava-eventbus.json
@@ -6,7 +6,7 @@
     "description": "Send and receive messages to\/from Guava EventBus.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "eventbus",
+    "label": "messaging",
     "javaType": 
"org.apache.camel.component.guava.eventbus.GuavaEventBusComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-atomicvalue.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-atomicvalue.json
index 6402215c786..29ff86a2fbe 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-atomicvalue.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-atomicvalue.json
@@ -6,7 +6,7 @@
     "description": "Increment, decrement, set, etc. Hazelcast atomic number (a 
grid wide number).",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": 
"org.apache.camel.component.hazelcast.atomicnumber.HazelcastAtomicnumberComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-instance.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-instance.json
index 229b285eaf6..a0a5b90546d 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-instance.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-instance.json
@@ -6,7 +6,7 @@
     "description": "Consume join\/leave events of a cache instance in a 
Hazelcast cluster.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": 
"org.apache.camel.component.hazelcast.instance.HazelcastInstanceComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-list.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-list.json
index 3548261650e..11dff5d2fa9 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-list.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-list.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast distributed list.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": 
"org.apache.camel.component.hazelcast.list.HazelcastListComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-map.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-map.json
index 788f08de36e..64835cc2a17 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-map.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-map.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast distributed map.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": 
"org.apache.camel.component.hazelcast.map.HazelcastMapComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-multimap.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-multimap.json
index fae39c20b3e..700aab79397 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-multimap.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-multimap.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast distributed multimap.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": 
"org.apache.camel.component.hazelcast.multimap.HazelcastMultimapComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-queue.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-queue.json
index 08c337545e8..53fc1ea0be8 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-queue.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-queue.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast distributed queue.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid,messaging",
+    "label": "cache,clustering,messaging",
     "javaType": 
"org.apache.camel.component.hazelcast.queue.HazelcastQueueComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-replicatedmap.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-replicatedmap.json
index e099e73f29b..1e39ce54dc3 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-replicatedmap.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-replicatedmap.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast replicated map.",
     "deprecated": false,
     "firstVersion": "2.16.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": 
"org.apache.camel.component.hazelcast.replicatedmap.HazelcastReplicatedmapComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-ringbuffer.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-ringbuffer.json
index 86b936e9df2..eaeaff73d6c 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-ringbuffer.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-ringbuffer.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast distributed ringbuffer.",
     "deprecated": false,
     "firstVersion": "2.16.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": 
"org.apache.camel.component.hazelcast.ringbuffer.HazelcastRingbufferComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-seda.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-seda.json
index 33d2be487c6..50b562c9e1e 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-seda.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-seda.json
@@ -6,7 +6,7 @@
     "description": "Asynchronously send\/receive Exchanges between Camel 
routes running on potentially distinct JVMs\/hosts backed by Hazelcast 
BlockingQueue.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": 
"org.apache.camel.component.hazelcast.seda.HazelcastSedaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-set.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-set.json
index 93d8e52fc92..f2999fca644 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-set.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-set.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast distributed set.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": 
"org.apache.camel.component.hazelcast.set.HazelcastSetComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-topic.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-topic.json
index e0257b20200..334563f4792 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-topic.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-topic.json
@@ -6,7 +6,7 @@
     "description": "Send and receive messages to\/from Hazelcast distributed 
topic.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": 
"org.apache.camel.component.hazelcast.topic.HazelcastTopicComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hdfs.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hdfs.json
index 8cc98d0a7ca..292bd1e465f 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hdfs.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hdfs.json
@@ -6,7 +6,7 @@
     "description": "Read and write from\/to an HDFS filesystem using Hadoop 
2.x.",
     "deprecated": false,
     "firstVersion": "2.14.0",
-    "label": "bigdata,hadoop,file",
+    "label": "bigdata,file",
     "javaType": "org.apache.camel.component.hdfs.HdfsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hyperledger-aries.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hyperledger-aries.json
index c531e630929..f8264190a7c 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hyperledger-aries.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hyperledger-aries.json
@@ -6,7 +6,7 @@
     "description": "Camel support for Hyperledger Aries",
     "deprecated": false,
     "firstVersion": "3.19.0",
-    "label": "blockchain,identity",
+    "label": "blockchain,security",
     "javaType": "org.apache.camel.component.aries.HyperledgerAriesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-cache.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-cache.json
index ac067af2506..c74fffc3392 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-cache.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-cache.json
@@ -6,7 +6,7 @@
     "description": "Perform cache operations on an Ignite cache or consume 
changes from a continuous query.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ignite.cache.IgniteCacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-compute.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-compute.json
index 09307cff38a..e419e543f7b 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-compute.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-compute.json
@@ -6,7 +6,7 @@
     "description": "Run compute operations on an Ignite cluster.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "compute",
+    "label": "cache,clustering",
     "javaType": 
"org.apache.camel.component.ignite.compute.IgniteComputeComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-events.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-events.json
index 6f0a7102243..234ba5e0556 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-events.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-events.json
@@ -6,7 +6,7 @@
     "description": "Receive events from an Ignite cluster by creating a local 
event listener.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "messaging,eventbus",
+    "label": "messaging,cache,clustering",
     "javaType": 
"org.apache.camel.component.ignite.events.IgniteEventsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-idgen.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-idgen.json
index f496462da0b..866f1953980 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-idgen.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-idgen.json
@@ -6,7 +6,7 @@
     "description": "Interact with Ignite Atomic Sequences and ID Generators .",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "compute",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ignite.idgen.IgniteIdGenComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-queue.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-queue.json
index 983bbc14299..a4a66e72c31 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-queue.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-queue.json
@@ -6,7 +6,7 @@
     "description": "Interact with Ignite Queue data structures.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "messaging,queue",
+    "label": "cache,clustering,messaging",
     "javaType": "org.apache.camel.component.ignite.queue.IgniteQueueComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-set.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-set.json
index d4a74d4cc98..d1423d124ea 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-set.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-set.json
@@ -6,7 +6,7 @@
     "description": "Interact with Ignite Set data structures.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "cache,compute",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ignite.set.IgniteSetComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/infinispan-embedded.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/infinispan-embedded.json
index aa8d2aadc31..1e09580aece 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/infinispan-embedded.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/infinispan-embedded.json
@@ -6,7 +6,7 @@
     "description": "Read and write from\/to Infinispan distributed key\/value 
store and data grid.",
     "deprecated": false,
     "firstVersion": "2.13.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": 
"org.apache.camel.component.infinispan.embedded.InfinispanEmbeddedComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/infinispan.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/infinispan.json
index 0e24e5dfb57..3df20c4dd52 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/infinispan.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/infinispan.json
@@ -6,7 +6,7 @@
     "description": "Read and write from\/to Infinispan distributed key\/value 
store and data grid.",
     "deprecated": false,
     "firstVersion": "2.13.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": 
"org.apache.camel.component.infinispan.remote.InfinispanRemoteComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jcache.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jcache.json
index 135ac2a347b..e450eb34dd8 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jcache.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jcache.json
@@ -6,7 +6,7 @@
     "description": "Perform caching operations against JSR107\/JCache.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.jcache.JCacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jdbc.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jdbc.json
index 5743cb128d2..6fe0781d127 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jdbc.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jdbc.json
@@ -6,7 +6,7 @@
     "description": "Access databases through SQL and JDBC.",
     "deprecated": false,
     "firstVersion": "1.2.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.jdbc.JdbcComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jira.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jira.json
index 30d57975f25..e1bb2e3b16a 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jira.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jira.json
@@ -6,7 +6,7 @@
     "description": "Interact with JIRA issue tracker.",
     "deprecated": false,
     "firstVersion": "3.0",
-    "label": "api,reporting",
+    "label": "document",
     "javaType": "org.apache.camel.component.jira.JiraComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jooq.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jooq.json
index 9557ef0d036..d2bc3dea922 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jooq.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jooq.json
@@ -6,7 +6,7 @@
     "description": "Store and retrieve Java objects from an SQL database using 
JOOQ.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.jooq.JooqComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jpa.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jpa.json
index c8f43399b18..87d5c2def62 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jpa.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jpa.json
@@ -6,7 +6,7 @@
     "description": "Store and retrieve Java objects from databases using Java 
Persistence API (JPA).",
     "deprecated": false,
     "firstVersion": "1.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.jpa.JpaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-config-maps.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-config-maps.json
index 7e5693d5983..fb759b32dd6 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-config-maps.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-config-maps.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes ConfigMaps and get 
notified on ConfigMaps changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.kubernetes.config_maps.KubernetesConfigMapsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-custom-resources.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-custom-resources.json
index b03fd8bd91f..0e6fa22b2f7 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-custom-resources.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-custom-resources.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Custom Resources and get 
notified on Deployment changes.",
     "deprecated": false,
     "firstVersion": "3.7.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.kubernetes.customresources.KubernetesCustomResourcesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-deployments.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-deployments.json
index 78057fc1329..2a4260212d4 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-deployments.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-deployments.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Deployments and get 
notified on Deployment changes.",
     "deprecated": false,
     "firstVersion": "2.20.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.kubernetes.deployments.KubernetesDeploymentsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-events.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-events.json
index aae6399382d..3022f1430aa 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-events.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-events.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Events and get notified 
on Events changes.",
     "deprecated": false,
     "firstVersion": "3.20.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.kubernetes.events.KubernetesEventsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-hpa.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-hpa.json
index 2b0ade58dd9..11d47818869 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-hpa.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-hpa.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Horizontal Pod 
Autoscalers (HPA) and get notified on HPA changes.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.kubernetes.hpa.KubernetesHPAComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-job.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-job.json
index 94742136239..7961a1e5bc9 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-job.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-job.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Jobs.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.kubernetes.job.KubernetesJobComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-namespaces.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-namespaces.json
index c6572338f16..2ad1001e99f 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-namespaces.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-namespaces.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Namespaces and get 
notified on Namespace changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.kubernetes.namespaces.KubernetesNamespacesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-nodes.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-nodes.json
index c086a248fbb..8a8a93c08a3 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-nodes.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-nodes.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Nodes and get notified on 
Node changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.kubernetes.nodes.KubernetesNodesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-persistent-volumes-claims.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-persistent-volumes-claims.json
index 2f52479fd62..0513c41f202 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-persistent-volumes-claims.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-persistent-volumes-claims.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Persistent Volumes Claims 
and get notified on Persistent Volumes Claim changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.kubernetes.persistent_volumes_claims.KubernetesPersistentVolumesClaimsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-persistent-volumes.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-persistent-volumes.json
index a9934d5aebd..77ba12dede3 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-persistent-volumes.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-persistent-volumes.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Persistent Volumes and 
get notified on Persistent Volume changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.kubernetes.persistent_volumes.KubernetesPersistentVolumesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-pods.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-pods.json
index 22a92e4601e..a9c7d3c2715 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-pods.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-pods.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Pods and get notified on 
Pod changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.kubernetes.pods.KubernetesPodsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-replication-controllers.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-replication-controllers.json
index b4ad421e91b..32654989c10 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-replication-controllers.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-replication-controllers.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Replication Controllers 
and get notified on Replication Controllers changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.kubernetes.replication_controllers.KubernetesReplicationControllersComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-resources-quota.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-resources-quota.json
index 00e1e54258f..554851728c4 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-resources-quota.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-resources-quota.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Resources Quotas.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.kubernetes.resources_quota.KubernetesResourcesQuotaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-secrets.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-secrets.json
index be7a636a543..7263e8a42e1 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-secrets.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-secrets.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Secrets.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.kubernetes.secrets.KubernetesSecretsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-service-accounts.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-service-accounts.json
index 4afaa95b576..848a012178e 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-service-accounts.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-service-accounts.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Service Accounts.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.kubernetes.service_accounts.KubernetesServiceAccountsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-services.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-services.json
index 6ef3c8a82bf..8e4af529c6f 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-services.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-services.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Services and get notified 
on Service changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.kubernetes.services.KubernetesServicesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ldap.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ldap.json
index f6e3679e589..21f5dda461a 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ldap.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ldap.json
@@ -6,7 +6,7 @@
     "description": "Perform searches on LDAP servers.",
     "deprecated": false,
     "firstVersion": "1.5.0",
-    "label": "search,ldap",
+    "label": "database,security",
     "javaType": "org.apache.camel.component.ldap.LdapComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ldif.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ldif.json
index 32d4b9e5cf5..e9d3be1257c 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ldif.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ldif.json
@@ -6,7 +6,7 @@
     "description": "Perform updates on an LDAP server from an LDIF body 
content.",
     "deprecated": false,
     "firstVersion": "2.20.0",
-    "label": "ldap",
+    "label": "database,security",
     "javaType": "org.apache.camel.component.ldif.LdifComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lpr.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lpr.json
index 4ce20e89238..acaa9a6dded 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lpr.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lpr.json
@@ -6,7 +6,7 @@
     "description": "Send print jobs to printers.",
     "deprecated": false,
     "firstVersion": "2.1.0",
-    "label": "printing",
+    "label": "document",
     "javaType": "org.apache.camel.component.printer.PrinterComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lumberjack.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lumberjack.json
index 778577ec5b9..6f1974c4b0c 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lumberjack.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lumberjack.json
@@ -6,7 +6,7 @@
     "description": "Receive logs messages using the Lumberjack protocol.",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "log",
+    "label": "monitoring",
     "javaType": "org.apache.camel.component.lumberjack.LumberjackComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mina.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mina.json
index d312fd7b28c..6939fb81174 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mina.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mina.json
@@ -6,7 +6,7 @@
     "description": "Socket level networking using TCP or UDP with Apache Mina 
2.x.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "networking,tcp,udp",
+    "label": "networking",
     "javaType": "org.apache.camel.component.mina.MinaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mllp.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mllp.json
index e2aa601dcd2..9be8916e321 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mllp.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mllp.json
@@ -6,7 +6,7 @@
     "description": "Communicate with external systems using the MLLP 
protocol.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "networking,rpc,mllp",
+    "label": "HEALTH",
     "javaType": "org.apache.camel.component.mllp.MllpComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb-gridfs.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb-gridfs.json
index d877614999a..cb3a7ebbeb2 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb-gridfs.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb-gridfs.json
@@ -6,7 +6,7 @@
     "description": "Interact with MongoDB GridFS.",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "database,nosql",
+    "label": "database,file",
     "javaType": "org.apache.camel.component.mongodb.gridfs.GridFsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb.json
index ec41dd3719e..e59a6dce3c5 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on MongoDB documents and collections.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.mongodb.MongoDbComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mybatis-bean.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mybatis-bean.json
index 06ecb69c6a2..4ae015976af 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mybatis-bean.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mybatis-bean.json
@@ -6,7 +6,7 @@
     "description": "Perform queries, inserts, updates or deletes in a 
relational database using MyBatis.",
     "deprecated": false,
     "firstVersion": "2.22.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.mybatis.MyBatisBeanComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mybatis.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mybatis.json
index 47f4edbdd1b..c2b8db755b7 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mybatis.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mybatis.json
@@ -6,7 +6,7 @@
     "description": "Performs a query, poll, insert, update or delete in a 
relational database using MyBatis.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.mybatis.MyBatisComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json
index 854282bed33..07983991e1f 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json
@@ -6,7 +6,7 @@
     "description": "Socket level networking using TCP or UDP with Netty 4.x.",
     "deprecated": false,
     "firstVersion": "2.14.0",
-    "label": "networking,tcp,udp",
+    "label": "networking",
     "javaType": "org.apache.camel.component.netty.NettyComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nitrite.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nitrite.json
index 47bb4b68c83..c47708e6a25 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nitrite.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nitrite.json
@@ -6,7 +6,7 @@
     "description": "Access Nitrite databases.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.nitrite.NitriteComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/oaipmh.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/oaipmh.json
index 0a9a0d0d7fe..b54338db20a 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/oaipmh.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/oaipmh.json
@@ -6,7 +6,7 @@
     "description": "Harvest metadata using OAI-PMH protocol",
     "deprecated": false,
     "firstVersion": "3.5.0",
-    "label": "endpoint,webservice,batch",
+    "label": "search",
     "javaType": "org.apache.camel.oaipmh.component.OAIPMHComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-build-configs.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-build-configs.json
index 634f76fdb53..8eed6503abd 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-build-configs.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-build-configs.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on OpenShift Build Configs.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.openshift.build_configs.OpenshiftBuildConfigsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-builds.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-builds.json
index 667511e8907..13ebda789af 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-builds.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-builds.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on OpenShift Builds.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.openshift.builds.OpenshiftBuildsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-deploymentconfigs.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-deploymentconfigs.json
index abbd6d8fc65..51eded18612 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-deploymentconfigs.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-deploymentconfigs.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Openshift Deployment Configs and get 
notified on Deployment Config changes.",
     "deprecated": false,
     "firstVersion": "3.18.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": 
"org.apache.camel.component.openshift.deploymentconfigs.OpenshiftDeploymentConfigsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-cinder.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-cinder.json
index 2a842656766..2a96ba9eee0 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-cinder.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-cinder.json
@@ -6,7 +6,7 @@
     "description": "Access data in OpenStack Cinder block storage.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,paas",
+    "label": "container",
     "javaType": "org.apache.camel.component.openstack.cinder.CinderComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-glance.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-glance.json
index e82fb158eab..1b83ca548ac 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-glance.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-glance.json
@@ -6,7 +6,7 @@
     "description": "Manage VM images and metadata definitions in OpenStack 
Glance.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,paas",
+    "label": "container",
     "javaType": "org.apache.camel.component.openstack.glance.GlanceComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-keystone.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-keystone.json
index 4dba4da0f82..96b66573833 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-keystone.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-keystone.json
@@ -6,7 +6,7 @@
     "description": "Access OpenStack Keystone for API client authentication, 
service discovery and distributed multi-tenant authorization.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,paas",
+    "label": "container",
     "javaType": 
"org.apache.camel.component.openstack.keystone.KeystoneComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-neutron.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-neutron.json
index c6af0139bd4..dffb7576a4b 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-neutron.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-neutron.json
@@ -6,7 +6,7 @@
     "description": "Access OpenStack Neutron for network services.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,paas",
+    "label": "container",
     "javaType": 
"org.apache.camel.component.openstack.neutron.NeutronComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-nova.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-nova.json
index b20f8bb80d6..4e9b635c457 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-nova.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-nova.json
@@ -6,7 +6,7 @@
     "description": "Access OpenStack to manage compute resources.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,paas",
+    "label": "container",
     "javaType": "org.apache.camel.component.openstack.nova.NovaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-swift.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-swift.json
index 3969bbafc62..5caa10e0892 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-swift.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-swift.json
@@ -6,7 +6,7 @@
     "description": "Access OpenStack Swift object\/blob store.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,paas",
+    "label": "container",
     "javaType": "org.apache.camel.component.openstack.swift.SwiftComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/optaplanner.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/optaplanner.json
index c5f28e0355c..3a6df5864f1 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/optaplanner.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/optaplanner.json
@@ -6,7 +6,7 @@
     "description": "Solve planning problems with OptaPlanner.",
     "deprecated": false,
     "firstVersion": "2.13.0",
-    "label": "engine,planning",
+    "label": "workflow",
     "javaType": "org.apache.camel.component.optaplanner.OptaPlannerComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pdf.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pdf.json
index 2a310fcf992..ea4cf692963 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pdf.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pdf.json
@@ -6,7 +6,7 @@
     "description": "Create, modify or extract content from PDF documents.",
     "deprecated": false,
     "firstVersion": "2.16.0",
-    "label": "document,transformation,printing",
+    "label": "document,transformation",
     "javaType": "org.apache.camel.component.pdf.PdfComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pg-replication-slot.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pg-replication-slot.json
index 966482012e8..7e4b98ecc9f 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pg-replication-slot.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pg-replication-slot.json
@@ -6,7 +6,7 @@
     "description": "Poll for PostgreSQL Write-Ahead Log (WAL) records using 
Streaming Replication Slots.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": 
"org.apache.camel.component.pg.replication.slot.PgReplicationSlotComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pgevent.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pgevent.json
index a3ebc181491..91362f64d15 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pgevent.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pgevent.json
@@ -6,7 +6,7 @@
     "description": "Send and receive PostgreSQL events via LISTEN and NOTIFY 
commands.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.pgevent.PgEventComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/reactive-streams.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/reactive-streams.json
index c240f0a9493..e6b6777d453 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/reactive-streams.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/reactive-streams.json
@@ -6,7 +6,7 @@
     "description": "Exchange messages with reactive stream processing 
libraries compatible with the reactive streams standard.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "reactive,streams",
+    "label": "messaging",
     "javaType": 
"org.apache.camel.component.reactive.streams.ReactiveStreamsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ref.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ref.json
index 7faaa84f39d..04196f29e8a 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ref.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ref.json
@@ -6,7 +6,7 @@
     "description": "Route messages to an endpoint looked up dynamically by 
name in the Camel Registry.",
     "deprecated": false,
     "firstVersion": "1.2.0",
-    "label": "core,endpoint",
+    "label": "core",
     "javaType": "org.apache.camel.component.ref.RefComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-openapi.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-openapi.json
index 3de0b9b2d3a..e4e9bf06b5f 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-openapi.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-openapi.json
@@ -6,7 +6,7 @@
     "description": "Configure REST producers based on an OpenAPI specification 
document delegating to a component implementing the RestProducerFactory 
interface.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "openapi,rest,api",
+    "label": "rest,api",
     "javaType": "org.apache.camel.component.rest.openapi.RestOpenApiComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rss.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rss.json
index 9522951e135..a2423573716 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rss.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rss.json
@@ -6,7 +6,7 @@
     "description": "Poll RSS feeds.",
     "deprecated": false,
     "firstVersion": "2.0.0",
-    "label": "rss",
+    "label": "document",
     "javaType": "org.apache.camel.component.rss.RssComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/saga.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/saga.json
index 6c333168c4d..f9a658664b6 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/saga.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/saga.json
@@ -6,7 +6,7 @@
     "description": "Execute custom actions within a route using the Saga EIP.",
     "deprecated": false,
     "firstVersion": "2.21.0",
-    "label": "core,endpoint",
+    "label": "clustering",
     "javaType": "org.apache.camel.component.saga.SagaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
index 623af167d45..847358afd9e 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
@@ -6,7 +6,7 @@
     "description": "Communicate with Salesforce using Java DTOs.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "cloud,api,crm",
+    "label": "cloud,saas",
     "javaType": "org.apache.camel.component.salesforce.SalesforceComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sap-netweaver.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sap-netweaver.json
index e68ddaf8672..61e6452df38 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sap-netweaver.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sap-netweaver.json
@@ -6,7 +6,7 @@
     "description": "Send requests to SAP NetWeaver Gateway using HTTP.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "sap,cloud,api",
+    "label": "saas",
     "javaType": "org.apache.camel.component.sap.netweaver.NetWeaverComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/seda.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/seda.json
index 74079edc5ad..c5d513b5904 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/seda.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/seda.json
@@ -6,7 +6,7 @@
     "description": "Asynchronously call another endpoint from any Camel 
Context in the same JVM.",
     "deprecated": false,
     "firstVersion": "1.1.0",
-    "label": "core,endpoint",
+    "label": "core,messaging",
     "javaType": "org.apache.camel.component.seda.SedaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/splunk-hec.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/splunk-hec.json
index dd1cb06a52d..1d54f9d24b9 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/splunk-hec.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/splunk-hec.json
@@ -6,7 +6,7 @@
     "description": "The splunk component allows to publish events in Splunk 
using the HTTP Event Collector.",
     "deprecated": false,
     "firstVersion": "3.3.0",
-    "label": "log,monitoring",
+    "label": "monitoring",
     "javaType": "org.apache.camel.component.splunkhec.SplunkHECComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-batch.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-batch.json
index 8f8b9136043..548aaf1317d 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-batch.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-batch.json
@@ -6,7 +6,7 @@
     "description": "Send messages to Spring Batch for further processing.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "spring,batch,scheduling",
+    "label": "workflow",
     "javaType": "org.apache.camel.component.spring.batch.SpringBatchComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-event.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-event.json
index 9eedcd2e088..86ff42b52f0 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-event.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-event.json
@@ -6,7 +6,7 @@
     "description": "Listen for Spring Application Events.",
     "deprecated": false,
     "firstVersion": "1.4.0",
-    "label": "spring,eventbus",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.event.EventComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-jdbc.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-jdbc.json
index 28f9082e39f..d2c5560a7e2 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-jdbc.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-jdbc.json
@@ -6,7 +6,7 @@
     "description": "Access databases through SQL and JDBC with Spring 
Transaction support.",
     "deprecated": false,
     "firstVersion": "3.10.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.spring.jdbc.SpringJdbcComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-ldap.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-ldap.json
index f6dcbac2222..a28a82fec50 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-ldap.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-ldap.json
@@ -6,7 +6,7 @@
     "description": "Perform searches in LDAP servers using filters as the 
message payload.",
     "deprecated": false,
     "firstVersion": "2.11.0",
-    "label": "spring,ldap",
+    "label": "security",
     "javaType": "org.apache.camel.component.springldap.SpringLdapComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-redis.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-redis.json
index ad5bbf91f58..c6ae2bf4096 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-redis.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-redis.json
@@ -6,7 +6,7 @@
     "description": "Send and receive messages from Redis.",
     "deprecated": false,
     "firstVersion": "2.11.0",
-    "label": "spring,nosql",
+    "label": "cache",
     "javaType": "org.apache.camel.component.redis.RedisComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-ws.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-ws.json
index e52f59bb52c..8ef438bb348 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-ws.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-ws.json
@@ -6,7 +6,7 @@
     "description": "Access external web services as a client or expose your 
own web services.",
     "deprecated": false,
     "firstVersion": "2.6.0",
-    "label": "spring,soap,webservice",
+    "label": "webservice",
     "javaType": 
"org.apache.camel.component.spring.ws.SpringWebserviceComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sql-stored.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sql-stored.json
index 638fa099fb4..036dbf85976 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sql-stored.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sql-stored.json
@@ -6,7 +6,7 @@
     "description": "Perform SQL queries as a JDBC Stored Procedures using 
Spring JDBC.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.sql.stored.SqlStoredComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sql.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sql.json
index b8a85a1bd52..aaa5033f6ee 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sql.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sql.json
@@ -6,7 +6,7 @@
     "description": "Perform SQL queries using Spring JDBC.",
     "deprecated": false,
     "firstVersion": "1.4.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.sql.SqlComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stitch.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stitch.json
index dcfc5ccd96a..d6c842e3adf 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stitch.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stitch.json
@@ -6,7 +6,7 @@
     "description": "Stitch is a cloud ETL service that integrates various data 
sources into a central data warehouse through various integrations.",
     "deprecated": false,
     "firstVersion": "3.8.0",
-    "label": "cloud,api,compute,bigdata",
+    "label": "cloud,api,saas,bigdata",
     "javaType": "org.apache.camel.component.stitch.StitchComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stream.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stream.json
index beb571504ec..51e5e99aabb 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stream.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stream.json
@@ -6,7 +6,7 @@
     "description": "Read from system-in and write to system-out and system-err 
streams.",
     "deprecated": false,
     "firstVersion": "1.3.0",
-    "label": "file,system",
+    "label": "file,core",
     "javaType": "org.apache.camel.component.stream.StreamComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/twitter-directmessage.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/twitter-directmessage.json
index 36fb34ed5f0..3337ead3158 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/twitter-directmessage.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/twitter-directmessage.json
@@ -6,7 +6,7 @@
     "description": "Send and receive Twitter direct messages.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "cloud,api,social,chat",
+    "label": "saas,social",
     "javaType": 
"org.apache.camel.component.twitter.directmessage.TwitterDirectMessageComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/twitter-search.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/twitter-search.json
index b9d97d41649..09cb72de9bb 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/twitter-search.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/twitter-search.json
@@ -6,7 +6,7 @@
     "description": "Access Twitter Search.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "cloud,api,search,social",
+    "label": "saas,social",
     "javaType": 
"org.apache.camel.component.twitter.search.TwitterSearchComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/twitter-timeline.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/twitter-timeline.json
index 604881b72f1..48accb6ac97 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/twitter-timeline.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/twitter-timeline.json
@@ -6,7 +6,7 @@
     "description": "Send tweets and receive tweets from user's timeline.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "api,cloud,social",
+    "label": "saas,social",
     "javaType": 
"org.apache.camel.component.twitter.timeline.TwitterTimelineComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/undertow.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/undertow.json
index 8d5809dfed0..1f7bc1e0c02 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/undertow.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/undertow.json
@@ -6,7 +6,7 @@
     "description": "Expose HTTP and WebSocket endpoints and access external 
HTTP\/WebSocket servers.",
     "deprecated": false,
     "firstVersion": "2.16.0",
-    "label": "http,websocket",
+    "label": "http,networking",
     "javaType": "org.apache.camel.component.undertow.UndertowComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-websocket.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-websocket.json
index 1adba0f1233..7d19d18ee25 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-websocket.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-websocket.json
@@ -6,7 +6,7 @@
     "description": "Expose WebSocket endpoints and connect to remote WebSocket 
servers using Vert.x",
     "deprecated": false,
     "firstVersion": "3.5.0",
-    "label": "websocket",
+    "label": "http,networking",
     "javaType": 
"org.apache.camel.component.vertx.websocket.VertxWebsocketComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx.json
index 6ad94ffdbac..96ad9b51624 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx.json
@@ -6,7 +6,7 @@
     "description": "Send and receive messages to\/from Vert.x Event Bus.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "eventbus,reactive",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.vertx.VertxComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/web3j.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/web3j.json
index 803bc02c708..9df2dc3d84d 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/web3j.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/web3j.json
@@ -6,7 +6,7 @@
     "description": "Interact with Ethereum nodes using web3j client API.",
     "deprecated": false,
     "firstVersion": "2.22.0",
-    "label": "bitcoin,blockchain,api",
+    "label": "blockchain",
     "javaType": "org.apache.camel.component.web3j.Web3jComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/weka.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/weka.json
index d50875162d3..a130e6ca221 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/weka.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/weka.json
@@ -6,7 +6,7 @@
     "description": "Perform machine learning tasks using Weka.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "datamining",
+    "label": "blockchain",
     "javaType": "org.apache.camel.component.weka.WekaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/workday.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/workday.json
index 8c1ccbdde45..646a3760c89 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/workday.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/workday.json
@@ -6,7 +6,7 @@
     "description": "Detect and parse documents using Workday.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "cloud,api,hcm",
+    "label": "cloud,api,saas",
     "javaType": "org.apache.camel.component.workday.WorkdayComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xchange.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xchange.json
index f22a6c91c1e..24bf8b615c9 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xchange.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xchange.json
@@ -6,7 +6,7 @@
     "description": "Access market data and trade on Bitcoin and Altcoin 
exchanges.",
     "deprecated": false,
     "firstVersion": "2.21.0",
-    "label": "bitcoin,blockchain",
+    "label": "blockchain",
     "javaType": "org.apache.camel.component.xchange.XChangeComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/zeebe.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/zeebe.json
index 3fb85bb8ce3..dfb55e940e9 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/zeebe.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/zeebe.json
@@ -6,7 +6,7 @@
     "description": "Zeebe component which does integrage with Camunda Zeebe to 
interact with the API.",
     "deprecated": false,
     "firstVersion": "3.21.0",
-    "label": "process",
+    "label": "workflow,saas",
     "javaType": "org.apache.camel.component.zeebe.ZeebeComponent",
     "supportLevel": "Experimental",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/zendesk.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/zendesk.json
index 6b0039564f4..3b70b54893e 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/zendesk.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/zendesk.json
@@ -6,7 +6,7 @@
     "description": "Manage Zendesk tickets, users, organizations, etc.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,api,support",
+    "label": "cloud,api,saas",
     "javaType": "org.apache.camel.component.zendesk.ZendeskComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel.springboot",
diff --git 
a/components-starter/camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentConfiguration.java
 
b/components-starter/camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentConfiguration.java
index 13da910b087..d5429857e0f 100644
--- 
a/components-starter/camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentConfiguration.java
+++ 
b/components-starter/camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentConfiguration.java
@@ -20,7 +20,7 @@ import 
org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
- * Interact with Asterisk PBX Server.
+ * Interact with Asterisk PBX Server (VoIP).
  * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */