@camunda/connectors-element-templates 1.0.20 → 1.0.21

package/src/element-templates/rabbitmq-inbound-connector-intermediate.json

@@ -1,11 +1,11 @@
 [
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "RabbitMQ connector",
+    "name": "RabbitMQ Intermediate Catch Event Connector",
     "id": "io.camunda.connectors.inbound.RabbitMQ.Intermediate.v1",
-    "version": 1,
+    "version": 4,
     "description": "Receive a message from RabbitMQ",
-    "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq-inbound",
+    "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound",
     "category": {
       "id": "connectors",
       "name": "Connectors"
@@ -89,7 +89,7 @@
         "constraints": {
           "notEmpty": true,
           "pattern": {
-            "value": "^(amqps?://)|(secrets).*",
+            "value": "^(amqps?://)|(\\{\\{secrets\\..+\\}\\}).*$",
             "message": "Must start with amqp(s):// or contain a secret reference"
           }
         },
@@ -132,7 +132,7 @@
       },
       {
         "label": "Host name",
-        "description": "Host name: get from RabbitMQ external applocation configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/#routing-data\"target=\"_blank\">documentation</a>",
+        "description": "Host name: get from RabbitMQ external applocation configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound#routing-data-1\"target=\"_blank\">documentation</a>",
         "group": "routing",
         "type": "String",
         "binding": {
@@ -149,7 +149,7 @@
       },
       {
         "label": "Virtual host",
-        "description": "Virtual name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/#routing-data\"target=\"_blank\">documentation</a>",
+        "description": "Virtual name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound#routing-data-1\"target=\"_blank\">documentation</a>",
         "group": "routing",
         "type": "String",
         "binding": {
@@ -166,7 +166,7 @@
       },
       {
         "label": "Port",
-        "description": "Port: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/#routing-data\"target=\"_blank\">documentation</a>",
+        "description": "Port: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound#routing-data-1\"target=\"_blank\">documentation</a>",
         "group": "routing",
         "type": "String",
         "binding": {
@@ -265,6 +265,18 @@
           "notEmpty": true
         }
       },
+      {
+        "label": "Message ID expression",
+        "feel": "required",
+        "type": "String",
+        "optional": true,
+        "group": "activation",
+        "binding": {
+          "type": "zeebe:property",
+          "name": "messageIdExpression"
+        },
+        "description": "Expression to extract unique identifier of a message"
+      },
       {
         "label": "Activation condition",
         "type": "String",
@@ -305,16 +317,16 @@
       "contents": "data:image/svg+xml;utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='-7.5 0 271 271' preserveAspectRatio='xMidYMid'%3E%3Cpath d='M245.44 108.308h-85.09a7.738 7.738 0 0 1-7.735-7.734v-88.68C152.615 5.327 147.29 0 140.726 0h-30.375c-6.568 0-11.89 5.327-11.89 11.894v88.143c0 4.573-3.697 8.29-8.27 8.31l-27.885.133c-4.612.025-8.359-3.717-8.35-8.325l.173-88.241C54.144 5.337 48.817 0 42.24 0H11.89C5.321 0 0 5.327 0 11.894V260.21c0 5.834 4.726 10.56 10.555 10.56H245.44c5.834 0 10.56-4.726 10.56-10.56V118.868c0-5.834-4.726-10.56-10.56-10.56zm-39.902 93.233c0 7.645-6.198 13.844-13.843 13.844H167.69c-7.646 0-13.844-6.199-13.844-13.844v-24.005c0-7.646 6.198-13.844 13.844-13.844h24.005c7.645 0 13.843 6.198 13.843 13.844v24.005z' fill='%23F60'/%3E%3C/svg%3E"
     },
     "engines": {
-      "camunda": "^8.2"
+      "camunda": "^8.4"
     }
   },
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "RabbitMQ Intermediate Catch Event Connector",
+    "name": "RabbitMQ connector",
     "id": "io.camunda.connectors.inbound.RabbitMQ.Intermediate.v1",
+    "version": 2,
     "description": "Receive a message from RabbitMQ",
-    "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound",
-    "version": 6,
+    "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq-inbound",
     "category": {
       "id": "connectors",
       "name": "Connectors"
@@ -342,33 +354,39 @@
         "label": "Activation"
       },
       {
-        "id": "correlation",
-        "label": "Correlation"
-      },
-      {
-        "id": "output",
-        "label": "Output mapping"
+        "id": "variable-mapping",
+        "label": "Variable mapping"
       }
     ],
     "properties": [
       {
+        "type": "Hidden",
         "value": "io.camunda:connector-rabbitmq-inbound:1",
         "binding": {
-          "name": "inbound.type",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.type"
+        }
+      },
+      {
+        "type": "Hidden",
+        "generatedValue": {
+          "type": "uuid"
         },
-        "type": "Hidden"
+        "binding": {
+          "type": "bpmn:Message#property",
+          "name": "name"
+        }
       },
       {
-        "id": "authentication.authType",
+        "id": "connectionType",
         "label": "Connection type",
-        "value": "uri",
         "group": "authentication",
+        "type": "Dropdown",
+        "value": "uri",
         "binding": {
-          "name": "authentication.authType",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "authentication.authType"
         },
-        "type": "Dropdown",
         "choices": [
           {
             "name": "URI",
@@ -381,178 +399,154 @@
         ]
       },
       {
-        "id": "authentication.uri",
         "label": "URI",
         "description": "URI should contain username, password, host name, port number, and virtual host",
-        "optional": false,
+        "group": "authentication",
+        "type": "String",
+        "binding": {
+          "type": "zeebe:property",
+          "name": "authentication.uri"
+        },
         "constraints": {
           "notEmpty": true,
           "pattern": {
-            "value": "^(=|(amqps?://|secrets|\\{\\{).*$)",
+            "value": "^(amqps?://)|secrets\\..+|(\\{\\{secrets\\..+\\}\\}).*$",
             "message": "Must start with amqp(s):// or contain a secret reference"
           }
         },
-        "group": "authentication",
-        "binding": {
-          "name": "authentication.uri",
-          "type": "zeebe:property"
-        },
         "condition": {
-          "property": "authentication.authType",
-          "equals": "uri",
-          "type": "simple"
-        },
-        "type": "String"
+          "property": "connectionType",
+          "equals": "uri"
+        }
       },
       {
-        "id": "authentication.userName",
         "label": "Username",
-        "optional": false,
-        "constraints": {
-          "notEmpty": true
-        },
         "group": "authentication",
+        "type": "String",
         "binding": {
-          "name": "authentication.userName",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "authentication.userName"
         },
-        "condition": {
-          "property": "authentication.authType",
-          "equals": "credentials",
-          "type": "simple"
+        "constraints": {
+          "notEmpty": true
         },
-        "type": "String"
+        "condition": {
+          "property": "connectionType",
+          "equals": "credentials"
+        }
       },
       {
-        "id": "authentication.password",
         "label": "Password",
-        "optional": false,
-        "constraints": {
-          "notEmpty": true
-        },
         "group": "authentication",
+        "type": "String",
         "binding": {
-          "name": "authentication.password",
-          "type": "zeebe:property"
-        },
-        "condition": {
-          "property": "authentication.authType",
-          "equals": "credentials",
-          "type": "simple"
+          "type": "zeebe:property",
+          "name": "authentication.password"
         },
-        "type": "String"
-      },
-      {
-        "id": "routing.virtualHost",
-        "label": "Virtual host",
-        "description": "Virtual name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
-        "optional": false,
         "constraints": {
           "notEmpty": true
         },
-        "group": "routing",
-        "binding": {
-          "name": "routing.virtualHost",
-          "type": "zeebe:property"
-        },
         "condition": {
-          "property": "authentication.authType",
-          "equals": "credentials",
-          "type": "simple"
-        },
-        "type": "String"
+          "property": "connectionType",
+          "equals": "credentials"
+        }
       },
       {
-        "id": "routing.hostName",
         "label": "Host name",
-        "description": "Host name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
-        "optional": false,
+        "description": "Host name: get from RabbitMQ external applocation configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/#routing-data\"target=\"_blank\">documentation</a>",
+        "group": "routing",
+        "type": "String",
+        "binding": {
+          "type": "zeebe:property",
+          "name": "routing.hostName"
+        },
         "constraints": {
           "notEmpty": true
         },
+        "condition": {
+          "property": "connectionType",
+          "equals": "credentials"
+        }
+      },
+      {
+        "label": "Virtual host",
+        "description": "Virtual name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/#routing-data\"target=\"_blank\">documentation</a>",
         "group": "routing",
+        "type": "String",
         "binding": {
-          "name": "routing.hostName",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "routing.virtualHost"
         },
-        "condition": {
-          "property": "authentication.authType",
-          "equals": "credentials",
-          "type": "simple"
+        "constraints": {
+          "notEmpty": true
         },
-        "type": "String"
+        "condition": {
+          "property": "connectionType",
+          "equals": "credentials"
+        }
       },
       {
-        "id": "routing.port",
         "label": "Port",
-        "description": "Port: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
-        "optional": false,
-        "constraints": {
-          "notEmpty": true
-        },
+        "description": "Port: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/#routing-data\"target=\"_blank\">documentation</a>",
         "group": "routing",
+        "type": "String",
         "binding": {
-          "name": "routing.port",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "routing.port"
         },
-        "condition": {
-          "property": "authentication.authType",
-          "equals": "credentials",
-          "type": "simple"
+        "constraints": {
+          "notEmpty": true
         },
-        "type": "String"
+        "condition": {
+          "property": "connectionType",
+          "equals": "credentials"
+        }
       },
       {
-        "id": "queueName",
         "label": "Queue name",
         "description": "Name of the queue to subscribe to",
-        "optional": false,
-        "constraints": {
-          "notEmpty": true
-        },
         "group": "subscription",
+        "type": "String",
+        "feel": "optional",
         "binding": {
-          "name": "queueName",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "queueName"
         },
-        "type": "String"
+        "constraints": {
+          "notEmpty": true
+        }
       },
       {
-        "id": "consumerTag",
         "label": "Consumer tag",
         "description": "Consumer tag to use for the subscription",
-        "optional": false,
         "group": "subscription",
+        "type": "String",
+        "feel": "optional",
         "binding": {
-          "name": "consumerTag",
-          "type": "zeebe:property"
-        },
-        "type": "String"
+          "type": "zeebe:property",
+          "name": "consumerTag"
+        }
       },
       {
-        "id": "arguments",
         "label": "Arguments",
         "description": "Arguments to use for the subscription",
-        "optional": true,
-        "feel": "required",
         "group": "subscription",
+        "type": "String",
+        "feel": "required",
         "binding": {
-          "name": "arguments",
-          "type": "zeebe:property"
-        },
-        "type": "String"
+          "type": "zeebe:property",
+          "name": "arguments"
+        }
       },
       {
-        "id": "exclusive",
         "label": "Exclusive consumer",
-        "optional": false,
-        "value": "false",
         "group": "subscription",
+        "type": "Dropdown",
+        "value": "false",
         "binding": {
-          "name": "exclusive",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "exclusive"
         },
-        "type": "Dropdown",
         "choices": [
           {
             "name": "Yes",
@@ -565,111 +559,83 @@
         ]
       },
       {
-        "id": "activationCondition",
-        "label": "Activation condition",
-        "description": "Condition under which the Connector triggers. Leave empty to catch all events",
-        "optional": true,
-        "feel": "required",
+        "label": "Correlation key (process)",
+        "type": "String",
         "group": "activation",
+        "feel": "required",
+        "description": "Sets up the correlation key from process variables",
         "binding": {
-          "name": "activationCondition",
-          "type": "zeebe:property"
+          "type": "bpmn:Message#zeebe:subscription#property",
+          "name": "correlationKey"
         },
-        "type": "String"
-      },
-      {
-        "id": "correlationKeyProcess",
-        "label": "Correlation key (process)",
-        "description": "Sets up the correlation key from process variables",
         "constraints": {
           "notEmpty": true
-        },
-        "feel": "required",
-        "group": "correlation",
-        "binding": {
-          "name": "correlationKey",
-          "type": "bpmn:Message#zeebe:subscription#property"
-        },
-        "type": "String"
+        }
       },
       {
-        "id": "correlationKeyPayload",
         "label": "Correlation key (payload)",
-        "description": "Extracts the correlation key from the incoming message payload",
-        "constraints": {
-          "notEmpty": true
-        },
+        "type": "String",
+        "group": "activation",
         "feel": "required",
-        "group": "correlation",
         "binding": {
-          "name": "correlationKeyExpression",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "correlationKeyExpression"
         },
-        "type": "String"
+        "description": "Extracts the correlation key from the incoming message payload",
+        "constraints": {
+          "notEmpty": true
+        }
       },
       {
-        "id": "messageIdExpression",
-        "label": "Message ID expression",
-        "description": "Expression to extract unique identifier of a message",
-        "optional": true,
+        "label": "Activation condition",
+        "type": "String",
+        "group": "activation",
         "feel": "required",
-        "group": "correlation",
-        "binding": {
-          "name": "messageIdExpression",
-          "type": "zeebe:property"
-        },
-        "type": "String"
-      },
-      {
-        "id": "messageNameUuid",
-        "generatedValue": {
-          "type": "uuid"
-        },
-        "group": "correlation",
+        "optional": true,
         "binding": {
-          "name": "name",
-          "type": "bpmn:Message#property"
+          "type": "zeebe:property",
+          "name": "activationCondition"
         },
-        "type": "Hidden"
+        "description": "Condition under which the connector triggers. Leave empty to catch all events"
       },
       {
-        "id": "resultVariable",
         "label": "Result variable",
-        "description": "Name of variable to store the response in",
-        "group": "output",
+        "type": "String",
+        "group": "variable-mapping",
+        "optional": true,
         "binding": {
-          "name": "resultVariable",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "resultVariable"
         },
-        "type": "String"
+        "description": "Name of variable to store the result of the connector in"
       },
       {
-        "id": "resultExpression",
         "label": "Result expression",
-        "description": "Expression to map the response into process variables",
+        "type": "String",
+        "group": "variable-mapping",
         "feel": "required",
-        "group": "output",
+        "optional": true,
         "binding": {
-          "name": "resultExpression",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "resultExpression"
         },
-        "type": "Text"
+        "description": "Expression to map the inbound payload to process variables"
       }
     ],
     "icon": {
-      "contents": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxOCcgaGVpZ2h0PScxOCcgdmlld0JveD0nLTcuNSAwIDI3MSAyNzEnIHByZXNlcnZlQXNwZWN0UmF0aW89J3hNaWRZTWlkJz4KICAgIDxwYXRoIGQ9J00yNDUuNDQgMTA4LjMwOGgtODUuMDlhNy43MzggNy43MzggMCAwIDEtNy43MzUtNy43MzR2LTg4LjY4QzE1Mi42MTUgNS4zMjcgMTQ3LjI5IDAgMTQwLjcyNiAwaC0zMC4zNzVjLTYuNTY4IDAtMTEuODkgNS4zMjctMTEuODkgMTEuODk0djg4LjE0M2MwIDQuNTczLTMuNjk3IDguMjktOC4yNyA4LjMxbC0yNy44ODUuMTMzYy00LjYxMi4wMjUtOC4zNTktMy43MTctOC4zNS04LjMyNWwuMTczLTg4LjI0MUM1NC4xNDQgNS4zMzcgNDguODE3IDAgNDIuMjQgMEgxMS44OUM1LjMyMSAwIDAgNS4zMjcgMCAxMS44OTRWMjYwLjIxYzAgNS44MzQgNC43MjYgMTAuNTYgMTAuNTU1IDEwLjU2SDI0NS40NGM1LjgzNCAwIDEwLjU2LTQuNzI2IDEwLjU2LTEwLjU2VjExOC44NjhjMC01LjgzNC00LjcyNi0xMC41Ni0xMC41Ni0xMC41NnptLTM5LjkwMiA5My4yMzNjMCA3LjY0NS02LjE5OCAxMy44NDQtMTMuODQzIDEzLjg0NEgxNjcuNjljLTcuNjQ2IDAtMTMuODQ0LTYuMTk5LTEzLjg0NC0xMy44NDR2LTI0LjAwNWMwLTcuNjQ2IDYuMTk4LTEzLjg0NCAxMy44NDQtMTMuODQ0aDI0LjAwNWM3LjY0NSAwIDEzLjg0MyA2LjE5OCAxMy44NDMgMTMuODQ0djI0LjAwNXonCiAgICAgICAgICBmaWxsPScjRjYwJy8+Cjwvc3ZnPg=="
+      "contents": "data:image/svg+xml;utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='-7.5 0 271 271' preserveAspectRatio='xMidYMid'%3E%3Cpath d='M245.44 108.308h-85.09a7.738 7.738 0 0 1-7.735-7.734v-88.68C152.615 5.327 147.29 0 140.726 0h-30.375c-6.568 0-11.89 5.327-11.89 11.894v88.143c0 4.573-3.697 8.29-8.27 8.31l-27.885.133c-4.612.025-8.359-3.717-8.35-8.325l.173-88.241C54.144 5.337 48.817 0 42.24 0H11.89C5.321 0 0 5.327 0 11.894V260.21c0 5.834 4.726 10.56 10.555 10.56H245.44c5.834 0 10.56-4.726 10.56-10.56V118.868c0-5.834-4.726-10.56-10.56-10.56zm-39.902 93.233c0 7.645-6.198 13.844-13.843 13.844H167.69c-7.646 0-13.844-6.199-13.844-13.844v-24.005c0-7.646 6.198-13.844 13.844-13.844h24.005c7.645 0 13.843 6.198 13.843 13.844v24.005z' fill='%23F60'/%3E%3C/svg%3E"
     },
     "engines": {
-      "camunda": "^8.5"
+      "camunda": "^8.2"
     }
   },
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "RabbitMQ connector",
+    "name": "RabbitMQ Intermediate Catch Event Connector",
     "id": "io.camunda.connectors.inbound.RabbitMQ.Intermediate.v1",
-    "version": 2,
     "description": "Receive a message from RabbitMQ",
-    "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq-inbound",
+    "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound",
+    "version": 6,
     "category": {
       "id": "connectors",
       "name": "Connectors"
@@ -697,39 +663,33 @@
         "label": "Activation"
       },
       {
-        "id": "variable-mapping",
-        "label": "Variable mapping"
+        "id": "correlation",
+        "label": "Correlation"
+      },
+      {
+        "id": "output",
+        "label": "Output mapping"
       }
     ],
     "properties": [
       {
-        "type": "Hidden",
         "value": "io.camunda:connector-rabbitmq-inbound:1",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.type"
-        }
-      },
-      {
-        "type": "Hidden",
-        "generatedValue": {
-          "type": "uuid"
+          "name": "inbound.type",
+          "type": "zeebe:property"
         },
-        "binding": {
-          "type": "bpmn:Message#property",
-          "name": "name"
-        }
+        "type": "Hidden"
       },
       {
-        "id": "connectionType",
+        "id": "authentication.authType",
         "label": "Connection type",
-        "group": "authentication",
-        "type": "Dropdown",
         "value": "uri",
+        "group": "authentication",
         "binding": {
-          "type": "zeebe:property",
-          "name": "authentication.authType"
+          "name": "authentication.authType",
+          "type": "zeebe:property"
         },
+        "type": "Dropdown",
         "choices": [
           {
             "name": "URI",
@@ -742,154 +702,178 @@
         ]
       },
       {
+        "id": "authentication.uri",
         "label": "URI",
         "description": "URI should contain username, password, host name, port number, and virtual host",
-        "group": "authentication",
-        "type": "String",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "authentication.uri"
-        },
+        "optional": false,
         "constraints": {
           "notEmpty": true,
           "pattern": {
-            "value": "^(amqps?://)|secrets\\..+|(\\{\\{secrets\\..+\\}\\}).*$",
+            "value": "^(=|(amqps?://|secrets|\\{\\{).*$)",
             "message": "Must start with amqp(s):// or contain a secret reference"
           }
         },
+        "group": "authentication",
+        "binding": {
+          "name": "authentication.uri",
+          "type": "zeebe:property"
+        },
         "condition": {
-          "property": "connectionType",
-          "equals": "uri"
-        }
+          "property": "authentication.authType",
+          "equals": "uri",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
+        "id": "authentication.userName",
         "label": "Username",
-        "group": "authentication",
-        "type": "String",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "authentication.userName"
-        },
+        "optional": false,
         "constraints": {
           "notEmpty": true
         },
+        "group": "authentication",
+        "binding": {
+          "name": "authentication.userName",
+          "type": "zeebe:property"
+        },
         "condition": {
-          "property": "connectionType",
-          "equals": "credentials"
-        }
+          "property": "authentication.authType",
+          "equals": "credentials",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
+        "id": "authentication.password",
         "label": "Password",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
         "group": "authentication",
-        "type": "String",
         "binding": {
-          "type": "zeebe:property",
-          "name": "authentication.password"
+          "name": "authentication.password",
+          "type": "zeebe:property"
+        },
+        "condition": {
+          "property": "authentication.authType",
+          "equals": "credentials",
+          "type": "simple"
         },
+        "type": "String"
+      },
+      {
+        "id": "routing.virtualHost",
+        "label": "Virtual host",
+        "description": "Virtual name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
+        "optional": false,
         "constraints": {
           "notEmpty": true
         },
+        "group": "routing",
+        "binding": {
+          "name": "routing.virtualHost",
+          "type": "zeebe:property"
+        },
         "condition": {
-          "property": "connectionType",
-          "equals": "credentials"
-        }
+          "property": "authentication.authType",
+          "equals": "credentials",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
+        "id": "routing.hostName",
         "label": "Host name",
-        "description": "Host name: get from RabbitMQ external applocation configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/#routing-data\"target=\"_blank\">documentation</a>",
-        "group": "routing",
-        "type": "String",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "routing.hostName"
-        },
+        "description": "Host name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
+        "optional": false,
         "constraints": {
           "notEmpty": true
         },
-        "condition": {
-          "property": "connectionType",
-          "equals": "credentials"
-        }
-      },
-      {
-        "label": "Virtual host",
-        "description": "Virtual name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/#routing-data\"target=\"_blank\">documentation</a>",
         "group": "routing",
-        "type": "String",
         "binding": {
-          "type": "zeebe:property",
-          "name": "routing.virtualHost"
-        },
-        "constraints": {
-          "notEmpty": true
+          "name": "routing.hostName",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "connectionType",
-          "equals": "credentials"
-        }
+          "property": "authentication.authType",
+          "equals": "credentials",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
+        "id": "routing.port",
         "label": "Port",
-        "description": "Port: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/#routing-data\"target=\"_blank\">documentation</a>",
+        "description": "Port: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
         "group": "routing",
-        "type": "String",
         "binding": {
-          "type": "zeebe:property",
-          "name": "routing.port"
-        },
-        "constraints": {
-          "notEmpty": true
+          "name": "routing.port",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "connectionType",
-          "equals": "credentials"
-        }
+          "property": "authentication.authType",
+          "equals": "credentials",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
+        "id": "queueName",
         "label": "Queue name",
         "description": "Name of the queue to subscribe to",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
         "group": "subscription",
-        "type": "String",
-        "feel": "optional",
         "binding": {
-          "type": "zeebe:property",
-          "name": "queueName"
+          "name": "queueName",
+          "type": "zeebe:property"
         },
-        "constraints": {
-          "notEmpty": true
-        }
+        "type": "String"
       },
       {
+        "id": "consumerTag",
         "label": "Consumer tag",
         "description": "Consumer tag to use for the subscription",
+        "optional": false,
         "group": "subscription",
-        "type": "String",
-        "feel": "optional",
         "binding": {
-          "type": "zeebe:property",
-          "name": "consumerTag"
-        }
+          "name": "consumerTag",
+          "type": "zeebe:property"
+        },
+        "type": "String"
       },
       {
+        "id": "arguments",
         "label": "Arguments",
         "description": "Arguments to use for the subscription",
-        "group": "subscription",
-        "type": "String",
+        "optional": true,
         "feel": "required",
+        "group": "subscription",
         "binding": {
-          "type": "zeebe:property",
-          "name": "arguments"
-        }
+          "name": "arguments",
+          "type": "zeebe:property"
+        },
+        "type": "String"
       },
       {
+        "id": "exclusive",
         "label": "Exclusive consumer",
-        "group": "subscription",
-        "type": "Dropdown",
+        "optional": false,
         "value": "false",
+        "group": "subscription",
         "binding": {
-          "type": "zeebe:property",
-          "name": "exclusive"
+          "name": "exclusive",
+          "type": "zeebe:property"
         },
+        "type": "Dropdown",
         "choices": [
           {
             "name": "Yes",
@@ -902,83 +886,111 @@
         ]
       },
       {
-        "label": "Correlation key (process)",
-        "type": "String",
-        "group": "activation",
+        "id": "activationCondition",
+        "label": "Activation condition",
+        "description": "Condition under which the Connector triggers. Leave empty to catch all events",
+        "optional": true,
         "feel": "required",
-        "description": "Sets up the correlation key from process variables",
+        "group": "activation",
         "binding": {
-          "type": "bpmn:Message#zeebe:subscription#property",
-          "name": "correlationKey"
+          "name": "activationCondition",
+          "type": "zeebe:property"
         },
-        "constraints": {
-          "notEmpty": true
-        }
+        "type": "String"
       },
       {
-        "label": "Correlation key (payload)",
-        "type": "String",
-        "group": "activation",
+        "id": "correlationKeyProcess",
+        "label": "Correlation key (process)",
+        "description": "Sets up the correlation key from process variables",
+        "constraints": {
+          "notEmpty": true
+        },
         "feel": "required",
+        "group": "correlation",
         "binding": {
-          "type": "zeebe:property",
-          "name": "correlationKeyExpression"
+          "name": "correlationKey",
+          "type": "bpmn:Message#zeebe:subscription#property"
         },
+        "type": "String"
+      },
+      {
+        "id": "correlationKeyPayload",
+        "label": "Correlation key (payload)",
         "description": "Extracts the correlation key from the incoming message payload",
         "constraints": {
           "notEmpty": true
-        }
+        },
+        "feel": "required",
+        "group": "correlation",
+        "binding": {
+          "name": "correlationKeyExpression",
+          "type": "zeebe:property"
+        },
+        "type": "String"
       },
       {
-        "label": "Activation condition",
-        "type": "String",
-        "group": "activation",
-        "feel": "required",
+        "id": "messageIdExpression",
+        "label": "Message ID expression",
+        "description": "Expression to extract unique identifier of a message",
         "optional": true,
+        "feel": "required",
+        "group": "correlation",
         "binding": {
-          "type": "zeebe:property",
-          "name": "activationCondition"
+          "name": "messageIdExpression",
+          "type": "zeebe:property"
         },
-        "description": "Condition under which the connector triggers. Leave empty to catch all events"
+        "type": "String"
+      },
+      {
+        "id": "messageNameUuid",
+        "generatedValue": {
+          "type": "uuid"
+        },
+        "group": "correlation",
+        "binding": {
+          "name": "name",
+          "type": "bpmn:Message#property"
+        },
+        "type": "Hidden"
       },
       {
+        "id": "resultVariable",
         "label": "Result variable",
-        "type": "String",
-        "group": "variable-mapping",
-        "optional": true,
+        "description": "Name of variable to store the response in",
+        "group": "output",
         "binding": {
-          "type": "zeebe:property",
-          "name": "resultVariable"
+          "name": "resultVariable",
+          "type": "zeebe:property"
         },
-        "description": "Name of variable to store the result of the connector in"
+        "type": "String"
       },
       {
+        "id": "resultExpression",
         "label": "Result expression",
-        "type": "String",
-        "group": "variable-mapping",
+        "description": "Expression to map the response into process variables",
         "feel": "required",
-        "optional": true,
+        "group": "output",
         "binding": {
-          "type": "zeebe:property",
-          "name": "resultExpression"
+          "name": "resultExpression",
+          "type": "zeebe:property"
         },
-        "description": "Expression to map the inbound payload to process variables"
+        "type": "Text"
       }
     ],
     "icon": {
-      "contents": "data:image/svg+xml;utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='-7.5 0 271 271' preserveAspectRatio='xMidYMid'%3E%3Cpath d='M245.44 108.308h-85.09a7.738 7.738 0 0 1-7.735-7.734v-88.68C152.615 5.327 147.29 0 140.726 0h-30.375c-6.568 0-11.89 5.327-11.89 11.894v88.143c0 4.573-3.697 8.29-8.27 8.31l-27.885.133c-4.612.025-8.359-3.717-8.35-8.325l.173-88.241C54.144 5.337 48.817 0 42.24 0H11.89C5.321 0 0 5.327 0 11.894V260.21c0 5.834 4.726 10.56 10.555 10.56H245.44c5.834 0 10.56-4.726 10.56-10.56V118.868c0-5.834-4.726-10.56-10.56-10.56zm-39.902 93.233c0 7.645-6.198 13.844-13.843 13.844H167.69c-7.646 0-13.844-6.199-13.844-13.844v-24.005c0-7.646 6.198-13.844 13.844-13.844h24.005c7.645 0 13.843 6.198 13.843 13.844v24.005z' fill='%23F60'/%3E%3C/svg%3E"
+      "contents": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxOCcgaGVpZ2h0PScxOCcgdmlld0JveD0nLTcuNSAwIDI3MSAyNzEnIHByZXNlcnZlQXNwZWN0UmF0aW89J3hNaWRZTWlkJz4KICAgIDxwYXRoIGQ9J00yNDUuNDQgMTA4LjMwOGgtODUuMDlhNy43MzggNy43MzggMCAwIDEtNy43MzUtNy43MzR2LTg4LjY4QzE1Mi42MTUgNS4zMjcgMTQ3LjI5IDAgMTQwLjcyNiAwaC0zMC4zNzVjLTYuNTY4IDAtMTEuODkgNS4zMjctMTEuODkgMTEuODk0djg4LjE0M2MwIDQuNTczLTMuNjk3IDguMjktOC4yNyA4LjMxbC0yNy44ODUuMTMzYy00LjYxMi4wMjUtOC4zNTktMy43MTctOC4zNS04LjMyNWwuMTczLTg4LjI0MUM1NC4xNDQgNS4zMzcgNDguODE3IDAgNDIuMjQgMEgxMS44OUM1LjMyMSAwIDAgNS4zMjcgMCAxMS44OTRWMjYwLjIxYzAgNS44MzQgNC43MjYgMTAuNTYgMTAuNTU1IDEwLjU2SDI0NS40NGM1LjgzNCAwIDEwLjU2LTQuNzI2IDEwLjU2LTEwLjU2VjExOC44NjhjMC01LjgzNC00LjcyNi0xMC41Ni0xMC41Ni0xMC41NnptLTM5LjkwMiA5My4yMzNjMCA3LjY0NS02LjE5OCAxMy44NDQtMTMuODQzIDEzLjg0NEgxNjcuNjljLTcuNjQ2IDAtMTMuODQ0LTYuMTk5LTEzLjg0NC0xMy44NDR2LTI0LjAwNWMwLTcuNjQ2IDYuMTk4LTEzLjg0NCAxMy44NDQtMTMuODQ0aDI0LjAwNWM3LjY0NSAwIDEzLjg0MyA2LjE5OCAxMy44NDMgMTMuODQ0djI0LjAwNXonCiAgICAgICAgICBmaWxsPScjRjYwJy8+Cjwvc3ZnPg=="
     },
     "engines": {
-      "camunda": "^8.2"
+      "camunda": "^8.5"
     }
   },
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
     "name": "RabbitMQ Intermediate Catch Event Connector",
     "id": "io.camunda.connectors.inbound.RabbitMQ.Intermediate.v1",
-    "version": 4,
     "description": "Receive a message from RabbitMQ",
     "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound",
+    "version": 7,
     "category": {
       "id": "connectors",
       "name": "Connectors"
@@ -1006,39 +1018,39 @@
         "label": "Activation"
       },
       {
-        "id": "variable-mapping",
-        "label": "Variable mapping"
+        "id": "correlation",
+        "label": "Correlation",
+        "tooltip": "Learn more about message correlation in the <a href=\"https://docs.camunda.io/docs/components/concepts/messages/#message-correlation-overview\">documentation</a>."
+      },
+      {
+        "id": "deduplication",
+        "label": "Deduplication",
+        "tooltip": "Deduplication allows you to configure multiple inbound connector elements to reuse the same backend (consumer/thread/endpoint) by sharing the same deduplication ID."
+      },
+      {
+        "id": "output",
+        "label": "Output mapping"
       }
     ],
     "properties": [
       {
-        "type": "Hidden",
         "value": "io.camunda:connector-rabbitmq-inbound:1",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.type"
-        }
-      },
-      {
-        "type": "Hidden",
-        "generatedValue": {
-          "type": "uuid"
+          "name": "inbound.type",
+          "type": "zeebe:property"
         },
-        "binding": {
-          "type": "bpmn:Message#property",
-          "name": "name"
-        }
+        "type": "Hidden"
       },
       {
-        "id": "connectionType",
+        "id": "authentication.authType",
         "label": "Connection type",
-        "group": "authentication",
-        "type": "Dropdown",
         "value": "uri",
+        "group": "authentication",
         "binding": {
-          "type": "zeebe:property",
-          "name": "authentication.authType"
+          "name": "authentication.authType",
+          "type": "zeebe:property"
         },
+        "type": "Dropdown",
         "choices": [
           {
             "name": "URI",
@@ -1051,154 +1063,178 @@
         ]
       },
       {
+        "id": "authentication.uri",
         "label": "URI",
         "description": "URI should contain username, password, host name, port number, and virtual host",
-        "group": "authentication",
-        "type": "String",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "authentication.uri"
-        },
+        "optional": false,
         "constraints": {
           "notEmpty": true,
           "pattern": {
-            "value": "^(amqps?://)|(\\{\\{secrets\\..+\\}\\}).*$",
+            "value": "^(=|(amqps?://|secrets|\\{\\{).*$)",
             "message": "Must start with amqp(s):// or contain a secret reference"
           }
         },
+        "group": "authentication",
+        "binding": {
+          "name": "authentication.uri",
+          "type": "zeebe:property"
+        },
         "condition": {
-          "property": "connectionType",
-          "equals": "uri"
-        }
+          "property": "authentication.authType",
+          "equals": "uri",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
+        "id": "authentication.userName",
         "label": "Username",
-        "group": "authentication",
-        "type": "String",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "authentication.userName"
-        },
+        "optional": false,
         "constraints": {
           "notEmpty": true
         },
+        "group": "authentication",
+        "binding": {
+          "name": "authentication.userName",
+          "type": "zeebe:property"
+        },
         "condition": {
-          "property": "connectionType",
-          "equals": "credentials"
-        }
+          "property": "authentication.authType",
+          "equals": "credentials",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
+        "id": "authentication.password",
         "label": "Password",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
         "group": "authentication",
-        "type": "String",
         "binding": {
-          "type": "zeebe:property",
-          "name": "authentication.password"
+          "name": "authentication.password",
+          "type": "zeebe:property"
+        },
+        "condition": {
+          "property": "authentication.authType",
+          "equals": "credentials",
+          "type": "simple"
         },
+        "type": "String"
+      },
+      {
+        "id": "routing.virtualHost",
+        "label": "Virtual host",
+        "description": "Virtual name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
+        "optional": false,
         "constraints": {
           "notEmpty": true
         },
+        "group": "routing",
+        "binding": {
+          "name": "routing.virtualHost",
+          "type": "zeebe:property"
+        },
         "condition": {
-          "property": "connectionType",
-          "equals": "credentials"
-        }
+          "property": "authentication.authType",
+          "equals": "credentials",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
+        "id": "routing.hostName",
         "label": "Host name",
-        "description": "Host name: get from RabbitMQ external applocation configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound#routing-data-1\"target=\"_blank\">documentation</a>",
-        "group": "routing",
-        "type": "String",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "routing.hostName"
-        },
+        "description": "Host name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
+        "optional": false,
         "constraints": {
           "notEmpty": true
         },
-        "condition": {
-          "property": "connectionType",
-          "equals": "credentials"
-        }
-      },
-      {
-        "label": "Virtual host",
-        "description": "Virtual name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound#routing-data-1\"target=\"_blank\">documentation</a>",
         "group": "routing",
-        "type": "String",
         "binding": {
-          "type": "zeebe:property",
-          "name": "routing.virtualHost"
-        },
-        "constraints": {
-          "notEmpty": true
+          "name": "routing.hostName",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "connectionType",
-          "equals": "credentials"
-        }
+          "property": "authentication.authType",
+          "equals": "credentials",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
+        "id": "routing.port",
         "label": "Port",
-        "description": "Port: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound#routing-data-1\"target=\"_blank\">documentation</a>",
-        "group": "routing",
-        "type": "String",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "routing.port"
-        },
+        "description": "Port: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
+        "optional": false,
         "constraints": {
           "notEmpty": true
         },
+        "group": "routing",
+        "binding": {
+          "name": "routing.port",
+          "type": "zeebe:property"
+        },
         "condition": {
-          "property": "connectionType",
-          "equals": "credentials"
-        }
+          "property": "authentication.authType",
+          "equals": "credentials",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
+        "id": "queueName",
         "label": "Queue name",
         "description": "Name of the queue to subscribe to",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
         "group": "subscription",
-        "type": "String",
-        "feel": "optional",
         "binding": {
-          "type": "zeebe:property",
-          "name": "queueName"
+          "name": "queueName",
+          "type": "zeebe:property"
         },
-        "constraints": {
-          "notEmpty": true
-        }
+        "type": "String"
       },
       {
+        "id": "consumerTag",
         "label": "Consumer tag",
         "description": "Consumer tag to use for the subscription",
+        "optional": false,
         "group": "subscription",
-        "type": "String",
-        "feel": "optional",
         "binding": {
-          "type": "zeebe:property",
-          "name": "consumerTag"
-        }
+          "name": "consumerTag",
+          "type": "zeebe:property"
+        },
+        "type": "String"
       },
       {
+        "id": "arguments",
         "label": "Arguments",
         "description": "Arguments to use for the subscription",
-        "group": "subscription",
-        "type": "String",
+        "optional": true,
         "feel": "required",
+        "group": "subscription",
         "binding": {
-          "type": "zeebe:property",
-          "name": "arguments"
-        }
+          "name": "arguments",
+          "type": "zeebe:property"
+        },
+        "type": "String"
       },
       {
+        "id": "exclusive",
         "label": "Exclusive consumer",
-        "group": "subscription",
-        "type": "Dropdown",
+        "optional": false,
         "value": "false",
+        "group": "subscription",
         "binding": {
-          "type": "zeebe:property",
-          "name": "exclusive"
+          "name": "exclusive",
+          "type": "zeebe:property"
         },
+        "type": "Dropdown",
         "choices": [
           {
             "name": "Yes",
@@ -1211,93 +1247,205 @@
         ]
       },
       {
-        "label": "Correlation key (process)",
-        "type": "String",
-        "group": "activation",
+        "id": "activationCondition",
+        "label": "Activation condition",
+        "description": "Condition under which the Connector triggers. Leave empty to catch all events",
+        "optional": true,
         "feel": "required",
-        "description": "Sets up the correlation key from process variables",
+        "group": "activation",
         "binding": {
-          "type": "bpmn:Message#zeebe:subscription#property",
-          "name": "correlationKey"
+          "name": "activationCondition",
+          "type": "zeebe:property"
+        },
+        "type": "String"
+      },
+      {
+        "id": "consumeUnmatchedEvents",
+        "label": "Consume unmatched events",
+        "value": true,
+        "group": "activation",
+        "binding": {
+          "name": "consumeUnmatchedEvents",
+          "type": "zeebe:property"
         },
+        "tooltip": "Unmatched events are rejected by default, allowing the upstream service to handle the error. Check this box to consume unmatched events and return a success response",
+        "type": "Boolean"
+      },
+      {
+        "id": "correlationKeyProcess",
+        "label": "Correlation key (process)",
+        "description": "Sets up the correlation key from process variables",
         "constraints": {
           "notEmpty": true
-        }
+        },
+        "feel": "required",
+        "group": "correlation",
+        "binding": {
+          "name": "correlationKey",
+          "type": "bpmn:Message#zeebe:subscription#property"
+        },
+        "type": "String"
       },
       {
+        "id": "correlationKeyPayload",
         "label": "Correlation key (payload)",
-        "type": "String",
-        "group": "activation",
+        "description": "Extracts the correlation key from the incoming message payload",
+        "constraints": {
+          "notEmpty": true
+        },
         "feel": "required",
+        "group": "correlation",
         "binding": {
-          "type": "zeebe:property",
-          "name": "correlationKeyExpression"
+          "name": "correlationKeyExpression",
+          "type": "zeebe:property"
+        },
+        "type": "String"
+      },
+      {
+        "id": "messageIdExpression",
+        "label": "Message ID expression",
+        "description": "Expression to extract unique identifier of a message",
+        "optional": true,
+        "feel": "required",
+        "group": "correlation",
+        "binding": {
+          "name": "messageIdExpression",
+          "type": "zeebe:property"
+        },
+        "type": "String"
+      },
+      {
+        "id": "messageTtl",
+        "label": "Message TTL",
+        "description": "Time-to-live for the message in the broker (ISO-8601 duration)",
+        "optional": true,
+        "constraints": {
+          "notEmpty": false,
+          "pattern": {
+            "value": "^(PT.*|)$",
+            "message": "must be an ISO-8601 duration"
+          }
+        },
+        "feel": "optional",
+        "group": "correlation",
+        "binding": {
+          "name": "messageTtl",
+          "type": "zeebe:property"
+        },
+        "type": "String"
+      },
+      {
+        "id": "messageNameUuid",
+        "generatedValue": {
+          "type": "uuid"
+        },
+        "group": "correlation",
+        "binding": {
+          "name": "name",
+          "type": "bpmn:Message#property"
+        },
+        "type": "Hidden"
+      },
+      {
+        "id": "deduplicationModeManualFlag",
+        "label": "Manual mode",
+        "description": "By default, similar connectors receive the same deduplication ID. Customize by activating manual mode",
+        "value": false,
+        "group": "deduplication",
+        "binding": {
+          "name": "deduplicationModeManualFlag",
+          "type": "zeebe:property"
+        },
+        "type": "Boolean"
+      },
+      {
+        "id": "deduplicationId",
+        "label": "Deduplication ID",
+        "constraints": {
+          "notEmpty": true,
+          "pattern": {
+            "value": "^[a-zA-Z0-9_-]+$",
+            "message": "can only contain alphanumeric characters, dashes, and underscores"
+          }
+        },
+        "group": "deduplication",
+        "binding": {
+          "name": "deduplicationId",
+          "type": "zeebe:property"
         },
-        "description": "Extracts the correlation key from the incoming message payload",
-        "constraints": {
-          "notEmpty": true
-        }
+        "condition": {
+          "property": "deduplicationModeManualFlag",
+          "equals": true,
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
-        "label": "Message ID expression",
-        "feel": "required",
-        "type": "String",
-        "optional": true,
-        "group": "activation",
+        "id": "deduplicationModeManual",
+        "value": "MANUAL",
+        "group": "deduplication",
         "binding": {
-          "type": "zeebe:property",
-          "name": "messageIdExpression"
+          "name": "deduplicationMode",
+          "type": "zeebe:property"
         },
-        "description": "Expression to extract unique identifier of a message"
+        "condition": {
+          "property": "deduplicationId",
+          "isActive": true,
+          "type": "simple"
+        },
+        "type": "Hidden"
       },
       {
-        "label": "Activation condition",
-        "type": "String",
-        "group": "activation",
-        "feel": "required",
-        "optional": true,
+        "id": "deduplicationModeAuto",
+        "value": "AUTO",
+        "group": "deduplication",
         "binding": {
-          "type": "zeebe:property",
-          "name": "activationCondition"
+          "name": "deduplicationMode",
+          "type": "zeebe:property"
         },
-        "description": "Condition under which the connector triggers. Leave empty to catch all events"
+        "condition": {
+          "property": "deduplicationId",
+          "isActive": false,
+          "type": "simple"
+        },
+        "type": "Hidden"
       },
       {
+        "id": "resultVariable",
         "label": "Result variable",
-        "type": "String",
-        "group": "variable-mapping",
-        "optional": true,
+        "description": "Name of variable to store the response in",
+        "group": "output",
         "binding": {
-          "type": "zeebe:property",
-          "name": "resultVariable"
+          "name": "resultVariable",
+          "type": "zeebe:property"
         },
-        "description": "Name of variable to store the result of the connector in"
+        "type": "String"
       },
       {
+        "id": "resultExpression",
         "label": "Result expression",
-        "type": "String",
-        "group": "variable-mapping",
+        "description": "Expression to map the response into process variables",
         "feel": "required",
-        "optional": true,
+        "group": "output",
         "binding": {
-          "type": "zeebe:property",
-          "name": "resultExpression"
+          "name": "resultExpression",
+          "type": "zeebe:property"
         },
-        "description": "Expression to map the inbound payload to process variables"
+        "type": "Text"
       }
     ],
     "icon": {
-      "contents": "data:image/svg+xml;utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='-7.5 0 271 271' preserveAspectRatio='xMidYMid'%3E%3Cpath d='M245.44 108.308h-85.09a7.738 7.738 0 0 1-7.735-7.734v-88.68C152.615 5.327 147.29 0 140.726 0h-30.375c-6.568 0-11.89 5.327-11.89 11.894v88.143c0 4.573-3.697 8.29-8.27 8.31l-27.885.133c-4.612.025-8.359-3.717-8.35-8.325l.173-88.241C54.144 5.337 48.817 0 42.24 0H11.89C5.321 0 0 5.327 0 11.894V260.21c0 5.834 4.726 10.56 10.555 10.56H245.44c5.834 0 10.56-4.726 10.56-10.56V118.868c0-5.834-4.726-10.56-10.56-10.56zm-39.902 93.233c0 7.645-6.198 13.844-13.843 13.844H167.69c-7.646 0-13.844-6.199-13.844-13.844v-24.005c0-7.646 6.198-13.844 13.844-13.844h24.005c7.645 0 13.843 6.198 13.843 13.844v24.005z' fill='%23F60'/%3E%3C/svg%3E"
+      "contents": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxOCcgaGVpZ2h0PScxOCcgdmlld0JveD0nLTcuNSAwIDI3MSAyNzEnIHByZXNlcnZlQXNwZWN0UmF0aW89J3hNaWRZTWlkJz4KICAgIDxwYXRoIGQ9J00yNDUuNDQgMTA4LjMwOGgtODUuMDlhNy43MzggNy43MzggMCAwIDEtNy43MzUtNy43MzR2LTg4LjY4QzE1Mi42MTUgNS4zMjcgMTQ3LjI5IDAgMTQwLjcyNiAwaC0zMC4zNzVjLTYuNTY4IDAtMTEuODkgNS4zMjctMTEuODkgMTEuODk0djg4LjE0M2MwIDQuNTczLTMuNjk3IDguMjktOC4yNyA4LjMxbC0yNy44ODUuMTMzYy00LjYxMi4wMjUtOC4zNTktMy43MTctOC4zNS04LjMyNWwuMTczLTg4LjI0MUM1NC4xNDQgNS4zMzcgNDguODE3IDAgNDIuMjQgMEgxMS44OUM1LjMyMSAwIDAgNS4zMjcgMCAxMS44OTRWMjYwLjIxYzAgNS44MzQgNC43MjYgMTAuNTYgMTAuNTU1IDEwLjU2SDI0NS40NGM1LjgzNCAwIDEwLjU2LTQuNzI2IDEwLjU2LTEwLjU2VjExOC44NjhjMC01LjgzNC00LjcyNi0xMC41Ni0xMC41Ni0xMC41NnptLTM5LjkwMiA5My4yMzNjMCA3LjY0NS02LjE5OCAxMy44NDQtMTMuODQzIDEzLjg0NEgxNjcuNjljLTcuNjQ2IDAtMTMuODQ0LTYuMTk5LTEzLjg0NC0xMy44NDR2LTI0LjAwNWMwLTcuNjQ2IDYuMTk4LTEzLjg0NCAxMy44NDQtMTMuODQ0aDI0LjAwNWM3LjY0NSAwIDEzLjg0MyA2LjE5OCAxMy44NDMgMTMuODQ0djI0LjAwNXonCiAgICAgICAgICBmaWxsPScjRjYwJy8+Cjwvc3ZnPg=="
     },
     "engines": {
-      "camunda": "^8.4"
+      "camunda": "^8.6"
     }
   },
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "RabbitMQ Intermediate Catch Event Connector",
+    "name": "RabbitMQ connector",
     "id": "io.camunda.connectors.inbound.RabbitMQ.Intermediate.v1",
-    "version": 3,
+    "version": 1,
     "description": "Receive a message from RabbitMQ",
     "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq-inbound",
     "category": {
@@ -1383,7 +1531,7 @@
         "constraints": {
           "notEmpty": true,
           "pattern": {
-            "value": "^(amqps?://)|(\\{\\{secrets\\..+\\}\\}).*$",
+            "value": "^(amqps?://)|(secrets).*",
             "message": "Must start with amqp(s):// or contain a secret reference"
           }
         },
@@ -1606,9 +1754,9 @@
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
     "name": "RabbitMQ Intermediate Catch Event Connector",
     "id": "io.camunda.connectors.inbound.RabbitMQ.Intermediate.v1",
+    "version": 3,
     "description": "Receive a message from RabbitMQ",
-    "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound",
-    "version": 7,
+    "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq-inbound",
     "category": {
       "id": "connectors",
       "name": "Connectors"
@@ -1636,39 +1784,39 @@
         "label": "Activation"
       },
       {
-        "id": "correlation",
-        "label": "Correlation",
-        "tooltip": "Learn more about message correlation in the <a href=\"https://docs.camunda.io/docs/components/concepts/messages/#message-correlation-overview\">documentation</a>."
-      },
-      {
-        "id": "deduplication",
-        "label": "Deduplication",
-        "tooltip": "Deduplication allows you to configure multiple inbound connector elements to reuse the same backend (consumer/thread/endpoint) by sharing the same deduplication ID."
-      },
-      {
-        "id": "output",
-        "label": "Output mapping"
+        "id": "variable-mapping",
+        "label": "Variable mapping"
       }
     ],
     "properties": [
       {
+        "type": "Hidden",
         "value": "io.camunda:connector-rabbitmq-inbound:1",
         "binding": {
-          "name": "inbound.type",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.type"
+        }
+      },
+      {
+        "type": "Hidden",
+        "generatedValue": {
+          "type": "uuid"
         },
-        "type": "Hidden"
+        "binding": {
+          "type": "bpmn:Message#property",
+          "name": "name"
+        }
       },
       {
-        "id": "authentication.authType",
+        "id": "connectionType",
         "label": "Connection type",
-        "value": "uri",
         "group": "authentication",
+        "type": "Dropdown",
+        "value": "uri",
         "binding": {
-          "name": "authentication.authType",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "authentication.authType"
         },
-        "type": "Dropdown",
         "choices": [
           {
             "name": "URI",
@@ -1681,178 +1829,154 @@
         ]
       },
       {
-        "id": "authentication.uri",
         "label": "URI",
         "description": "URI should contain username, password, host name, port number, and virtual host",
-        "optional": false,
+        "group": "authentication",
+        "type": "String",
+        "binding": {
+          "type": "zeebe:property",
+          "name": "authentication.uri"
+        },
         "constraints": {
           "notEmpty": true,
           "pattern": {
-            "value": "^(=|(amqps?://|secrets|\\{\\{).*$)",
+            "value": "^(amqps?://)|(\\{\\{secrets\\..+\\}\\}).*$",
             "message": "Must start with amqp(s):// or contain a secret reference"
           }
         },
-        "group": "authentication",
-        "binding": {
-          "name": "authentication.uri",
-          "type": "zeebe:property"
-        },
         "condition": {
-          "property": "authentication.authType",
-          "equals": "uri",
-          "type": "simple"
-        },
-        "type": "String"
+          "property": "connectionType",
+          "equals": "uri"
+        }
       },
       {
-        "id": "authentication.userName",
         "label": "Username",
-        "optional": false,
-        "constraints": {
-          "notEmpty": true
-        },
         "group": "authentication",
+        "type": "String",
         "binding": {
-          "name": "authentication.userName",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "authentication.userName"
         },
-        "condition": {
-          "property": "authentication.authType",
-          "equals": "credentials",
-          "type": "simple"
+        "constraints": {
+          "notEmpty": true
         },
-        "type": "String"
+        "condition": {
+          "property": "connectionType",
+          "equals": "credentials"
+        }
       },
       {
-        "id": "authentication.password",
         "label": "Password",
-        "optional": false,
-        "constraints": {
-          "notEmpty": true
-        },
         "group": "authentication",
+        "type": "String",
         "binding": {
-          "name": "authentication.password",
-          "type": "zeebe:property"
-        },
-        "condition": {
-          "property": "authentication.authType",
-          "equals": "credentials",
-          "type": "simple"
+          "type": "zeebe:property",
+          "name": "authentication.password"
         },
-        "type": "String"
-      },
-      {
-        "id": "routing.virtualHost",
-        "label": "Virtual host",
-        "description": "Virtual name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
-        "optional": false,
         "constraints": {
           "notEmpty": true
         },
-        "group": "routing",
-        "binding": {
-          "name": "routing.virtualHost",
-          "type": "zeebe:property"
-        },
         "condition": {
-          "property": "authentication.authType",
-          "equals": "credentials",
-          "type": "simple"
-        },
-        "type": "String"
+          "property": "connectionType",
+          "equals": "credentials"
+        }
       },
       {
-        "id": "routing.hostName",
         "label": "Host name",
-        "description": "Host name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
-        "optional": false,
+        "description": "Host name: get from RabbitMQ external applocation configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/#routing-data\"target=\"_blank\">documentation</a>",
+        "group": "routing",
+        "type": "String",
+        "binding": {
+          "type": "zeebe:property",
+          "name": "routing.hostName"
+        },
         "constraints": {
           "notEmpty": true
         },
+        "condition": {
+          "property": "connectionType",
+          "equals": "credentials"
+        }
+      },
+      {
+        "label": "Virtual host",
+        "description": "Virtual name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/#routing-data\"target=\"_blank\">documentation</a>",
         "group": "routing",
+        "type": "String",
         "binding": {
-          "name": "routing.hostName",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "routing.virtualHost"
         },
-        "condition": {
-          "property": "authentication.authType",
-          "equals": "credentials",
-          "type": "simple"
+        "constraints": {
+          "notEmpty": true
         },
-        "type": "String"
+        "condition": {
+          "property": "connectionType",
+          "equals": "credentials"
+        }
       },
       {
-        "id": "routing.port",
         "label": "Port",
-        "description": "Port: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
-        "optional": false,
-        "constraints": {
-          "notEmpty": true
-        },
+        "description": "Port: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/#routing-data\"target=\"_blank\">documentation</a>",
         "group": "routing",
+        "type": "String",
         "binding": {
-          "name": "routing.port",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "routing.port"
+        },
+        "constraints": {
+          "notEmpty": true
         },
         "condition": {
-          "property": "authentication.authType",
-          "equals": "credentials",
-          "type": "simple"
-        },
-        "type": "String"
+          "property": "connectionType",
+          "equals": "credentials"
+        }
       },
       {
-        "id": "queueName",
         "label": "Queue name",
         "description": "Name of the queue to subscribe to",
-        "optional": false,
-        "constraints": {
-          "notEmpty": true
-        },
         "group": "subscription",
+        "type": "String",
+        "feel": "optional",
         "binding": {
-          "name": "queueName",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "queueName"
         },
-        "type": "String"
+        "constraints": {
+          "notEmpty": true
+        }
       },
       {
-        "id": "consumerTag",
         "label": "Consumer tag",
         "description": "Consumer tag to use for the subscription",
-        "optional": false,
         "group": "subscription",
+        "type": "String",
+        "feel": "optional",
         "binding": {
-          "name": "consumerTag",
-          "type": "zeebe:property"
-        },
-        "type": "String"
+          "type": "zeebe:property",
+          "name": "consumerTag"
+        }
       },
       {
-        "id": "arguments",
         "label": "Arguments",
         "description": "Arguments to use for the subscription",
-        "optional": true,
-        "feel": "required",
         "group": "subscription",
+        "type": "String",
+        "feel": "required",
         "binding": {
-          "name": "arguments",
-          "type": "zeebe:property"
-        },
-        "type": "String"
+          "type": "zeebe:property",
+          "name": "arguments"
+        }
       },
       {
-        "id": "exclusive",
         "label": "Exclusive consumer",
-        "optional": false,
-        "value": "false",
         "group": "subscription",
+        "type": "Dropdown",
+        "value": "false",
         "binding": {
-          "name": "exclusive",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "exclusive"
         },
-        "type": "Dropdown",
         "choices": [
           {
             "name": "Yes",
@@ -1865,198 +1989,74 @@
         ]
       },
       {
-        "id": "activationCondition",
-        "label": "Activation condition",
-        "description": "Condition under which the Connector triggers. Leave empty to catch all events",
-        "optional": true,
-        "feel": "required",
+        "label": "Correlation key (process)",
+        "type": "String",
         "group": "activation",
+        "feel": "required",
+        "description": "Sets up the correlation key from process variables",
         "binding": {
-          "name": "activationCondition",
-          "type": "zeebe:property"
+          "type": "bpmn:Message#zeebe:subscription#property",
+          "name": "correlationKey"
         },
-        "type": "String"
+        "constraints": {
+          "notEmpty": true
+        }
       },
       {
-        "id": "consumeUnmatchedEvents",
-        "label": "Consume unmatched events",
-        "value": true,
+        "label": "Correlation key (payload)",
+        "type": "String",
         "group": "activation",
-        "binding": {
-          "name": "consumeUnmatchedEvents",
-          "type": "zeebe:property"
-        },
-        "tooltip": "Unmatched events are rejected by default, allowing the upstream service to handle the error. Check this box to consume unmatched events and return a success response",
-        "type": "Boolean"
-      },
-      {
-        "id": "correlationKeyProcess",
-        "label": "Correlation key (process)",
-        "description": "Sets up the correlation key from process variables",
-        "constraints": {
-          "notEmpty": true
-        },
         "feel": "required",
-        "group": "correlation",
         "binding": {
-          "name": "correlationKey",
-          "type": "bpmn:Message#zeebe:subscription#property"
+          "type": "zeebe:property",
+          "name": "correlationKeyExpression"
         },
-        "type": "String"
-      },
-      {
-        "id": "correlationKeyPayload",
-        "label": "Correlation key (payload)",
         "description": "Extracts the correlation key from the incoming message payload",
         "constraints": {
           "notEmpty": true
-        },
-        "feel": "required",
-        "group": "correlation",
-        "binding": {
-          "name": "correlationKeyExpression",
-          "type": "zeebe:property"
-        },
-        "type": "String"
+        }
       },
       {
-        "id": "messageIdExpression",
-        "label": "Message ID expression",
-        "description": "Expression to extract unique identifier of a message",
-        "optional": true,
+        "label": "Activation condition",
+        "type": "String",
+        "group": "activation",
         "feel": "required",
-        "group": "correlation",
-        "binding": {
-          "name": "messageIdExpression",
-          "type": "zeebe:property"
-        },
-        "type": "String"
-      },
-      {
-        "id": "messageTtl",
-        "label": "Message TTL",
-        "description": "Time-to-live for the message in the broker (ISO-8601 duration)",
         "optional": true,
-        "constraints": {
-          "notEmpty": false,
-          "pattern": {
-            "value": "^(PT.*|)$",
-            "message": "must be an ISO-8601 duration"
-          }
-        },
-        "feel": "optional",
-        "group": "correlation",
-        "binding": {
-          "name": "messageTtl",
-          "type": "zeebe:property"
-        },
-        "type": "String"
-      },
-      {
-        "id": "messageNameUuid",
-        "generatedValue": {
-          "type": "uuid"
-        },
-        "group": "correlation",
-        "binding": {
-          "name": "name",
-          "type": "bpmn:Message#property"
-        },
-        "type": "Hidden"
-      },
-      {
-        "id": "deduplicationModeManualFlag",
-        "label": "Manual mode",
-        "description": "By default, similar connectors receive the same deduplication ID. Customize by activating manual mode",
-        "value": false,
-        "group": "deduplication",
-        "binding": {
-          "name": "deduplicationModeManualFlag",
-          "type": "zeebe:property"
-        },
-        "type": "Boolean"
-      },
-      {
-        "id": "deduplicationId",
-        "label": "Deduplication ID",
-        "constraints": {
-          "notEmpty": true,
-          "pattern": {
-            "value": "^[a-zA-Z0-9_-]+$",
-            "message": "can only contain alphanumeric characters, dashes, and underscores"
-          }
-        },
-        "group": "deduplication",
-        "binding": {
-          "name": "deduplicationId",
-          "type": "zeebe:property"
-        },
-        "condition": {
-          "property": "deduplicationModeManualFlag",
-          "equals": true,
-          "type": "simple"
-        },
-        "type": "String"
-      },
-      {
-        "id": "deduplicationModeManual",
-        "value": "MANUAL",
-        "group": "deduplication",
-        "binding": {
-          "name": "deduplicationMode",
-          "type": "zeebe:property"
-        },
-        "condition": {
-          "property": "deduplicationId",
-          "isActive": true,
-          "type": "simple"
-        },
-        "type": "Hidden"
-      },
-      {
-        "id": "deduplicationModeAuto",
-        "value": "AUTO",
-        "group": "deduplication",
         "binding": {
-          "name": "deduplicationMode",
-          "type": "zeebe:property"
-        },
-        "condition": {
-          "property": "deduplicationId",
-          "isActive": false,
-          "type": "simple"
+          "type": "zeebe:property",
+          "name": "activationCondition"
         },
-        "type": "Hidden"
+        "description": "Condition under which the connector triggers. Leave empty to catch all events"
       },
       {
-        "id": "resultVariable",
         "label": "Result variable",
-        "description": "Name of variable to store the response in",
-        "group": "output",
+        "type": "String",
+        "group": "variable-mapping",
+        "optional": true,
         "binding": {
-          "name": "resultVariable",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "resultVariable"
         },
-        "type": "String"
+        "description": "Name of variable to store the result of the connector in"
       },
       {
-        "id": "resultExpression",
         "label": "Result expression",
-        "description": "Expression to map the response into process variables",
+        "type": "String",
+        "group": "variable-mapping",
         "feel": "required",
-        "group": "output",
+        "optional": true,
         "binding": {
-          "name": "resultExpression",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "resultExpression"
         },
-        "type": "Text"
+        "description": "Expression to map the inbound payload to process variables"
       }
     ],
     "icon": {
-      "contents": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxOCcgaGVpZ2h0PScxOCcgdmlld0JveD0nLTcuNSAwIDI3MSAyNzEnIHByZXNlcnZlQXNwZWN0UmF0aW89J3hNaWRZTWlkJz4KICAgIDxwYXRoIGQ9J00yNDUuNDQgMTA4LjMwOGgtODUuMDlhNy43MzggNy43MzggMCAwIDEtNy43MzUtNy43MzR2LTg4LjY4QzE1Mi42MTUgNS4zMjcgMTQ3LjI5IDAgMTQwLjcyNiAwaC0zMC4zNzVjLTYuNTY4IDAtMTEuODkgNS4zMjctMTEuODkgMTEuODk0djg4LjE0M2MwIDQuNTczLTMuNjk3IDguMjktOC4yNyA4LjMxbC0yNy44ODUuMTMzYy00LjYxMi4wMjUtOC4zNTktMy43MTctOC4zNS04LjMyNWwuMTczLTg4LjI0MUM1NC4xNDQgNS4zMzcgNDguODE3IDAgNDIuMjQgMEgxMS44OUM1LjMyMSAwIDAgNS4zMjcgMCAxMS44OTRWMjYwLjIxYzAgNS44MzQgNC43MjYgMTAuNTYgMTAuNTU1IDEwLjU2SDI0NS40NGM1LjgzNCAwIDEwLjU2LTQuNzI2IDEwLjU2LTEwLjU2VjExOC44NjhjMC01LjgzNC00LjcyNi0xMC41Ni0xMC41Ni0xMC41NnptLTM5LjkwMiA5My4yMzNjMCA3LjY0NS02LjE5OCAxMy44NDQtMTMuODQzIDEzLjg0NEgxNjcuNjljLTcuNjQ2IDAtMTMuODQ0LTYuMTk5LTEzLjg0NC0xMy44NDR2LTI0LjAwNWMwLTcuNjQ2IDYuMTk4LTEzLjg0NCAxMy44NDQtMTMuODQ0aDI0LjAwNWM3LjY0NSAwIDEzLjg0MyA2LjE5OCAxMy44NDMgMTMuODQ0djI0LjAwNXonCiAgICAgICAgICBmaWxsPScjRjYwJy8+Cjwvc3ZnPg=="
+      "contents": "data:image/svg+xml;utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='-7.5 0 271 271' preserveAspectRatio='xMidYMid'%3E%3Cpath d='M245.44 108.308h-85.09a7.738 7.738 0 0 1-7.735-7.734v-88.68C152.615 5.327 147.29 0 140.726 0h-30.375c-6.568 0-11.89 5.327-11.89 11.894v88.143c0 4.573-3.697 8.29-8.27 8.31l-27.885.133c-4.612.025-8.359-3.717-8.35-8.325l.173-88.241C54.144 5.337 48.817 0 42.24 0H11.89C5.321 0 0 5.327 0 11.894V260.21c0 5.834 4.726 10.56 10.555 10.56H245.44c5.834 0 10.56-4.726 10.56-10.56V118.868c0-5.834-4.726-10.56-10.56-10.56zm-39.902 93.233c0 7.645-6.198 13.844-13.843 13.844H167.69c-7.646 0-13.844-6.199-13.844-13.844v-24.005c0-7.646 6.198-13.844 13.844-13.844h24.005c7.645 0 13.843 6.198 13.843 13.844v24.005z' fill='%23F60'/%3E%3C/svg%3E"
     },
     "engines": {
-      "camunda": "^8.6"
+      "camunda": "^8.2"
     }
   },
   {
@@ -2152,7 +2152,6 @@
       {
         "id": "authentication.uri",
         "label": "URI",
-        "description": "URI should contain username, password, host name, port number, and virtual host",
         "optional": false,
         "constraints": {
           "notEmpty": true,
@@ -2171,6 +2170,7 @@
           "equals": "uri",
           "type": "simple"
         },
+        "tooltip": "URI should contain username, password, host name, port number, and virtual host",
         "type": "String"
       },
       {
@@ -2214,7 +2214,6 @@
       {
         "id": "routing.virtualHost",
         "label": "Virtual host",
-        "description": "Virtual name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
         "optional": false,
         "constraints": {
           "notEmpty": true
@@ -2229,12 +2228,12 @@
           "equals": "credentials",
           "type": "simple"
         },
+        "tooltip": "Get from RabbitMQ external application configurations. See the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\" target=\"_blank\">RabbitMQ routing data docs</a>",
         "type": "String"
       },
       {
         "id": "routing.hostName",
         "label": "Host name",
-        "description": "Host name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
         "optional": false,
         "constraints": {
           "notEmpty": true
@@ -2249,12 +2248,12 @@
           "equals": "credentials",
           "type": "simple"
         },
+        "tooltip": "Get from RabbitMQ external application configurations. See the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\" target=\"_blank\">RabbitMQ routing data docs</a>",
         "type": "String"
       },
       {
         "id": "routing.port",
         "label": "Port",
-        "description": "Port: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
         "optional": false,
         "constraints": {
           "notEmpty": true
@@ -2269,12 +2268,12 @@
           "equals": "credentials",
           "type": "simple"
         },
+        "tooltip": "Get from RabbitMQ external application configurations. See the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\" target=\"_blank\">RabbitMQ routing data docs</a>",
         "type": "String"
       },
       {
         "id": "queueName",
         "label": "Queue name",
-        "description": "Name of the queue to subscribe to",
         "optional": false,
         "constraints": {
           "notEmpty": true
@@ -2284,12 +2283,12 @@
           "name": "queueName",
           "type": "zeebe:property"
         },
+        "tooltip": "Name of the queue to subscribe to",
         "type": "String"
       },
       {
         "id": "consumerTag",
         "label": "Consumer tag",
-        "description": "Consumer tag to use for the subscription",
         "optional": false,
         "group": "subscription",
         "binding": {
@@ -2301,7 +2300,6 @@
       {
         "id": "arguments",
         "label": "Arguments",
-        "description": "Arguments to use for the subscription",
         "optional": true,
         "feel": "required",
         "group": "subscription",