diff --git a/connectors/automation-anywhere/element-templates/automation-anywhere-outbound-connector.json b/connectors/automation-anywhere/element-templates/automation-anywhere-outbound-connector.json
index 408afce960..4d6ad9175a 100644
--- a/connectors/automation-anywhere/element-templates/automation-anywhere-outbound-connector.json
+++ b/connectors/automation-anywhere/element-templates/automation-anywhere-outbound-connector.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "Automation Anywhere Outbound Connector",
   "id" : "io.camunda.connectors.AutomationAnywhere",
-  "description" : "Orchestrate your Automation Anywhere bots with Camunda. You can create new queue items and get the result from it",
+  "description" : "Manage work items in Automation Anywhere queues.",
+  "metadata" : {
+    "keywords" : [ "add work item to queue", "get work item from queue", "get work item result from queue by ID" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/automation-anywhere/",
   "version" : 2,
   "category" : {
diff --git a/connectors/automation-anywhere/element-templates/hybrid/automation-anywhere-outbound-connector-hybrid.json b/connectors/automation-anywhere/element-templates/hybrid/automation-anywhere-outbound-connector-hybrid.json
index 884e99403e..789790ad64 100644
--- a/connectors/automation-anywhere/element-templates/hybrid/automation-anywhere-outbound-connector-hybrid.json
+++ b/connectors/automation-anywhere/element-templates/hybrid/automation-anywhere-outbound-connector-hybrid.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "Hybrid Automation Anywhere Outbound Connector",
   "id" : "io.camunda.connectors.AutomationAnywhere-hybrid",
-  "description" : "Orchestrate your Automation Anywhere bots with Camunda. You can create new queue items and get the result from it",
+  "description" : "Manage work items in Automation Anywhere queues.",
+  "metadata" : {
+    "keywords" : [ "add work item to queue", "get work item from queue", "get work item result from queue by ID" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/automation-anywhere/",
   "version" : 2,
   "category" : {
diff --git a/connectors/aws/aws-comprehend/element-templates/aws-comprehend-outbound-connector.json b/connectors/aws/aws-comprehend/element-templates/aws-comprehend-outbound-connector.json
index 08a5f007a3..b7de67c47e 100644
--- a/connectors/aws/aws-comprehend/element-templates/aws-comprehend-outbound-connector.json
+++ b/connectors/aws/aws-comprehend/element-templates/aws-comprehend-outbound-connector.json
@@ -3,6 +3,9 @@
   "name" : "AWS Comprehend Outbound Connector",
   "id" : "io.camunda.connectors.AWSCOMPREHEND.v1",
   "description" : "Execute Comprehend models",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/next/components/connectors/out-of-the-box-connectors/amazon-comprehend/",
   "version" : 1,
   "category" : {
diff --git a/connectors/aws/aws-comprehend/element-templates/hybrid/aws-comprehend-outbound-connector-hybrid.json b/connectors/aws/aws-comprehend/element-templates/hybrid/aws-comprehend-outbound-connector-hybrid.json
index a6375c305b..7ccb618154 100644
--- a/connectors/aws/aws-comprehend/element-templates/hybrid/aws-comprehend-outbound-connector-hybrid.json
+++ b/connectors/aws/aws-comprehend/element-templates/hybrid/aws-comprehend-outbound-connector-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid AWS Comprehend Outbound Connector",
   "id" : "io.camunda.connectors.AWSCOMPREHEND.v1-hybrid",
   "description" : "Execute Comprehend models",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/next/components/connectors/out-of-the-box-connectors/amazon-comprehend/",
   "version" : 1,
   "category" : {
diff --git a/connectors/aws/aws-dynamodb/element-templates/aws-dynamodb-outbound-connector.json b/connectors/aws/aws-dynamodb/element-templates/aws-dynamodb-outbound-connector.json
index 23502ab135..66caa9bec7 100644
--- a/connectors/aws/aws-dynamodb/element-templates/aws-dynamodb-outbound-connector.json
+++ b/connectors/aws/aws-dynamodb/element-templates/aws-dynamodb-outbound-connector.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "AWS DynamoDB Outbound Connector",
   "id" : "io.camunda.connectors.AWSDynamoDB.v1",
-  "description" : "Work with tables and items using AWS DynamoDB service",
+  "description" : "Manage tables and items with AWS DynamoDB.",
+  "metadata" : {
+    "keywords" : [ "create table", "delete table", "update table", "describe table", "scan table", "add item", "delete item", "get item", "update item" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-dynamodb/",
   "version" : 7,
   "category" : {
diff --git a/connectors/aws/aws-dynamodb/element-templates/hybrid/aws-dynamodb-outbound-connector-hybrid.json b/connectors/aws/aws-dynamodb/element-templates/hybrid/aws-dynamodb-outbound-connector-hybrid.json
index 61f22c23a3..a2fe0c1aa0 100644
--- a/connectors/aws/aws-dynamodb/element-templates/hybrid/aws-dynamodb-outbound-connector-hybrid.json
+++ b/connectors/aws/aws-dynamodb/element-templates/hybrid/aws-dynamodb-outbound-connector-hybrid.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "Hybrid AWS DynamoDB Outbound Connector",
   "id" : "io.camunda.connectors.AWSDynamoDB.v1-hybrid",
-  "description" : "Work with tables and items using AWS DynamoDB service",
+  "description" : "Manage tables and items with AWS DynamoDB.",
+  "metadata" : {
+    "keywords" : [ "create table", "delete table", "update table", "describe table", "scan table", "add item", "delete item", "get item", "update item" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-dynamodb/",
   "version" : 7,
   "category" : {
diff --git a/connectors/aws/aws-eventbridge/element-templates/aws-eventbridge-outbound-connector.json b/connectors/aws/aws-eventbridge/element-templates/aws-eventbridge-outbound-connector.json
index 9c6f877155..3bacacb83c 100644
--- a/connectors/aws/aws-eventbridge/element-templates/aws-eventbridge-outbound-connector.json
+++ b/connectors/aws/aws-eventbridge/element-templates/aws-eventbridge-outbound-connector.json
@@ -3,6 +3,9 @@
   "name" : "Amazon EventBridge Outbound Connector",
   "id" : "io.camunda.connectors.AWSEventBridge.v1",
   "description" : "Send events to AWS EventBridge",
+  "metadata" : {
+    "keywords" : [ "emit event", "publish event", "send event", "trigger event" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-eventbridge/?awseventbridge=outbound",
   "version" : 5,
   "category" : {
@@ -21,7 +24,7 @@
     "label" : "Queue properties"
   }, {
     "id" : "eventDetails",
-    "label" : "eventDetails"
+    "label" : "Event Details"
   }, {
     "id" : "eventPayload",
     "label" : "Event Payload"
diff --git a/connectors/aws/aws-eventbridge/element-templates/hybrid/aws-eventbridge-outbound-connector-hybrid.json b/connectors/aws/aws-eventbridge/element-templates/hybrid/aws-eventbridge-outbound-connector-hybrid.json
index 389cc93ab2..1840d41689 100644
--- a/connectors/aws/aws-eventbridge/element-templates/hybrid/aws-eventbridge-outbound-connector-hybrid.json
+++ b/connectors/aws/aws-eventbridge/element-templates/hybrid/aws-eventbridge-outbound-connector-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid Amazon EventBridge Outbound Connector",
   "id" : "io.camunda.connectors.AWSEventBridge.v1-hybrid",
   "description" : "Send events to AWS EventBridge",
+  "metadata" : {
+    "keywords" : [ "emit event", "publish event", "send event", "trigger event" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-eventbridge/?awseventbridge=outbound",
   "version" : 5,
   "category" : {
@@ -24,7 +27,7 @@
     "label" : "Queue properties"
   }, {
     "id" : "eventDetails",
-    "label" : "eventDetails"
+    "label" : "Event Details"
   }, {
     "id" : "eventPayload",
     "label" : "Event Payload"
diff --git a/connectors/aws/aws-lambda/element-templates/aws-lambda-outbound-connector.json b/connectors/aws/aws-lambda/element-templates/aws-lambda-outbound-connector.json
index 1f5cdb90c4..5f9411a7d0 100644
--- a/connectors/aws/aws-lambda/element-templates/aws-lambda-outbound-connector.json
+++ b/connectors/aws/aws-lambda/element-templates/aws-lambda-outbound-connector.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "AWS Lambda Outbound Connector",
   "id" : "io.camunda.connectors.AWSLAMBDA.v2",
-  "description" : "Invoke a function",
+  "description" : "Invoke AWS Lambda functions.",
+  "metadata" : {
+    "keywords" : [ "invoke function", "run function" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-lambda/",
   "version" : 5,
   "category" : {
diff --git a/connectors/aws/aws-lambda/element-templates/hybrid/aws-lambda-outbound-connector-hybrid.json b/connectors/aws/aws-lambda/element-templates/hybrid/aws-lambda-outbound-connector-hybrid.json
index 09415a4d16..cef4140594 100644
--- a/connectors/aws/aws-lambda/element-templates/hybrid/aws-lambda-outbound-connector-hybrid.json
+++ b/connectors/aws/aws-lambda/element-templates/hybrid/aws-lambda-outbound-connector-hybrid.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "Hybrid AWS Lambda Outbound Connector",
   "id" : "io.camunda.connectors.AWSLAMBDA.v2-hybrid",
-  "description" : "Invoke a function",
+  "description" : "Invoke AWS Lambda functions.",
+  "metadata" : {
+    "keywords" : [ "invoke function", "run function" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-lambda/",
   "version" : 5,
   "category" : {
diff --git a/connectors/aws/aws-sagemaker/element-templates/aws-sagemaker-outbound-connector.json b/connectors/aws/aws-sagemaker/element-templates/aws-sagemaker-outbound-connector.json
index 1159eb57d8..5353e3ce1c 100644
--- a/connectors/aws/aws-sagemaker/element-templates/aws-sagemaker-outbound-connector.json
+++ b/connectors/aws/aws-sagemaker/element-templates/aws-sagemaker-outbound-connector.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "AWS SageMaker Outbound Connector",
   "id" : "io.camunda.connectors.AWSSAGEMAKER.v1",
-  "description" : "Execute SageMaker models",
+  "description" : "Run inferences using AWS SageMaker.",
+  "metadata" : {
+    "keywords" : [ "run inference", "perform asynchronous inference", "perform real-time inference" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/next/components/connectors/out-of-the-box-connectors/amazon-sagemaker/",
   "version" : 1,
   "category" : {
diff --git a/connectors/aws/aws-sagemaker/element-templates/hybrid/aws-sagemaker-outbound-connector-hybrid.json b/connectors/aws/aws-sagemaker/element-templates/hybrid/aws-sagemaker-outbound-connector-hybrid.json
index 5f78d52829..3690b3346a 100644
--- a/connectors/aws/aws-sagemaker/element-templates/hybrid/aws-sagemaker-outbound-connector-hybrid.json
+++ b/connectors/aws/aws-sagemaker/element-templates/hybrid/aws-sagemaker-outbound-connector-hybrid.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "Hybrid AWS SageMaker Outbound Connector",
   "id" : "io.camunda.connectors.AWSSAGEMAKER.v1-hybrid",
-  "description" : "Execute SageMaker models",
+  "description" : "Run inferences using AWS SageMaker.",
+  "metadata" : {
+    "keywords" : [ "run inference", "perform asynchronous inference", "perform real-time inference" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/next/components/connectors/out-of-the-box-connectors/amazon-sagemaker/",
   "version" : 1,
   "category" : {
diff --git a/connectors/aws/aws-sns/element-templates/aws-sns-inbound-boundary.json b/connectors/aws/aws-sns/element-templates/aws-sns-inbound-boundary.json
index f194d60576..ce4b172912 100644
--- a/connectors/aws/aws-sns/element-templates/aws-sns-inbound-boundary.json
+++ b/connectors/aws/aws-sns/element-templates/aws-sns-inbound-boundary.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "SNS HTTPS Boundary Event Connector",
   "id" : "io.camunda.connectors.inbound.AWSSNS.Boundary.v1",
-  "description" : "Receive events from AWS SNS",
+  "description" : "Receive messages from AWS SNS via HTTPS.",
+  "metadata" : {
+    "keywords" : [ "receive event", "receive message" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sns/?amazonsns=inbound",
   "version" : 4,
   "category" : {
diff --git a/connectors/aws/aws-sns/element-templates/aws-sns-inbound-intermediate.json b/connectors/aws/aws-sns/element-templates/aws-sns-inbound-intermediate.json
index f04b48e96e..35fde9bdaa 100644
--- a/connectors/aws/aws-sns/element-templates/aws-sns-inbound-intermediate.json
+++ b/connectors/aws/aws-sns/element-templates/aws-sns-inbound-intermediate.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "SNS HTTPS Intermediate Catch Event Connector",
   "id" : "io.camunda.connectors.inbound.AWSSNS.IntermediateCatchEvent.v1",
-  "description" : "Receive events from AWS SNS",
+  "description" : "Receive messages from AWS SNS via HTTPS.",
+  "metadata" : {
+    "keywords" : [ "receive event", "receive message" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sns/?amazonsns=inbound",
   "version" : 4,
   "category" : {
diff --git a/connectors/aws/aws-sns/element-templates/aws-sns-inbound-message-start.json b/connectors/aws/aws-sns/element-templates/aws-sns-inbound-message-start.json
index 6b4bac66d2..af162358b7 100644
--- a/connectors/aws/aws-sns/element-templates/aws-sns-inbound-message-start.json
+++ b/connectors/aws/aws-sns/element-templates/aws-sns-inbound-message-start.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "SNS HTTPS Message Start Event Connector Subscription",
   "id" : "io.camunda.connectors.inbound.AWSSNS.MessageStartEvent.v1",
-  "description" : "Receive events from AWS SNS",
+  "description" : "Receive messages from AWS SNS via HTTPS.",
+  "metadata" : {
+    "keywords" : [ "receive event", "receive message" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sns/?amazonsns=inbound",
   "version" : 4,
   "category" : {
diff --git a/connectors/aws/aws-sns/element-templates/aws-sns-outbound-connector.json b/connectors/aws/aws-sns/element-templates/aws-sns-outbound-connector.json
index 3e0c1ab1fd..f8a1717393 100644
--- a/connectors/aws/aws-sns/element-templates/aws-sns-outbound-connector.json
+++ b/connectors/aws/aws-sns/element-templates/aws-sns-outbound-connector.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "Amazon SNS Outbound connector",
   "id" : "io.camunda.connectors.AWSSNS.v1",
-  "description" : "Send message to topic",
+  "description" : "Send messages to Amazon SNS.",
+  "metadata" : {
+    "keywords" : [ "send message", "publish message" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sns/?amazonsns=outbound",
   "version" : 7,
   "category" : {
diff --git a/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-boundary-hybrid.json b/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-boundary-hybrid.json
index 34ea694a05..8cebd1cc75 100644
--- a/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-boundary-hybrid.json
+++ b/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-boundary-hybrid.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "Hybrid SNS HTTPS Boundary Event Connector",
   "id" : "io.camunda.connectors.inbound.AWSSNS.Boundary.v1-hybrid",
-  "description" : "Receive events from AWS SNS",
+  "description" : "Receive messages from AWS SNS via HTTPS.",
+  "metadata" : {
+    "keywords" : [ "receive event", "receive message" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sns/?amazonsns=inbound",
   "version" : 4,
   "category" : {
diff --git a/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-intermediate-hybrid.json b/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-intermediate-hybrid.json
index a15e0e9f21..2735129fee 100644
--- a/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-intermediate-hybrid.json
+++ b/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-intermediate-hybrid.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "Hybrid SNS HTTPS Intermediate Catch Event Connector",
   "id" : "io.camunda.connectors.inbound.AWSSNS.IntermediateCatchEvent.v1-hybrid",
-  "description" : "Receive events from AWS SNS",
+  "description" : "Receive messages from AWS SNS via HTTPS.",
+  "metadata" : {
+    "keywords" : [ "receive event", "receive message" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sns/?amazonsns=inbound",
   "version" : 4,
   "category" : {
diff --git a/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-message-start-hybrid.json b/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-message-start-hybrid.json
index ac78da6a92..8e63e4013e 100644
--- a/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-message-start-hybrid.json
+++ b/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-message-start-hybrid.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "Hybrid SNS HTTPS Message Start Event Connector Subscription",
   "id" : "io.camunda.connectors.inbound.AWSSNS.MessageStartEvent.v1-hybrid",
-  "description" : "Receive events from AWS SNS",
+  "description" : "Receive messages from AWS SNS via HTTPS.",
+  "metadata" : {
+    "keywords" : [ "receive event", "receive message" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sns/?amazonsns=inbound",
   "version" : 4,
   "category" : {
diff --git a/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-outbound-connector-hybrid.json b/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-outbound-connector-hybrid.json
index d1295250f1..fc1d7f63de 100644
--- a/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-outbound-connector-hybrid.json
+++ b/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-outbound-connector-hybrid.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "Hybrid Amazon SNS Outbound connector",
   "id" : "io.camunda.connectors.AWSSNS.v1-hybrid",
-  "description" : "Send message to topic",
+  "description" : "Send messages to Amazon SNS.",
+  "metadata" : {
+    "keywords" : [ "send message", "publish message" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sns/?amazonsns=outbound",
   "version" : 7,
   "category" : {
diff --git a/connectors/aws/aws-sqs/element-templates/aws-sqs-boundary-connector.json b/connectors/aws/aws-sqs/element-templates/aws-sqs-boundary-connector.json
index e0d3f96fbf..d60e1c856d 100644
--- a/connectors/aws/aws-sqs/element-templates/aws-sqs-boundary-connector.json
+++ b/connectors/aws/aws-sqs/element-templates/aws-sqs-boundary-connector.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "Amazon SQS Boundary Event Connector",
   "id" : "io.camunda.connectors.AWSSQS.boundary.v1",
-  "description" : "Receive message from a queue",
+  "description" : "Receive messages from Amazon SQS.",
+  "metadata" : {
+    "keywords" : [ "receive message", "receive event", "receive message from queue", "receive event from queue" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound",
   "version" : 9,
   "category" : {
diff --git a/connectors/aws/aws-sqs/element-templates/aws-sqs-inbound-intermediate-connector.json b/connectors/aws/aws-sqs/element-templates/aws-sqs-inbound-intermediate-connector.json
index 455817c69a..868edfc930 100644
--- a/connectors/aws/aws-sqs/element-templates/aws-sqs-inbound-intermediate-connector.json
+++ b/connectors/aws/aws-sqs/element-templates/aws-sqs-inbound-intermediate-connector.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "Amazon SQS Intermediate Message Catch Event connector",
   "id" : "io.camunda.connectors.AWSSQS.intermediate.v1",
-  "description" : "Receive message from a queue",
+  "description" : "Receive messages from Amazon SQS.",
+  "metadata" : {
+    "keywords" : [ "receive message", "receive event", "receive message from queue", "receive event from queue" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound",
   "version" : 9,
   "category" : {
diff --git a/connectors/aws/aws-sqs/element-templates/aws-sqs-outbound-connector.json b/connectors/aws/aws-sqs/element-templates/aws-sqs-outbound-connector.json
index c57b1c41e4..1544edcc71 100644
--- a/connectors/aws/aws-sqs/element-templates/aws-sqs-outbound-connector.json
+++ b/connectors/aws/aws-sqs/element-templates/aws-sqs-outbound-connector.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "Amazon SQS Outbound Connector",
   "id" : "io.camunda.connectors.AWSSQS.v1",
-  "description" : "Send message to queue",
+  "description" : "Send messages to Amazon SQS.",
+  "metadata" : {
+    "keywords" : [ "send message", "publish message", "send message to queue", "publish message to queue" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=outbound",
   "version" : 10,
   "category" : {
diff --git a/connectors/aws/aws-sqs/element-templates/aws-sqs-start-message.json b/connectors/aws/aws-sqs/element-templates/aws-sqs-start-message.json
index 358f0d118d..3e2a83d124 100644
--- a/connectors/aws/aws-sqs/element-templates/aws-sqs-start-message.json
+++ b/connectors/aws/aws-sqs/element-templates/aws-sqs-start-message.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "Amazon SQS Message Start Event Connector",
   "id" : "io.camunda.connectors.AWSSQS.startmessage.v1",
-  "description" : "Receive message from a queue",
+  "description" : "Receive messages from Amazon SQS.",
+  "metadata" : {
+    "keywords" : [ "receive message", "receive event", "receive message from queue", "receive event from queue" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound",
   "version" : 9,
   "category" : {
diff --git a/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-outbound-connector-hybrid.json b/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-outbound-connector-hybrid.json
index 7198259ed1..7dd6e673cb 100644
--- a/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-outbound-connector-hybrid.json
+++ b/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-outbound-connector-hybrid.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "Hybrid Amazon SQS Outbound Connector",
   "id" : "io.camunda.connectors.AWSSQS.v1-hybrid",
-  "description" : "Send message to queue",
+  "description" : "Send messages to Amazon SQS.",
+  "metadata" : {
+    "keywords" : [ "send message", "publish message", "send message to queue", "publish message to queue" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=outbound",
   "version" : 10,
   "category" : {
diff --git a/connectors/aws/aws-textract/element-templates/aws-textract-outbound-connector.json b/connectors/aws/aws-textract/element-templates/aws-textract-outbound-connector.json
index 8d2fc60cb2..cd88e3d3bd 100644
--- a/connectors/aws/aws-textract/element-templates/aws-textract-outbound-connector.json
+++ b/connectors/aws/aws-textract/element-templates/aws-textract-outbound-connector.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "AWS Textract Outbound Connector",
   "id" : "io.camunda.connectors.AWSTEXTRACT.v1",
-  "description" : "Automatically extract printed text, handwriting, layout elements, and data from any document",
+  "description" : "Extract text and data using AWS Textract.",
+  "metadata" : {
+    "keywords" : [ "extract text", "extract data", "extract text from image", "extract data from image", "ocr" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/next/components/connectors/out-of-the-box-connectors/amazon-textract/",
   "version" : 1,
   "category" : {
diff --git a/connectors/aws/aws-textract/element-templates/hybrid/aws-textract-outbound-connector-hybrid.json b/connectors/aws/aws-textract/element-templates/hybrid/aws-textract-outbound-connector-hybrid.json
index ea059d0f1d..2fdaddb833 100644
--- a/connectors/aws/aws-textract/element-templates/hybrid/aws-textract-outbound-connector-hybrid.json
+++ b/connectors/aws/aws-textract/element-templates/hybrid/aws-textract-outbound-connector-hybrid.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "Hybrid AWS Textract Outbound Connector",
   "id" : "io.camunda.connectors.AWSTEXTRACT.v1-hybrid",
-  "description" : "Automatically extract printed text, handwriting, layout elements, and data from any document",
+  "description" : "Extract text and data using AWS Textract.",
+  "metadata" : {
+    "keywords" : [ "extract text", "extract data", "extract text from image", "extract data from image", "ocr" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/next/components/connectors/out-of-the-box-connectors/amazon-textract/",
   "version" : 1,
   "category" : {
diff --git a/connectors/email/element-templates/email-inbound-connector-boundary.json b/connectors/email/element-templates/email-inbound-connector-boundary.json
index 735e8b7fd6..e5f15ade9d 100644
--- a/connectors/email/element-templates/email-inbound-connector-boundary.json
+++ b/connectors/email/element-templates/email-inbound-connector-boundary.json
@@ -3,10 +3,8 @@
   "name" : "Email Boundary Event Connector",
   "id" : "io.camunda.connectors.inbound.EmailBoundary.v1",
   "description" : "Consume emails",
-  "metadata": {
-    "keywords": [
-      "email received"
-    ]
+  "metadata" : {
+    "keywords" : [ "email received" ]
   },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/email",
   "version" : 1,
diff --git a/connectors/email/element-templates/email-inbound-connector-intermediate.json b/connectors/email/element-templates/email-inbound-connector-intermediate.json
index dcd6e01319..2ce9775057 100644
--- a/connectors/email/element-templates/email-inbound-connector-intermediate.json
+++ b/connectors/email/element-templates/email-inbound-connector-intermediate.json
@@ -3,10 +3,8 @@
   "name" : "Email Intermediate Catch Event Connector",
   "id" : "io.camunda.connectors.inbound.EmailIntermediate.v1",
   "description" : "Consume emails",
-  "metadata": {
-    "keywords": [
-      "email received"
-    ]
+  "metadata" : {
+    "keywords" : [ "email received" ]
   },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/email",
   "version" : 1,
diff --git a/connectors/email/element-templates/email-message-start-event-connector.json b/connectors/email/element-templates/email-message-start-event-connector.json
index f15bb06b49..78a5664e44 100644
--- a/connectors/email/element-templates/email-message-start-event-connector.json
+++ b/connectors/email/element-templates/email-message-start-event-connector.json
@@ -3,10 +3,8 @@
   "name" : "Email Message Start Event Connector",
   "id" : "io.camunda.connectors.inbound.EmailMessageStart.v1",
   "description" : "Consume emails",
-  "metadata": {
-    "keywords": [
-      "email received"
-    ]
+  "metadata" : {
+    "keywords" : [ "email received" ]
   },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/email",
   "version" : 1,
diff --git a/connectors/email/element-templates/email-outbound-connector.json b/connectors/email/element-templates/email-outbound-connector.json
index 7820ca7397..f8fcb326c5 100644
--- a/connectors/email/element-templates/email-outbound-connector.json
+++ b/connectors/email/element-templates/email-outbound-connector.json
@@ -3,15 +3,8 @@
   "name" : "Email Connector",
   "id" : "io.camunda.connectors.email.v1",
   "description" : "Execute email requests",
-  "metadata": {
-    "keywords": [
-      "send emails",
-      "list emails",
-      "search emails",
-      "delete emails",
-      "read emails",
-      "move emails"
-    ]
+  "metadata" : {
+    "keywords" : [ "send emails", "list emails", "search emails", "delete emails", "read emails", "move emails" ]
   },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/email/",
   "version" : 2,
diff --git a/connectors/email/element-templates/hybrid/email-inbound-connector-boundary-hybrid.json b/connectors/email/element-templates/hybrid/email-inbound-connector-boundary-hybrid.json
index 40f164c384..02fb24f634 100644
--- a/connectors/email/element-templates/hybrid/email-inbound-connector-boundary-hybrid.json
+++ b/connectors/email/element-templates/hybrid/email-inbound-connector-boundary-hybrid.json
@@ -3,10 +3,8 @@
   "name" : "Hybrid Email Boundary Event Connector",
   "id" : "io.camunda.connectors.inbound.EmailBoundary.v1-hybrid",
   "description" : "Consume emails",
-  "metadata": {
-    "keywords": [
-      "email received"
-    ]
+  "metadata" : {
+    "keywords" : [ "email received" ]
   },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/email",
   "version" : 1,
diff --git a/connectors/email/element-templates/hybrid/email-inbound-connector-intermediate-hybrid.json b/connectors/email/element-templates/hybrid/email-inbound-connector-intermediate-hybrid.json
index ab07ed3fa8..1764093370 100644
--- a/connectors/email/element-templates/hybrid/email-inbound-connector-intermediate-hybrid.json
+++ b/connectors/email/element-templates/hybrid/email-inbound-connector-intermediate-hybrid.json
@@ -3,10 +3,8 @@
   "name" : "Hybrid Email Intermediate Catch Event Connector",
   "id" : "io.camunda.connectors.inbound.EmailIntermediate.v1-hybrid",
   "description" : "Consume emails",
-  "metadata": {
-    "keywords": [
-      "email received"
-    ]
+  "metadata" : {
+    "keywords" : [ "email received" ]
   },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/email",
   "version" : 1,
diff --git a/connectors/email/element-templates/hybrid/email-outbound-connector-hybrid.json b/connectors/email/element-templates/hybrid/email-outbound-connector-hybrid.json
index ea82625388..9c4dc39627 100644
--- a/connectors/email/element-templates/hybrid/email-outbound-connector-hybrid.json
+++ b/connectors/email/element-templates/hybrid/email-outbound-connector-hybrid.json
@@ -3,15 +3,8 @@
   "name" : "Hybrid Email Connector",
   "id" : "io.camunda.connectors.email.v1-hybrid",
   "description" : "Execute email requests",
-  "metadata": {
-    "keywords": [
-      "send emails",
-      "list emails",
-      "search emails",
-      "delete emails",
-      "read emails",
-      "move emails"
-    ]
+  "metadata" : {
+    "keywords" : [ "send emails", "list emails", "search emails", "delete emails", "read emails", "move emails" ]
   },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/email/",
   "version" : 2,
diff --git a/connectors/email/element-templates/hybrid/hybrid-email-message-start-event-connector-hybrid.json b/connectors/email/element-templates/hybrid/hybrid-email-message-start-event-connector-hybrid.json
index 0b22be99f9..586daa5c70 100644
--- a/connectors/email/element-templates/hybrid/hybrid-email-message-start-event-connector-hybrid.json
+++ b/connectors/email/element-templates/hybrid/hybrid-email-message-start-event-connector-hybrid.json
@@ -3,10 +3,8 @@
   "name" : "Hybrid Email Message Start Event Connector",
   "id" : "io.camunda.connectors.inbound.EmailMessageStart.v1-hybrid",
   "description" : "Consume emails",
-  "metadata": {
-    "keywords": [
-      "email received"
-    ]
+  "metadata" : {
+    "keywords" : [ "email received" ]
   },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/email",
   "version" : 1,
diff --git a/connectors/google/google-drive/element-templates/google-drive-outbound-connector.json b/connectors/google/google-drive/element-templates/google-drive-outbound-connector.json
index 63bbd58d63..3a9f07aa9a 100644
--- a/connectors/google/google-drive/element-templates/google-drive-outbound-connector.json
+++ b/connectors/google/google-drive/element-templates/google-drive-outbound-connector.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "Google Drive Outbound Connector",
   "id" : "io.camunda.connectors.GoogleDrive.v1",
-  "description" : "Create folder or a file from template",
+  "description" : "Manage Google Drive files and folders",
+  "metadata" : {
+    "keywords" : [ "create file", "create file from template", "create folder" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/googledrive/",
   "version" : 3,
   "category" : {
diff --git a/connectors/google/google-drive/element-templates/hybrid/google-drive-outbound-connector-hybrid.json b/connectors/google/google-drive/element-templates/hybrid/google-drive-outbound-connector-hybrid.json
index 7da6d1c12b..bb63c5a67a 100644
--- a/connectors/google/google-drive/element-templates/hybrid/google-drive-outbound-connector-hybrid.json
+++ b/connectors/google/google-drive/element-templates/hybrid/google-drive-outbound-connector-hybrid.json
@@ -2,7 +2,10 @@
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name" : "Hybrid Google Drive Outbound Connector",
   "id" : "io.camunda.connectors.GoogleDrive.v1-hybrid",
-  "description" : "Create folder or a file from template",
+  "description" : "Manage Google Drive files and folders",
+  "metadata" : {
+    "keywords" : [ "create file", "create file from template", "create folder" ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/googledrive/",
   "version" : 3,
   "category" : {
diff --git a/connectors/google/google-gemini/element-templates/google-gemini-outbound-connector.json b/connectors/google/google-gemini/element-templates/google-gemini-outbound-connector.json
index 4ff5d432e0..7456cc1331 100644
--- a/connectors/google/google-gemini/element-templates/google-gemini-outbound-connector.json
+++ b/connectors/google/google-gemini/element-templates/google-gemini-outbound-connector.json
@@ -3,6 +3,9 @@
   "name" : "Google Gemini Outbound Connector",
   "id" : "io.camunda.connectors.GoogleGemini.v1",
   "description" : " A large language model (LLM) created by Google AI. It's a multimodal model, meaning it can understand and work with different types of information like text, code, audio, images, and video",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/google-gemini/",
   "version" : 1,
   "category" : {
diff --git a/connectors/google/google-gemini/element-templates/hybrid/google-gemini-outbound-connector-hybrid.json b/connectors/google/google-gemini/element-templates/hybrid/google-gemini-outbound-connector-hybrid.json
index bde862ca35..bf3233e5dc 100644
--- a/connectors/google/google-gemini/element-templates/hybrid/google-gemini-outbound-connector-hybrid.json
+++ b/connectors/google/google-gemini/element-templates/hybrid/google-gemini-outbound-connector-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid Google Gemini Outbound Connector",
   "id" : "io.camunda.connectors.GoogleGemini.v1-hybrid",
   "description" : " A large language model (LLM) created by Google AI. It's a multimodal model, meaning it can understand and work with different types of information like text, code, audio, images, and video",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/google-gemini/",
   "version" : 1,
   "category" : {
diff --git a/connectors/google/google-sheets/element-templates/google-sheets-outbound-connector.json b/connectors/google/google-sheets/element-templates/google-sheets-outbound-connector.json
index 6c780a2300..c5b85eeb25 100644
--- a/connectors/google/google-sheets/element-templates/google-sheets-outbound-connector.json
+++ b/connectors/google/google-sheets/element-templates/google-sheets-outbound-connector.json
@@ -3,18 +3,8 @@
   "name" : "Google Sheets Outbound Connector",
   "id" : "io.camunda.connectors.GoogleSheets.v1",
   "description" : "Manage spreadsheets with Google Sheets",
-  "metadata": {
-    "keywords": [
-      "create spreadsheet",
-      "add values to spreadsheet",
-      "create row",
-      "create column",
-      "create worksheet",
-      "delete worksheet",
-      "get row",
-      "get spreadsheet details",
-      "get worksheet data"
-    ]
+  "metadata" : {
+    "keywords" : [ "create spreadsheet", "add values to spreadsheet", "create row", "create column", "create worksheet", "delete worksheet", "get row", "get spreadsheet details", "get worksheet data" ]
   },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/google-sheets/",
   "version" : 4,
diff --git a/connectors/google/google-sheets/element-templates/hybrid/google-sheets-outbound-connector-hybrid.json b/connectors/google/google-sheets/element-templates/hybrid/google-sheets-outbound-connector-hybrid.json
index 49fe14f85d..b005c24dbe 100644
--- a/connectors/google/google-sheets/element-templates/hybrid/google-sheets-outbound-connector-hybrid.json
+++ b/connectors/google/google-sheets/element-templates/hybrid/google-sheets-outbound-connector-hybrid.json
@@ -3,18 +3,8 @@
   "name" : "Hybrid Google Sheets Outbound Connector",
   "id" : "io.camunda.connectors.GoogleSheets.v1-hybrid",
   "description" : "Manage spreadsheets with Google Sheets",
-  "metadata": {
-    "keywords": [
-      "create spreadsheet",
-      "add values to spreadsheet",
-      "create row",
-      "create column",
-      "create worksheet",
-      "delete worksheet",
-      "get row",
-      "get spreadsheet details",
-      "get worksheet data"
-    ]
+  "metadata" : {
+    "keywords" : [ "create spreadsheet", "add values to spreadsheet", "create row", "create column", "create worksheet", "delete worksheet", "get row", "get spreadsheet details", "get worksheet data" ]
   },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/google-sheets/",
   "version" : 4,
diff --git a/connectors/http/graphql/element-templates/graphql-outbound-connector.json b/connectors/http/graphql/element-templates/graphql-outbound-connector.json
index f671d03d3a..e7ef2f39f5 100644
--- a/connectors/http/graphql/element-templates/graphql-outbound-connector.json
+++ b/connectors/http/graphql/element-templates/graphql-outbound-connector.json
@@ -3,6 +3,9 @@
   "name" : "GraphQL Outbound Connector",
   "id" : "io.camunda.connectors.GraphQL.v1",
   "description" : "Execute GraphQL query",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/protocol/graphql/",
   "version" : 6,
   "category" : {
diff --git a/connectors/http/graphql/element-templates/hybrid/graphql-outbound-connector-hybrid.json b/connectors/http/graphql/element-templates/hybrid/graphql-outbound-connector-hybrid.json
index b8fef12e1a..057eae837e 100644
--- a/connectors/http/graphql/element-templates/hybrid/graphql-outbound-connector-hybrid.json
+++ b/connectors/http/graphql/element-templates/hybrid/graphql-outbound-connector-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid GraphQL Outbound Connector",
   "id" : "io.camunda.connectors.GraphQL.v1-hybrid",
   "description" : "Execute GraphQL query",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/protocol/graphql/",
   "version" : 6,
   "category" : {
diff --git a/connectors/http/rest/README.md b/connectors/http/rest/README.md
index 542b3ae280..00393ca7f4 100644
--- a/connectors/http/rest/README.md
+++ b/connectors/http/rest/README.md
@@ -1,13 +1,9 @@
 ![REST Outbound Connector connector icon](data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTgiIGhlaWdodD0iMTgiIHZpZXdCb3g9IjAgMCAxOCAxOCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTE3LjAzMzUgOC45OTk5N0MxNy4wMzM1IDEzLjQ0NzUgMTMuNDI4MSAxNy4wNTI5IDguOTgwNjUgMTcuMDUyOUM0LjUzMzE2IDE3LjA1MjkgMC45Mjc3NjUgMTMuNDQ3NSAwLjkyNzc2NSA4Ljk5OTk3QzAuOTI3NzY1IDQuNTUyNDggNC41MzMxNiAwLjk0NzA4MyA4Ljk4MDY1IDAuOTQ3MDgzQzEzLjQyODEgMC45NDcwODMgMTcuMDMzNSA0LjU1MjQ4IDE3LjAzMzUgOC45OTk5N1oiIGZpbGw9IiM1MDU1NjIiLz4KPHBhdGggZD0iTTQuOTMxMjYgMTQuMTU3MUw2Ljc4MTA2IDMuNzE0NzFIMTAuMTM3NUMxMS4xOTE3IDMuNzE0NzEgMTEuOTgyNCAzLjk4MzIzIDEyLjUwOTUgNC41MjAyN0MxMy4wNDY1IDUuMDQ3MzYgMTMuMzE1IDUuNzMzNTggMTMuMzE1IDYuNTc4OTJDMTMuMzE1IDcuNDQ0MTQgMTMuMDcxNCA4LjE1NTIyIDEyLjU4NDEgOC43MTIxNUMxMi4xMDY3IDkuMjU5MTMgMTEuNDU1MyA5LjYzNzA1IDEwLjYyOTggOS44NDU5TDEyLjA2MTkgMTQuMTU3MUgxMC4zMzE1TDkuMDMzNjQgMTAuMDI0OUg3LjI0MzUxTDYuNTEyNTQgMTQuMTU3MUg0LjkzMTI2Wk03LjQ5NzExIDguNTkyODFIOS4yNDI0OEM5Ljk5ODMyIDguNTkyODEgMTAuNTkwMSA4LjQyMzc0IDExLjAxNzcgOC4wODU2MUMxMS40NTUzIDcuNzM3NTMgMTEuNjc0MSA3LjI2NTEzIDExLjY3NDEgNi42Njg0MkMxMS42NzQxIDYuMTkxMDYgMTEuNTI0OSA1LjgxODExIDExLjIyNjUgNS41NDk1OUMxMC45MjgyIDUuMjcxMTMgMTAuNDU1OCA1LjEzMTkgOS44MDkzNiA1LjEzMTlIOC4xMDg3NEw3LjQ5NzExIDguNTkyODFaIiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)
-
 # REST Outbound Connector
-
 Invoke REST API
-
 # Camunda HTTP JSON Connector
 
-Find the user documentation in
-our [Camunda](https://docs.camunda.io/docs/components/connectors/protocol/rest/).
+Find the user documentation in our [Camunda](https://docs.camunda.io/docs/components/connectors/protocol/rest/).
 
 ## Build
 
@@ -120,13 +116,13 @@ The response will contain the status code, the headers and the body of the respo
   "method": "post",
   "url": "https://youroauthclientdomainname.eu.auth0.com/oauth/token",
   "authentication": {
-    "oauthTokenEndpoint": "{{secrets.OAUTH_TOKEN_ENDPOINT_KEY}}",
+    "oauthTokenEndpoint":"{{secrets.OAUTH_TOKEN_ENDPOINT_KEY}}",
     "scopes": "read:clients read:users",
-    "audience": "{{secrets.AUDIENCE_KEY}}",
-    "clientId": "{{secrets.CLIENT_ID_KEY}}",
-    "clientSecret": "{{secrets.CLIENT_SECRET_KEY}}",
+    "audience":"{{secrets.AUDIENCE_KEY}}",
+    "clientId":"{{secrets.CLIENT_ID_KEY}}",
+    "clientSecret":"{{secrets.CLIENT_SECRET_KEY}}",
     "type": "oauth-client-credentials-flow",
-    "clientAuthentication": "{{secrets.CLIENT_AUTHENTICATION_KEY}}"
+    "clientAuthentication":"{{secrets.CLIENT_AUTHENTICATION_KEY}}"
   }
 }
 ```
@@ -135,24 +131,21 @@ The response will contain the status code, the headers and the body of the respo
 
 ```json
 {
-  "access_token": "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IlUtN2N6WG1sMzljUFNfUnlQQkNMWCJ9.kjhwfjkhfejkrhfbwjkfbhetcetc",
-  "scope": "read:clients create:users",
-  "expires_in": 86400,
-  "token_type": "Bearer"
+  "access_token":"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IlUtN2N6WG1sMzljUFNfUnlQQkNMWCJ9.kjhwfjkhfejkrhfbwjkfbhetcetc",
+  "scope":"read:clients create:users",
+  "expires_in":86400,
+  "token_type":"Bearer"
 }
 ```
-
 ### Error codes
 
-The Connector will fail on any non-2XX HTTP status code in the response. This error status code will be passed on as
-error code, e.g. "404".
+The Connector will fail on any non-2XX HTTP status code in the response. This error status code will be passed on as error code, e.g. "404".
 
 ## :lock: Use proxy-mechanism
 
 > :warning: Proxy mode is currently only supported in Camunda 8 SaaS environment.
 
-You can configure the HTTP JSON Connector to do any outgoing HTTP call via a proxy. This proxy should be effectively
-also an HTTP JSON Connector
+You can configure the HTTP JSON Connector to do any outgoing HTTP call via a proxy. This proxy should be effectively also an HTTP JSON Connector
 running in a different environment.
 
 For example, you can build the following runtime architecture:
@@ -162,12 +155,10 @@ For example, you can build the following runtime architecture:
  [ Camunda Network, e.g. K8S                      ]  [ Separate network, e.g. Google Function ]
 ```
 
-Now, any call via the Http Connector will be just forwarded to a specified hardcoded URL. And this proxy does the real
-call then.
+Now, any call via the Http Connector will be just forwarded to a specified hardcoded URL. And this proxy does the real call then.
 This avoids that you could reach internal endpoints in your Camunda network (e.g. the current Kubernetes cluster).
 
-Just set the following property to enable proxy mode for the connector, e.g. in application.properties when using the
-Spring-based runtime:
+Just set the following property to enable proxy mode for the connector, e.g. in application.properties when using the Spring-based runtime:
 
 ```properties
 camunda.connector.http.proxy.url=https://someUrl/
@@ -187,8 +178,7 @@ GOOGLE_APPLICATION_CREDENTIALS=...
 
 ### :lock: Test the Connector locally with Google Cloud Function as a proxy
 
-Run the [:lock:connector-proxy-saas](https://github.com/camunda/connector-proxy-saas) project locally as described in
-its [:lock:README](https://github.com/camunda/connector-proxy-saas#usage).
+Run the [:lock:connector-proxy-saas](https://github.com/camunda/connector-proxy-saas) project locally as described in its [:lock:README](https://github.com/camunda/connector-proxy-saas#usage).
 
 Set the specific property or environment variable to enable proxy mode as described above.
 
@@ -200,53 +190,48 @@ The generic HTTP JSON Connector element template can be found in
 the [element-templates/http-json-connector.json](element-templates/http-json-connector.json) file.
 
 Additional Connector templates based on the HTTP JSON Connector:
-
 - [Automation Anywhere Connector](../automation-anywhere)
 - [Blue Prism Connector](../blue-prism)
 - [UiPath Connector](../uipath)
 
-## Properties
 
+## Properties
 | Name   | Type     | Required | Description | Example        |
-|--------|----------|----------|-------------|----------------|
+| ------ | -------- | -------- | ----------- | -------------- |
 | Method | Dropdown | Yes      |             | ```{ }```      |
 | URL    | String   | Yes      |             | ```"string"``` |
-
 ## Result
-
 The following json structure will be returned by the Connector and can be
 used in the result expression.
 
 ```json
 {
-  "body": {
-    "order": {
-      "id": "123",
-      "total": "100.00€"
+  "body" : {
+    "order" : {
+      "id" : "123",
+      "total" : "100.00€"
     }
   },
-  "headers": {
-    "Content-Type": "application/json"
+  "headers" : {
+    "Content-Type" : "application/json"
   },
-  "status": 200
+  "status" : 200
 }
 ```
 
 The body can be accessed via FEEL:
-
 ```json
 = body.order.id
 ```
-
 leading to the following result
-
 ```json
 "123"
 ```
 
-| Connector Info          |                        |
-|-------------------------|------------------------|
-| Type                    | io.camunda:http-json:1 |
-| Version                 | 8                      |
-| Supported element types |                        |
+
+| Connector Info            |                                                                       |
+| ---                       | ---                                                                   |
+| Type                      | io.camunda:http-json:1                                                            |
+| Version                   | 8                                                         |
+| Supported element types   |     |
 
diff --git a/connectors/http/rest/element-templates/http-json-connector.json b/connectors/http/rest/element-templates/http-json-connector.json
index a9d6bb8a27..e368b87207 100644
--- a/connectors/http/rest/element-templates/http-json-connector.json
+++ b/connectors/http/rest/element-templates/http-json-connector.json
@@ -3,6 +3,9 @@
   "name" : "REST Outbound Connector",
   "id" : "io.camunda.connectors.HttpJson.v2",
   "description" : "Invoke REST API",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/protocol/rest/",
   "version" : 8,
   "category" : {
diff --git a/connectors/http/rest/element-templates/hybrid/http-json-connector-hybrid.json b/connectors/http/rest/element-templates/hybrid/http-json-connector-hybrid.json
index f8aec3c510..3e8c91c1bd 100644
--- a/connectors/http/rest/element-templates/hybrid/http-json-connector-hybrid.json
+++ b/connectors/http/rest/element-templates/hybrid/http-json-connector-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid REST Outbound Connector",
   "id" : "io.camunda.connectors.HttpJson.v2-hybrid",
   "description" : "Invoke REST API",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/protocol/rest/",
   "version" : 8,
   "category" : {
diff --git a/connectors/idp-extraction/element-templates/hybrid/hybrid-idp-extraction-outbound-connector-hybrid.json b/connectors/idp-extraction/element-templates/hybrid/hybrid-idp-extraction-outbound-connector-hybrid.json
index 7f4a58f05b..59add31cad 100644
--- a/connectors/idp-extraction/element-templates/hybrid/hybrid-idp-extraction-outbound-connector-hybrid.json
+++ b/connectors/idp-extraction/element-templates/hybrid/hybrid-idp-extraction-outbound-connector-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid IDP extraction outbound Connector",
   "id" : "io.camunda.connector.IdpExtractionOutBoundTemplate.v1-hybrid",
   "description" : "Execute IDP extraction requests",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/guides/",
   "version" : 1,
   "category" : {
diff --git a/connectors/idp-extraction/element-templates/idp-extraction-outbound-connector.json b/connectors/idp-extraction/element-templates/idp-extraction-outbound-connector.json
index 5731dd04e7..5e10d1a3ed 100644
--- a/connectors/idp-extraction/element-templates/idp-extraction-outbound-connector.json
+++ b/connectors/idp-extraction/element-templates/idp-extraction-outbound-connector.json
@@ -3,6 +3,9 @@
   "name" : "IDP extraction outbound Connector",
   "id" : "io.camunda.connector.IdpExtractionOutBoundTemplate.v1",
   "description" : "Execute IDP extraction requests",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/guides/",
   "version" : 1,
   "category" : {
diff --git a/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-boundary-hybrid.json b/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-boundary-hybrid.json
index dc1ad1fed9..f7de9d1d9c 100644
--- a/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-boundary-hybrid.json
+++ b/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-boundary-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid Kafka Boundary Event Connector",
   "id" : "io.camunda.connectors.inbound.KafkaBoundary.v1-hybrid",
   "description" : "Consume Kafka messages",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/kafka/?kafka=inbound",
   "version" : 6,
   "category" : {
diff --git a/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-intermediate-hybrid.json b/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-intermediate-hybrid.json
index 2f3316a548..7d4b2f3f40 100644
--- a/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-intermediate-hybrid.json
+++ b/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-intermediate-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid Kafka Intermediate Catch Event Connector",
   "id" : "io.camunda.connectors.inbound.KafkaIntermediate.v1-hybrid",
   "description" : "Consume Kafka messages",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/kafka/?kafka=inbound",
   "version" : 6,
   "category" : {
diff --git a/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-start-message-hybrid.json b/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-start-message-hybrid.json
index bc9b57ab31..ebbb68ab6a 100644
--- a/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-start-message-hybrid.json
+++ b/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-start-message-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid Kafka Message Start Event Connector",
   "id" : "io.camunda.connectors.inbound.KafkaMessageStart.v1-hybrid",
   "description" : "Consume Kafka messages",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/kafka/?kafka=inbound",
   "version" : 6,
   "category" : {
diff --git a/connectors/kafka/element-templates/hybrid/kafka-outbound-connector-hybrid.json b/connectors/kafka/element-templates/hybrid/kafka-outbound-connector-hybrid.json
index 1a32246935..5f7dec12c9 100644
--- a/connectors/kafka/element-templates/hybrid/kafka-outbound-connector-hybrid.json
+++ b/connectors/kafka/element-templates/hybrid/kafka-outbound-connector-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid Kafka Outbound Connector",
   "id" : "io.camunda.connectors.KAFKA.v1-hybrid",
   "description" : "Produce Kafka message",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/kafka/?kafka=outbound",
   "version" : 5,
   "category" : {
diff --git a/connectors/kafka/element-templates/kafka-inbound-connector-boundary.json b/connectors/kafka/element-templates/kafka-inbound-connector-boundary.json
index 175c92201c..6689bc1e1f 100644
--- a/connectors/kafka/element-templates/kafka-inbound-connector-boundary.json
+++ b/connectors/kafka/element-templates/kafka-inbound-connector-boundary.json
@@ -3,6 +3,9 @@
   "name" : "Kafka Boundary Event Connector",
   "id" : "io.camunda.connectors.inbound.KafkaBoundary.v1",
   "description" : "Consume Kafka messages",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/kafka/?kafka=inbound",
   "version" : 6,
   "category" : {
diff --git a/connectors/kafka/element-templates/kafka-inbound-connector-intermediate.json b/connectors/kafka/element-templates/kafka-inbound-connector-intermediate.json
index df029aaa49..e559d435a4 100644
--- a/connectors/kafka/element-templates/kafka-inbound-connector-intermediate.json
+++ b/connectors/kafka/element-templates/kafka-inbound-connector-intermediate.json
@@ -3,6 +3,9 @@
   "name" : "Kafka Intermediate Catch Event Connector",
   "id" : "io.camunda.connectors.inbound.KafkaIntermediate.v1",
   "description" : "Consume Kafka messages",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/kafka/?kafka=inbound",
   "version" : 6,
   "category" : {
diff --git a/connectors/kafka/element-templates/kafka-inbound-connector-start-message.json b/connectors/kafka/element-templates/kafka-inbound-connector-start-message.json
index 59387cc645..4d5d57cdcf 100644
--- a/connectors/kafka/element-templates/kafka-inbound-connector-start-message.json
+++ b/connectors/kafka/element-templates/kafka-inbound-connector-start-message.json
@@ -3,6 +3,9 @@
   "name" : "Kafka Message Start Event Connector",
   "id" : "io.camunda.connectors.inbound.KafkaMessageStart.v1",
   "description" : "Consume Kafka messages",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/kafka/?kafka=inbound",
   "version" : 6,
   "category" : {
diff --git a/connectors/kafka/element-templates/kafka-outbound-connector.json b/connectors/kafka/element-templates/kafka-outbound-connector.json
index 09d9948fd2..ec5b72d679 100644
--- a/connectors/kafka/element-templates/kafka-outbound-connector.json
+++ b/connectors/kafka/element-templates/kafka-outbound-connector.json
@@ -3,6 +3,9 @@
   "name" : "Kafka Outbound Connector",
   "id" : "io.camunda.connectors.KAFKA.v1",
   "description" : "Produce Kafka message",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/kafka/?kafka=outbound",
   "version" : 5,
   "category" : {
diff --git a/connectors/microsoft-teams/element-templates/hybrid/microsoft-teams-outbound-connector-hybrid.json b/connectors/microsoft-teams/element-templates/hybrid/microsoft-teams-outbound-connector-hybrid.json
index 6b050cad57..1276da59bd 100644
--- a/connectors/microsoft-teams/element-templates/hybrid/microsoft-teams-outbound-connector-hybrid.json
+++ b/connectors/microsoft-teams/element-templates/hybrid/microsoft-teams-outbound-connector-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid Microsoft Teams Outbound Connector",
   "id" : "io.camunda.connectors.MSTeams.v1-hybrid",
   "description" : "Create, update, and send a message to your Microsoft Teams",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/microsoft-teams/",
   "version" : 3,
   "category" : {
diff --git a/connectors/microsoft-teams/element-templates/microsoft-teams-outbound-connector.json b/connectors/microsoft-teams/element-templates/microsoft-teams-outbound-connector.json
index 93e53ae374..5534ce9b66 100644
--- a/connectors/microsoft-teams/element-templates/microsoft-teams-outbound-connector.json
+++ b/connectors/microsoft-teams/element-templates/microsoft-teams-outbound-connector.json
@@ -3,6 +3,9 @@
   "name" : "Microsoft Teams Outbound Connector",
   "id" : "io.camunda.connectors.MSTeams.v1",
   "description" : "Create, update, and send a message to your Microsoft Teams",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/microsoft-teams/",
   "version" : 3,
   "category" : {
diff --git a/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-boundary-hybrid.json b/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-boundary-hybrid.json
index 4a0effc08c..1f4c3fc116 100644
--- a/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-boundary-hybrid.json
+++ b/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-boundary-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid RabbitMQ Boundary Event Connector",
   "id" : "io.camunda.connectors.inbound.RabbitMQ.Boundary.v1-hybrid",
   "description" : "Receive a message from RabbitMQ",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound",
   "version" : 7,
   "category" : {
diff --git a/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-intermediate-hybrid.json b/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-intermediate-hybrid.json
index 54e6ab8eac..b63737cdee 100644
--- a/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-intermediate-hybrid.json
+++ b/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-intermediate-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid RabbitMQ Intermediate Catch Event Connector",
   "id" : "io.camunda.connectors.inbound.RabbitMQ.Intermediate.v1-hybrid",
   "description" : "Receive a message from RabbitMQ",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound",
   "version" : 7,
   "category" : {
diff --git a/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-message-start-hybrid.json b/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-message-start-hybrid.json
index bcf4e08c73..dbb80c1a4e 100644
--- a/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-message-start-hybrid.json
+++ b/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-message-start-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid RabbitMQ Message Start Event Connector",
   "id" : "io.camunda.connectors.inbound.RabbitMQ.MessageStart.v1-hybrid",
   "description" : "Receive a message from RabbitMQ",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound",
   "version" : 7,
   "category" : {
diff --git a/connectors/rabbitmq/element-templates/hybrid/rabbitmq-outbound-connector-hybrid.json b/connectors/rabbitmq/element-templates/hybrid/rabbitmq-outbound-connector-hybrid.json
index 725105259d..2068816a5f 100644
--- a/connectors/rabbitmq/element-templates/hybrid/rabbitmq-outbound-connector-hybrid.json
+++ b/connectors/rabbitmq/element-templates/hybrid/rabbitmq-outbound-connector-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid RabbitMQ Outbound Connector",
   "id" : "io.camunda.connectors.RabbitMQ.v1-hybrid",
   "description" : "Send message to RabbitMQ",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound",
   "version" : 5,
   "category" : {
diff --git a/connectors/rabbitmq/element-templates/rabbitmq-inbound-connector-boundary.json b/connectors/rabbitmq/element-templates/rabbitmq-inbound-connector-boundary.json
index c11fa8fcaf..d68ae1bcfa 100644
--- a/connectors/rabbitmq/element-templates/rabbitmq-inbound-connector-boundary.json
+++ b/connectors/rabbitmq/element-templates/rabbitmq-inbound-connector-boundary.json
@@ -3,6 +3,9 @@
   "name" : "RabbitMQ Boundary Event Connector",
   "id" : "io.camunda.connectors.inbound.RabbitMQ.Boundary.v1",
   "description" : "Receive a message from RabbitMQ",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound",
   "version" : 7,
   "category" : {
diff --git a/connectors/rabbitmq/element-templates/rabbitmq-inbound-connector-intermediate.json b/connectors/rabbitmq/element-templates/rabbitmq-inbound-connector-intermediate.json
index 0f0ec9a166..e4beca4195 100644
--- a/connectors/rabbitmq/element-templates/rabbitmq-inbound-connector-intermediate.json
+++ b/connectors/rabbitmq/element-templates/rabbitmq-inbound-connector-intermediate.json
@@ -3,6 +3,9 @@
   "name" : "RabbitMQ Intermediate Catch Event Connector",
   "id" : "io.camunda.connectors.inbound.RabbitMQ.Intermediate.v1",
   "description" : "Receive a message from RabbitMQ",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound",
   "version" : 7,
   "category" : {
diff --git a/connectors/rabbitmq/element-templates/rabbitmq-inbound-connector-message-start.json b/connectors/rabbitmq/element-templates/rabbitmq-inbound-connector-message-start.json
index 15c7d9e276..8c5c8b9ff4 100644
--- a/connectors/rabbitmq/element-templates/rabbitmq-inbound-connector-message-start.json
+++ b/connectors/rabbitmq/element-templates/rabbitmq-inbound-connector-message-start.json
@@ -3,6 +3,9 @@
   "name" : "RabbitMQ Message Start Event Connector",
   "id" : "io.camunda.connectors.inbound.RabbitMQ.MessageStart.v1",
   "description" : "Receive a message from RabbitMQ",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound",
   "version" : 7,
   "category" : {
diff --git a/connectors/rabbitmq/element-templates/rabbitmq-outbound-connector.json b/connectors/rabbitmq/element-templates/rabbitmq-outbound-connector.json
index bf17a54302..f0b5d89378 100644
--- a/connectors/rabbitmq/element-templates/rabbitmq-outbound-connector.json
+++ b/connectors/rabbitmq/element-templates/rabbitmq-outbound-connector.json
@@ -3,6 +3,9 @@
   "name" : "RabbitMQ Outbound Connector",
   "id" : "io.camunda.connectors.RabbitMQ.v1",
   "description" : "Send message to RabbitMQ",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound",
   "version" : 5,
   "category" : {
diff --git a/connectors/sendgrid/element-templates/hybrid/sendgrid-outbound-connector-hybrid.json b/connectors/sendgrid/element-templates/hybrid/sendgrid-outbound-connector-hybrid.json
index 7db784018f..5c8f590aa3 100644
--- a/connectors/sendgrid/element-templates/hybrid/sendgrid-outbound-connector-hybrid.json
+++ b/connectors/sendgrid/element-templates/hybrid/sendgrid-outbound-connector-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid SendGrid Outbound Connector",
   "id" : "io.camunda.connectors.SendGrid.v2-hybrid",
   "description" : "Send an email via SendGrid",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/sendgrid/",
   "version" : 3,
   "category" : {
diff --git a/connectors/sendgrid/element-templates/sendgrid-outbound-connector.json b/connectors/sendgrid/element-templates/sendgrid-outbound-connector.json
index 7cbc521237..7bf0a23d5d 100644
--- a/connectors/sendgrid/element-templates/sendgrid-outbound-connector.json
+++ b/connectors/sendgrid/element-templates/sendgrid-outbound-connector.json
@@ -3,6 +3,9 @@
   "name" : "SendGrid Outbound Connector",
   "id" : "io.camunda.connectors.SendGrid.v2",
   "description" : "Send an email via SendGrid",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/sendgrid/",
   "version" : 3,
   "category" : {
diff --git a/connectors/slack/element-templates/hybrid/slack-inbound-boundary-hybrid.json b/connectors/slack/element-templates/hybrid/slack-inbound-boundary-hybrid.json
index 75c21b57bd..654f82d285 100644
--- a/connectors/slack/element-templates/hybrid/slack-inbound-boundary-hybrid.json
+++ b/connectors/slack/element-templates/hybrid/slack-inbound-boundary-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid Slack Webhook Boundary Event Connector",
   "id" : "io.camunda.connectors.inbound.Slack.BoundaryEvent.v1-hybrid",
   "description" : "Receive events from Slack",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/slack/?slack=inbound",
   "version" : 5,
   "category" : {
diff --git a/connectors/slack/element-templates/hybrid/slack-inbound-intermediate-hybrid.json b/connectors/slack/element-templates/hybrid/slack-inbound-intermediate-hybrid.json
index 7759f864bc..834fa8ba6d 100644
--- a/connectors/slack/element-templates/hybrid/slack-inbound-intermediate-hybrid.json
+++ b/connectors/slack/element-templates/hybrid/slack-inbound-intermediate-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid Slack Webhook Intermediate Catch Event Connector",
   "id" : "io.camunda.connectors.inbound.Slack.IntermediateCatchEvent.v1-hybrid",
   "description" : "Receive events from Slack",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/slack/?slack=inbound",
   "version" : 5,
   "category" : {
diff --git a/connectors/slack/element-templates/hybrid/slack-inbound-message-start-hybrid.json b/connectors/slack/element-templates/hybrid/slack-inbound-message-start-hybrid.json
index 9e480117d6..51b5eb2605 100644
--- a/connectors/slack/element-templates/hybrid/slack-inbound-message-start-hybrid.json
+++ b/connectors/slack/element-templates/hybrid/slack-inbound-message-start-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid Slack Webhook Message Start Event Connector",
   "id" : "io.camunda.connectors.inbound.Slack.MessageStartEvent.v1-hybrid",
   "description" : "Receive events from Slack",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/slack/?slack=inbound",
   "version" : 5,
   "category" : {
diff --git a/connectors/slack/element-templates/hybrid/slack-inbound-start-event-hybrid.json b/connectors/slack/element-templates/hybrid/slack-inbound-start-event-hybrid.json
index 1b327bffbf..a781b7cbd4 100644
--- a/connectors/slack/element-templates/hybrid/slack-inbound-start-event-hybrid.json
+++ b/connectors/slack/element-templates/hybrid/slack-inbound-start-event-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid Slack Webhook Start Event Connector",
   "id" : "io.camunda.connectors.inbound.Slack.StartEvent.v1-hybrid",
   "description" : "Receive events from Slack",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/slack/?slack=inbound",
   "version" : 5,
   "category" : {
diff --git a/connectors/slack/element-templates/hybrid/slack-outbound-connector-hybrid.json b/connectors/slack/element-templates/hybrid/slack-outbound-connector-hybrid.json
index d8a418bf86..187dcfddec 100644
--- a/connectors/slack/element-templates/hybrid/slack-outbound-connector-hybrid.json
+++ b/connectors/slack/element-templates/hybrid/slack-outbound-connector-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid Slack Outbound Connector",
   "id" : "io.camunda.connectors.Slack.v1-hybrid",
   "description" : "Create a channel or send a message to a channel or user",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/slack/?slack=outbound",
   "version" : 5,
   "category" : {
diff --git a/connectors/slack/element-templates/slack-inbound-boundary.json b/connectors/slack/element-templates/slack-inbound-boundary.json
index 78bd173991..78b589d32e 100644
--- a/connectors/slack/element-templates/slack-inbound-boundary.json
+++ b/connectors/slack/element-templates/slack-inbound-boundary.json
@@ -3,6 +3,9 @@
   "name" : "Slack Webhook Boundary Event Connector",
   "id" : "io.camunda.connectors.inbound.Slack.BoundaryEvent.v1",
   "description" : "Receive events from Slack",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/slack/?slack=inbound",
   "version" : 5,
   "category" : {
diff --git a/connectors/slack/element-templates/slack-inbound-intermediate.json b/connectors/slack/element-templates/slack-inbound-intermediate.json
index a75e0688bb..c29cda4d23 100644
--- a/connectors/slack/element-templates/slack-inbound-intermediate.json
+++ b/connectors/slack/element-templates/slack-inbound-intermediate.json
@@ -3,6 +3,9 @@
   "name" : "Slack Webhook Intermediate Catch Event Connector",
   "id" : "io.camunda.connectors.inbound.Slack.IntermediateCatchEvent.v1",
   "description" : "Receive events from Slack",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/slack/?slack=inbound",
   "version" : 5,
   "category" : {
diff --git a/connectors/slack/element-templates/slack-inbound-message-start.json b/connectors/slack/element-templates/slack-inbound-message-start.json
index 9483c8c62e..d92f6a0ee9 100644
--- a/connectors/slack/element-templates/slack-inbound-message-start.json
+++ b/connectors/slack/element-templates/slack-inbound-message-start.json
@@ -3,6 +3,9 @@
   "name" : "Slack Webhook Message Start Event Connector",
   "id" : "io.camunda.connectors.inbound.Slack.MessageStartEvent.v1",
   "description" : "Receive events from Slack",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/slack/?slack=inbound",
   "version" : 5,
   "category" : {
diff --git a/connectors/slack/element-templates/slack-inbound-start-event.json b/connectors/slack/element-templates/slack-inbound-start-event.json
index 38ca7f76c4..927ae23695 100644
--- a/connectors/slack/element-templates/slack-inbound-start-event.json
+++ b/connectors/slack/element-templates/slack-inbound-start-event.json
@@ -3,6 +3,9 @@
   "name" : "Slack Webhook Start Event Connector",
   "id" : "io.camunda.connectors.inbound.Slack.StartEvent.v1",
   "description" : "Receive events from Slack",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/slack/?slack=inbound",
   "version" : 5,
   "category" : {
diff --git a/connectors/slack/element-templates/slack-outbound-connector.json b/connectors/slack/element-templates/slack-outbound-connector.json
index 9d99e5b1d7..98d08e412b 100644
--- a/connectors/slack/element-templates/slack-outbound-connector.json
+++ b/connectors/slack/element-templates/slack-outbound-connector.json
@@ -3,6 +3,9 @@
   "name" : "Slack Outbound Connector",
   "id" : "io.camunda.connectors.Slack.v1",
   "description" : "Create a channel or send a message to a channel or user",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/slack/?slack=outbound",
   "version" : 5,
   "category" : {
diff --git a/connectors/soap/element-templates/hybrid/soap-outbound-connector-hybrid.json b/connectors/soap/element-templates/hybrid/soap-outbound-connector-hybrid.json
index 7aa5645321..ce1e7b2d9f 100644
--- a/connectors/soap/element-templates/hybrid/soap-outbound-connector-hybrid.json
+++ b/connectors/soap/element-templates/hybrid/soap-outbound-connector-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid SOAP Connector",
   "id" : "io.camunda:soap-hybrid",
   "description" : "A Connector to execute a SOAP request",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/protocol/soap/",
   "version" : 1,
   "category" : {
@@ -74,14 +77,77 @@
     },
     "type" : "Dropdown",
     "choices" : [ {
-      "name" : "WSS signature",
-      "value" : "signature"
-    }, {
       "name" : "None",
       "value" : "none"
     }, {
       "name" : "WSS username token",
       "value" : "usernameToken"
+    }, {
+      "name" : "WSS signature",
+      "value" : "signature"
+    } ]
+  }, {
+    "id" : "authentication.username",
+    "label" : "Username",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.username",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.authentication",
+      "equals" : "usernameToken",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.password",
+    "label" : "Password",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.password",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.authentication",
+      "equals" : "usernameToken",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.encoded",
+    "label" : "Encoded",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.encoded",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.authentication",
+      "equals" : "usernameToken",
+      "type" : "simple"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "No",
+      "value" : "No"
+    }, {
+      "name" : "Yes",
+      "value" : "Yes"
     } ]
   }, {
     "id" : "authentication.certificate.certificateType",
@@ -360,69 +426,6 @@
       "type" : "simple"
     },
     "type" : "String"
-  }, {
-    "id" : "authentication.username",
-    "label" : "Username",
-    "optional" : false,
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "feel" : "optional",
-    "group" : "authentication",
-    "binding" : {
-      "name" : "authentication.username",
-      "type" : "zeebe:input"
-    },
-    "condition" : {
-      "property" : "authentication.authentication",
-      "equals" : "usernameToken",
-      "type" : "simple"
-    },
-    "type" : "String"
-  }, {
-    "id" : "authentication.password",
-    "label" : "Password",
-    "optional" : false,
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "feel" : "optional",
-    "group" : "authentication",
-    "binding" : {
-      "name" : "authentication.password",
-      "type" : "zeebe:input"
-    },
-    "condition" : {
-      "property" : "authentication.authentication",
-      "equals" : "usernameToken",
-      "type" : "simple"
-    },
-    "type" : "String"
-  }, {
-    "id" : "authentication.encoded",
-    "label" : "Encoded",
-    "optional" : false,
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "group" : "authentication",
-    "binding" : {
-      "name" : "authentication.encoded",
-      "type" : "zeebe:input"
-    },
-    "condition" : {
-      "property" : "authentication.authentication",
-      "equals" : "usernameToken",
-      "type" : "simple"
-    },
-    "type" : "Dropdown",
-    "choices" : [ {
-      "name" : "No",
-      "value" : "No"
-    }, {
-      "name" : "Yes",
-      "value" : "Yes"
-    } ]
   }, {
     "id" : "soapVersion.version",
     "label" : "SOAP version",
diff --git a/connectors/soap/element-templates/soap-outbound-connector.json b/connectors/soap/element-templates/soap-outbound-connector.json
index b8e2ab1b32..2c63405952 100644
--- a/connectors/soap/element-templates/soap-outbound-connector.json
+++ b/connectors/soap/element-templates/soap-outbound-connector.json
@@ -3,6 +3,9 @@
   "name" : "SOAP Connector",
   "id" : "io.camunda:soap",
   "description" : "A Connector to execute a SOAP request",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/protocol/soap/",
   "version" : 1,
   "category" : {
@@ -69,14 +72,77 @@
     },
     "type" : "Dropdown",
     "choices" : [ {
-      "name" : "WSS signature",
-      "value" : "signature"
-    }, {
       "name" : "None",
       "value" : "none"
     }, {
       "name" : "WSS username token",
       "value" : "usernameToken"
+    }, {
+      "name" : "WSS signature",
+      "value" : "signature"
+    } ]
+  }, {
+    "id" : "authentication.username",
+    "label" : "Username",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.username",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.authentication",
+      "equals" : "usernameToken",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.password",
+    "label" : "Password",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.password",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.authentication",
+      "equals" : "usernameToken",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.encoded",
+    "label" : "Encoded",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.encoded",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.authentication",
+      "equals" : "usernameToken",
+      "type" : "simple"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "No",
+      "value" : "No"
+    }, {
+      "name" : "Yes",
+      "value" : "Yes"
     } ]
   }, {
     "id" : "authentication.certificate.certificateType",
@@ -355,69 +421,6 @@
       "type" : "simple"
     },
     "type" : "String"
-  }, {
-    "id" : "authentication.username",
-    "label" : "Username",
-    "optional" : false,
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "feel" : "optional",
-    "group" : "authentication",
-    "binding" : {
-      "name" : "authentication.username",
-      "type" : "zeebe:input"
-    },
-    "condition" : {
-      "property" : "authentication.authentication",
-      "equals" : "usernameToken",
-      "type" : "simple"
-    },
-    "type" : "String"
-  }, {
-    "id" : "authentication.password",
-    "label" : "Password",
-    "optional" : false,
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "feel" : "optional",
-    "group" : "authentication",
-    "binding" : {
-      "name" : "authentication.password",
-      "type" : "zeebe:input"
-    },
-    "condition" : {
-      "property" : "authentication.authentication",
-      "equals" : "usernameToken",
-      "type" : "simple"
-    },
-    "type" : "String"
-  }, {
-    "id" : "authentication.encoded",
-    "label" : "Encoded",
-    "optional" : false,
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "group" : "authentication",
-    "binding" : {
-      "name" : "authentication.encoded",
-      "type" : "zeebe:input"
-    },
-    "condition" : {
-      "property" : "authentication.authentication",
-      "equals" : "usernameToken",
-      "type" : "simple"
-    },
-    "type" : "Dropdown",
-    "choices" : [ {
-      "name" : "No",
-      "value" : "No"
-    }, {
-      "name" : "Yes",
-      "value" : "Yes"
-    } ]
   }, {
     "id" : "soapVersion.version",
     "label" : "SOAP version",
diff --git a/connectors/webhook/element-templates/hybrid/webhook-connector-boundary-hybrid.json b/connectors/webhook/element-templates/hybrid/webhook-connector-boundary-hybrid.json
index 42921fcf25..ffe19f740d 100644
--- a/connectors/webhook/element-templates/hybrid/webhook-connector-boundary-hybrid.json
+++ b/connectors/webhook/element-templates/hybrid/webhook-connector-boundary-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid Webhook Boundary Event Connector",
   "id" : "io.camunda.connectors.webhook.WebhookConnectorBoundary.v1-hybrid",
   "description" : "Configure webhook to receive callbacks",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
   "version" : 11,
   "category" : {
diff --git a/connectors/webhook/element-templates/hybrid/webhook-connector-intermediate-hybrid.json b/connectors/webhook/element-templates/hybrid/webhook-connector-intermediate-hybrid.json
index 3b8af376b2..5b9b39ea25 100644
--- a/connectors/webhook/element-templates/hybrid/webhook-connector-intermediate-hybrid.json
+++ b/connectors/webhook/element-templates/hybrid/webhook-connector-intermediate-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid Webhook Intermediate Event Connector",
   "id" : "io.camunda.connectors.webhook.WebhookConnectorIntermediate.v1-hybrid",
   "description" : "Configure webhook to receive callbacks",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
   "version" : 11,
   "category" : {
diff --git a/connectors/webhook/element-templates/hybrid/webhook-connector-start-event-hybrid.json b/connectors/webhook/element-templates/hybrid/webhook-connector-start-event-hybrid.json
index b3c3f8738f..ccc6efd877 100644
--- a/connectors/webhook/element-templates/hybrid/webhook-connector-start-event-hybrid.json
+++ b/connectors/webhook/element-templates/hybrid/webhook-connector-start-event-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid Webhook Start Event Connector",
   "id" : "io.camunda.connectors.webhook.WebhookConnector.v1-hybrid",
   "description" : "Configure webhook to receive callbacks",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
   "version" : 11,
   "category" : {
diff --git a/connectors/webhook/element-templates/hybrid/webhook-connector-start-message-hybrid.json b/connectors/webhook/element-templates/hybrid/webhook-connector-start-message-hybrid.json
index 539dd10d96..b2ed5b80e4 100644
--- a/connectors/webhook/element-templates/hybrid/webhook-connector-start-message-hybrid.json
+++ b/connectors/webhook/element-templates/hybrid/webhook-connector-start-message-hybrid.json
@@ -3,6 +3,9 @@
   "name" : "Hybrid Webhook Message Start Event Connector",
   "id" : "io.camunda.connectors.webhook.WebhookConnectorStartMessage.v1-hybrid",
   "description" : "Configure webhook to receive callbacks",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
   "version" : 11,
   "category" : {
diff --git a/connectors/webhook/element-templates/webhook-connector-boundary.json b/connectors/webhook/element-templates/webhook-connector-boundary.json
index 4187b2a8c8..b5814f889f 100644
--- a/connectors/webhook/element-templates/webhook-connector-boundary.json
+++ b/connectors/webhook/element-templates/webhook-connector-boundary.json
@@ -3,6 +3,9 @@
   "name" : "Webhook Boundary Event Connector",
   "id" : "io.camunda.connectors.webhook.WebhookConnectorBoundary.v1",
   "description" : "Configure webhook to receive callbacks",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
   "version" : 11,
   "category" : {
diff --git a/connectors/webhook/element-templates/webhook-connector-intermediate.json b/connectors/webhook/element-templates/webhook-connector-intermediate.json
index 1274b33631..c9855dda3e 100644
--- a/connectors/webhook/element-templates/webhook-connector-intermediate.json
+++ b/connectors/webhook/element-templates/webhook-connector-intermediate.json
@@ -3,6 +3,9 @@
   "name" : "Webhook Intermediate Event Connector",
   "id" : "io.camunda.connectors.webhook.WebhookConnectorIntermediate.v1",
   "description" : "Configure webhook to receive callbacks",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
   "version" : 11,
   "category" : {
diff --git a/connectors/webhook/element-templates/webhook-connector-start-event.json b/connectors/webhook/element-templates/webhook-connector-start-event.json
index 3285843bbc..bb8eb6b8e2 100644
--- a/connectors/webhook/element-templates/webhook-connector-start-event.json
+++ b/connectors/webhook/element-templates/webhook-connector-start-event.json
@@ -3,6 +3,9 @@
   "name" : "Webhook Start Event Connector",
   "id" : "io.camunda.connectors.webhook.WebhookConnector.v1",
   "description" : "Configure webhook to receive callbacks",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
   "version" : 11,
   "category" : {
diff --git a/connectors/webhook/element-templates/webhook-connector-start-message.json b/connectors/webhook/element-templates/webhook-connector-start-message.json
index d122ef37a2..26073804dd 100644
--- a/connectors/webhook/element-templates/webhook-connector-start-message.json
+++ b/connectors/webhook/element-templates/webhook-connector-start-message.json
@@ -3,6 +3,9 @@
   "name" : "Webhook Message Start Event Connector",
   "id" : "io.camunda.connectors.webhook.WebhookConnectorStartMessage.v1",
   "description" : "Configure webhook to receive callbacks",
+  "metadata" : {
+    "keywords" : [ ]
+  },
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
   "version" : 11,
   "category" : {