@camunda/connectors-element-templates 1.0.17 → 1.0.18

package/src/element-templates/webhook-connector-intermediate.json

@@ -1,11 +1,20 @@
 [
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "Webhook Intermediate Catch Event Connector",
+    "name": "Webhook Intermediate Event Connector",
     "id": "io.camunda.connectors.webhook.WebhookConnectorIntermediate.v1",
-    "version": 6,
     "description": "Configure webhook to receive callbacks",
-    "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
+    "keywords": [
+      "receive webhook",
+      "HTTP trigger",
+      "event received",
+      "inbound event",
+      "webhook trigger",
+      "HTTP callback",
+      "listen for event"
+    ],
+    "documentationRef": "https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/",
+    "version": 14,
     "category": {
       "id": "connectors",
       "name": "Connectors"
@@ -15,6 +24,9 @@
       "value": "bpmn:IntermediateCatchEvent",
       "eventDefinition": "bpmn:MessageEventDefinition"
     },
+    "engines": {
+      "camunda": "^8.3"
+    },
     "groups": [
       {
         "id": "endpoint",
@@ -28,52 +40,53 @@
         "id": "authorization",
         "label": "Authorization"
       },
+      {
+        "id": "webhookResponse",
+        "label": "Webhook response"
+      },
       {
         "id": "activation",
         "label": "Activation"
       },
       {
-        "id": "variable-mapping",
-        "label": "Variable mapping"
+        "id": "synchronousResponse",
+        "label": "Response mode"
       },
       {
-        "id": "webhookResponse",
-        "label": "Webhook response"
+        "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:webhook: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",
-        "value": "ConfigurableInboundWebhook",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.subtype"
-        }
+        "type": "Hidden"
       },
       {
-        "id": "webhookMethod",
+        "id": "inbound.method",
         "label": "Webhook method",
-        "group": "endpoint",
         "description": "Select HTTP method",
+        "optional": false,
         "value": "any",
+        "group": "endpoint",
+        "binding": {
+          "name": "inbound.method",
+          "type": "zeebe:property"
+        },
         "type": "Dropdown",
         "choices": [
           {
@@ -81,50 +94,53 @@
             "value": "any"
           },
           {
-            "name": "Get",
+            "name": "GET",
             "value": "get"
           },
           {
-            "name": "Post",
+            "name": "POST",
             "value": "post"
           },
           {
-            "name": "Put",
+            "name": "PUT",
             "value": "put"
           },
           {
-            "name": "Delete",
+            "name": "DELETE",
             "value": "delete"
           }
-        ],
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.method"
-        }
+        ]
       },
       {
+        "id": "inbound.context",
         "label": "Webhook ID",
-        "type": "String",
-        "group": "endpoint",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.context"
-        },
         "description": "The webhook ID is a part of the URL",
+        "optional": false,
         "constraints": {
           "notEmpty": true,
           "pattern": {
             "value": "^[a-zA-Z0-9]+([-_][a-zA-Z0-9]+)*$",
             "message": "can only contain letters, numbers, or single underscores/hyphens and cannot begin or end with an underscore/hyphen"
           }
-        }
+        },
+        "group": "endpoint",
+        "binding": {
+          "name": "inbound.context",
+          "type": "zeebe:property"
+        },
+        "type": "String"
       },
       {
-        "id": "shouldValidateHmac",
+        "id": "inbound.shouldValidateHmac",
         "label": "HMAC authentication",
-        "group": "authentication",
-        "description": "Choose whether HMAC verification is enabled. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a> and <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#example' target='_blank'>example</a> that explains how to use HMAC-related fields",
+        "description": "Choose whether HMAC verification is enabled. <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a> and <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#example' target='_blank'>example</a> that explains how to use HMAC-related fields",
+        "optional": false,
         "value": "disabled",
+        "group": "authentication",
+        "binding": {
+          "name": "inbound.shouldValidateHmac",
+          "type": "zeebe:property"
+        },
         "type": "Dropdown",
         "choices": [
           {
@@ -135,47 +151,60 @@
             "name": "Disabled",
             "value": "disabled"
           }
-        ],
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.shouldValidateHmac"
-        }
+        ]
       },
       {
+        "id": "inbound.hmacSecret",
         "label": "HMAC secret key",
         "description": "Shared secret key",
-        "type": "String",
-        "group": "authentication",
         "optional": true,
+        "feel": "optional",
+        "group": "authentication",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.hmacSecret"
+          "name": "inbound.hmacSecret",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "shouldValidateHmac",
-          "equals": "enabled"
-        }
+          "property": "inbound.shouldValidateHmac",
+          "equals": "enabled",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
+        "id": "inbound.hmacHeader",
         "label": "HMAC header",
         "description": "Name of header attribute that will contain the HMAC value",
-        "type": "String",
-        "group": "authentication",
         "optional": true,
+        "feel": "optional",
+        "group": "authentication",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.hmacHeader"
+          "name": "inbound.hmacHeader",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "shouldValidateHmac",
-          "equals": "enabled"
-        }
+          "property": "inbound.shouldValidateHmac",
+          "equals": "enabled",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
+        "id": "inbound.hmacAlgorithm",
         "label": "HMAC algorithm",
-        "group": "authentication",
         "description": "Choose HMAC algorithm",
+        "optional": false,
         "value": "sha_256",
+        "group": "authentication",
+        "binding": {
+          "name": "inbound.hmacAlgorithm",
+          "type": "zeebe:property"
+        },
+        "condition": {
+          "property": "inbound.shouldValidateHmac",
+          "equals": "enabled",
+          "type": "simple"
+        },
         "type": "Dropdown",
         "choices": [
           {
@@ -190,295 +219,446 @@
             "name": "SHA-512",
             "value": "sha_512"
           }
-        ],
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.hmacAlgorithm"
-        },
-        "condition": {
-          "property": "shouldValidateHmac",
-          "equals": "enabled"
-        }
+        ]
       },
       {
+        "id": "inbound.hmacScopes",
         "label": "HMAC scopes",
-        "group": "authentication",
-        "description": "Set HMAC scopes for calculating signature data. See <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/' target='_blank'>documentation</a>",
-        "feel": "required",
-        "type": "String",
+        "description": "Set HMAC scopes for calculating signature data. See <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/' target='_blank'>documentation</a>",
         "optional": true,
+        "feel": "required",
+        "group": "authentication",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.hmacScopes"
+          "name": "inbound.hmacScopes",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "shouldValidateHmac",
-          "equals": "enabled"
-        }
+          "property": "inbound.shouldValidateHmac",
+          "equals": "enabled",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
-        "id": "authorizationType",
+        "id": "inbound.auth.type",
         "label": "Authorization type",
-        "group": "authorization",
-        "description": "Choose the authorization type.",
+        "description": "Choose the authorization type",
         "value": "NONE",
+        "group": "authorization",
+        "binding": {
+          "name": "inbound.auth.type",
+          "type": "zeebe:property"
+        },
         "type": "Dropdown",
         "choices": [
           {
             "name": "None",
             "value": "NONE"
           },
-          {
-            "name": "JWT",
-            "value": "JWT"
-          },
           {
             "name": "Basic",
             "value": "BASIC"
           },
           {
-            "name": "API Key",
+            "name": "API key",
             "value": "APIKEY"
+          },
+          {
+            "name": "JWT",
+            "value": "JWT"
           }
-        ],
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.type"
-        }
+        ]
       },
       {
-        "label": "JWK url",
-        "description": "Well-known url of JWKs",
-        "type": "String",
-        "group": "authorization",
+        "id": "inbound.auth.username",
+        "label": "Username",
+        "description": "Username for basic authentication",
+        "optional": false,
         "feel": "optional",
-        "optional": true,
+        "group": "authorization",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.jwt.jwkUrl"
+          "name": "inbound.auth.username",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "authorizationType",
-          "equals": "JWT"
-        }
+          "property": "inbound.auth.type",
+          "equals": "BASIC",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
-        "label": "JWT role property expression",
-        "description": "Expression to extract the roles from the JWT token. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#how-to-extract-roles-from-jwt-data'>See documentation</a>",
-        "type": "String",
+        "id": "inbound.auth.password",
+        "label": "Password",
+        "description": "Password for basic authentication",
+        "optional": false,
+        "feel": "optional",
         "group": "authorization",
-        "feel": "required",
-        "optional": true,
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.jwt.permissionsExpression"
+          "name": "inbound.auth.password",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "authorizationType",
-          "equals": "JWT"
-        }
-      },
-      {
-        "label": "Required roles",
-        "description": "List of roles to test JWT roles against",
-        "type": "String",
+          "property": "inbound.auth.type",
+          "equals": "BASIC",
+          "type": "simple"
+        },
+        "type": "String"
+      },
+      {
+        "id": "inbound.auth.apiKey",
+        "label": "API key",
+        "description": "Expected API key",
+        "optional": false,
+        "feel": "optional",
         "group": "authorization",
-        "feel": "required",
-        "optional": true,
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.jwt.requiredPermissions"
+          "name": "inbound.auth.apiKey",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "authorizationType",
-          "equals": "JWT"
-        }
+          "property": "inbound.auth.type",
+          "equals": "APIKEY",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
-        "label": "Username",
-        "description": "Username for basic authentication",
-        "type": "String",
+        "id": "inbound.auth.apiKeyLocator",
+        "label": "API key locator",
+        "description": "A FEEL expression that extracts API key from the request. <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#how-to-configure-api-key-authorization'>See documentation</a>",
+        "optional": false,
+        "value": "=split(request.headers.authorization, \" \")[2]",
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "required",
         "group": "authorization",
-        "feel": "optional",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.username"
+          "name": "inbound.auth.apiKeyLocator",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "authorizationType",
-          "equals": "BASIC"
+          "property": "inbound.auth.type",
+          "equals": "APIKEY",
+          "type": "simple"
         },
-        "constraints": {
-          "notEmpty": true
-        }
+        "type": "String"
       },
       {
-        "label": "Password",
-        "description": "Password for basic authentication",
-        "type": "String",
-        "group": "authorization",
+        "id": "inbound.auth.jwt.jwkUrl",
+        "label": "JWK URL",
+        "description": "Well-known URL of JWKs",
+        "optional": false,
         "feel": "optional",
+        "group": "authorization",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.password"
+          "name": "inbound.auth.jwt.jwkUrl",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "authorizationType",
-          "equals": "BASIC"
+          "property": "inbound.auth.type",
+          "equals": "JWT",
+          "type": "simple"
         },
-        "constraints": {
-          "notEmpty": true
-        }
+        "type": "String"
       },
       {
-        "label": "API Key",
-        "description": "Expected API key",
-        "type": "String",
+        "id": "inbound.auth.jwt.permissionsExpression",
+        "label": "JWT role property expression",
+        "description": "Expression to extract the roles from the JWT token. <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#how-to-extract-roles-from-jwt-data'>See documentation</a>",
+        "optional": false,
+        "feel": "required",
         "group": "authorization",
-        "feel": "optional",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.apiKey"
+          "name": "inbound.auth.jwt.permissionsExpression",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "authorizationType",
-          "equals": "APIKEY"
+          "property": "inbound.auth.type",
+          "equals": "JWT",
+          "type": "simple"
         },
-        "constraints": {
-          "notEmpty": true
-        }
+        "type": "String"
       },
       {
-        "label": "API Key locator",
-        "description": "A FEEL expression that extracts API key from the request. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#how-to-configure-api-key-authorization'>See documentation</a>",
-        "type": "String",
-        "group": "authorization",
+        "id": "inbound.auth.jwt.requiredPermissions",
+        "label": "Required roles",
+        "description": "List of roles to test JWT roles against",
+        "optional": false,
         "feel": "required",
+        "group": "authorization",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.apiKeyLocator"
+          "name": "inbound.auth.jwt.requiredPermissions",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "authorizationType",
-          "equals": "APIKEY"
-        },
-        "constraints": {
-          "notEmpty": true
+          "property": "inbound.auth.type",
+          "equals": "JWT",
+          "type": "simple"
         },
-        "value": "=split(request.headers.authorization, \" \")[2]"
+        "type": "String"
       },
       {
-        "label": "Correlation key (process)",
-        "type": "String",
-        "group": "activation",
+        "id": "inbound.responseExpression",
+        "label": "Response expression",
+        "description": "Expression used to generate the HTTP response",
+        "optional": true,
         "feel": "required",
-        "description": "Sets up the correlation key from process variables",
+        "group": "webhookResponse",
         "binding": {
-          "type": "bpmn:Message#zeebe:subscription#property",
-          "name": "correlationKey"
+          "name": "inbound.responseExpression",
+          "type": "zeebe:property"
         },
-        "constraints": {
-          "notEmpty": true
-        }
+        "type": "Text"
       },
       {
-        "label": "Correlation key (payload)",
-        "type": "String",
-        "group": "activation",
+        "id": "inbound.verificationExpression",
+        "label": "One time verification response expression",
+        "description": "Specify condition and response. Learn more in the <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#verification-expression' target='_blank'>documentation</a>",
+        "optional": true,
         "feel": "required",
+        "group": "webhookResponse",
         "binding": {
-          "type": "zeebe:property",
-          "name": "correlationKeyExpression"
+          "name": "inbound.verificationExpression",
+          "type": "zeebe:property"
         },
-        "description": "Extracts the correlation key from the incoming message payload",
-        "constraints": {
-          "notEmpty": true
-        }
+        "type": "Text"
       },
       {
-        "label": "Message ID expression",
-        "feel": "required",
-        "type": "String",
+        "id": "activationCondition",
+        "label": "Activation condition",
+        "description": "Condition under which the Connector triggers. Leave empty to catch all events",
         "optional": true,
+        "feel": "required",
         "group": "activation",
         "binding": {
-          "type": "zeebe:property",
-          "name": "messageIdExpression"
+          "name": "activationCondition",
+          "type": "zeebe:property"
         },
-        "description": "Expression to extract unique identifier of a message"
+        "type": "String"
       },
       {
-        "label": "Condition",
-        "type": "String",
+        "id": "consumeUnmatchedEvents",
+        "label": "Consume unmatched events",
+        "value": true,
         "group": "activation",
-        "feel": "required",
-        "optional": true,
         "binding": {
-          "type": "zeebe:property",
-          "name": "activationCondition"
+          "name": "consumeUnmatchedEvents",
+          "type": "zeebe:property"
         },
-        "description": "Condition under which the connector triggers. Leave empty to catch all events. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a>"
+        "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"
       },
       {
-        "label": "Result variable",
-        "type": "String",
-        "group": "variable-mapping",
-        "optional": true,
+        "id": "synchronousResponse",
+        "label": "Response mode",
+        "description": "Synchronous or Asynchronous <a href=\"https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#response-mode\" target=\"_blank\">response handling</a>",
+        "value": "false",
+        "group": "synchronousResponse",
         "binding": {
-          "type": "zeebe:property",
-          "name": "resultVariable"
+          "name": "synchronousResponse",
+          "type": "zeebe:property"
         },
-        "description": "Name of variable to store the result of the connector in"
+        "tooltip": "Select synchronous to wait for the result of the correlation. This is either the result of the created process or the process instance key that matched the correlated message subscription. Select asynchronous to trigger the correlation and return immediately without waiting for a result. This affects the data available in the <a href=\"https://docs.camunda.io/docs/components/connectors/connectors/protocol/http-webhook/#use-the-correlation-object\">correlation</a> object for the response expression.",
+        "type": "Dropdown",
+        "choices": [
+          {
+            "name": "Asynchronous",
+            "value": "false"
+          },
+          {
+            "name": "Synchronous",
+            "value": "true"
+          }
+        ]
       },
       {
-        "label": "Result expression",
-        "type": "String",
-        "group": "variable-mapping",
+        "id": "correlationKeyProcess",
+        "label": "Correlation key (process)",
+        "description": "Sets up the correlation key from process variables",
+        "constraints": {
+          "notEmpty": true
+        },
         "feel": "required",
-        "optional": true,
+        "group": "correlation",
         "binding": {
-          "type": "zeebe:property",
-          "name": "resultExpression"
+          "name": "correlationKey",
+          "type": "bpmn:Message#zeebe:subscription#property"
         },
-        "description": "Expression to map the inbound payload to process variables"
+        "type": "String"
       },
       {
-        "label": "One time verification response expression",
-        "description": "Specify condition and response. Learn more in the <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#verification-expression' target='_blank'>documentation</a>",
-        "type": "Text",
-        "group": "webhookResponse",
+        "id": "correlationKeyPayload",
+        "label": "Correlation key (payload)",
+        "description": "Extracts the correlation key from the incoming message payload",
+        "constraints": {
+          "notEmpty": true
+        },
         "feel": "required",
-        "optional": true,
+        "group": "correlation",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.verificationExpression"
-        }
+          "name": "correlationKeyExpression",
+          "type": "zeebe:property"
+        },
+        "type": "String"
       },
       {
-        "label": "Response body expression",
-        "type": "Text",
-        "group": "webhookResponse",
-        "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": "inbound.responseBodyExpression"
+          "name": "messageIdExpression",
+          "type": "zeebe:property"
         },
-        "description": "Specify condition and response"
+        "condition": {
+          "property": "synchronousResponse",
+          "equals": "false",
+          "type": "simple"
+        },
+        "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"
+        },
+        "condition": {
+          "property": "synchronousResponse",
+          "equals": "false",
+          "type": "simple"
+        },
+        "type": "String"
+      },
+      {
+        "id": "messageNameUuid",
+        "label": "Message name",
+        "generatedValue": {
+          "type": "uuid"
+        },
+        "feel": "optional",
+        "group": "correlation",
+        "binding": {
+          "name": "name",
+          "type": "bpmn:Message#property"
+        },
+        "tooltip": "By default, this is an auto-generated random UUID. We recommend using a unique message name for each connector element in the diagram. Override to set a custom message name. Learn more about <a href=\"https://docs.camunda.io/docs/components/concepts/messages/#message-subscriptions\">message subscriptions</a> that power inbound connectors.",
+        "type": "String"
+      },
+      {
+        "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": "Hidden"
+      },
+      {
+        "id": "resultVariable",
+        "label": "Result variable",
+        "description": "Name of variable to store the response in. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/#result-variable\" target=\"_blank\">documentation</a>.",
+        "group": "output",
+        "binding": {
+          "name": "resultVariable",
+          "type": "zeebe:property"
+        },
+        "type": "String"
+      },
+      {
+        "id": "resultExpression",
+        "label": "Result expression",
+        "description": "Expression to map the response into process variables. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/#result-expression\" target=\"_blank\">documentation</a>.",
+        "value": "{\n  myRequestBody: request.body\n  // Use FEEL to extract values, e.g.,:\n  // myMessage: request.body.message\n}",
+        "feel": "required",
+        "group": "output",
+        "binding": {
+          "name": "resultExpression",
+          "type": "zeebe:property"
+        },
+        "type": "Text"
       }
     ],
     "icon": {
-      "contents": "data:image/svg+xml,%3Csvg id='icon' xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='0 0 32 32'%3E%3Cdefs%3E%3Cstyle%3E .cls-1 %7B fill: none; %7D %3C/style%3E%3C/defs%3E%3Cpath d='M24,26a3,3,0,1,0-2.8164-4H13v1a5,5,0,1,1-5-5V16a7,7,0,1,0,6.9287,8h6.2549A2.9914,2.9914,0,0,0,24,26Z'/%3E%3Cpath d='M24,16a7.024,7.024,0,0,0-2.57.4873l-3.1656-5.5395a3.0469,3.0469,0,1,0-1.7326.9985l4.1189,7.2085.8686-.4976a5.0006,5.0006,0,1,1-1.851,6.8418L17.937,26.501A7.0005,7.0005,0,1,0,24,16Z'/%3E%3Cpath d='M8.532,20.0537a3.03,3.03,0,1,0,1.7326.9985C11.74,18.47,13.86,14.7607,13.89,14.708l.4976-.8682-.8677-.497a5,5,0,1,1,6.812-1.8438l1.7315,1.002a7.0008,7.0008,0,1,0-10.3462,2.0356c-.457.7427-1.1021,1.8716-2.0737,3.5728Z'/%3E%3Crect id='_Transparent_Rectangle_' data-name='&lt;Transparent Rectangle&gt;' class='cls-1' width='32' height='32'/%3E%3C/svg%3E"
-    },
-    "engines": {
-      "camunda": "^8.5"
+      "contents": "data:image/svg+xml;base64,PHN2ZyBpZD0naWNvbicgeG1sbnM9J2h0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnJyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCAzMiAzMic+CiAgPGRlZnM+CiAgICA8c3R5bGU+LmNscy0xIHsgZmlsbDogbm9uZTsgfTwvc3R5bGU+CiAgPC9kZWZzPgogIDxwYXRoCiAgICBkPSdNMjQsMjZhMywzLDAsMSwwLTIuODE2NC00SDEzdjFhNSw1LDAsMSwxLTUtNVYxNmE3LDcsMCwxLDAsNi45Mjg3LDhoNi4yNTQ5QTIuOTkxNCwyLjk5MTQsMCwwLDAsMjQsMjZaJy8+CiAgPHBhdGgKICAgIGQ9J00yNCwxNmE3LjAyNCw3LjAyNCwwLDAsMC0yLjU3LjQ4NzNsLTMuMTY1Ni01LjUzOTVhMy4wNDY5LDMuMDQ2OSwwLDEsMC0xLjczMjYuOTk4NWw0LjExODksNy4yMDg1Ljg2ODYtLjQ5NzZhNS4wMDA2LDUuMDAwNiwwLDEsMS0xLjg1MSw2Ljg0MThMMTcuOTM3LDI2LjUwMUE3LjAwMDUsNy4wMDA1LDAsMSwwLDI0LDE2WicvPgogIDxwYXRoCiAgICBkPSdNOC41MzIsMjAuMDUzN2EzLjAzLDMuMDMsMCwxLDAsMS43MzI2Ljk5ODVDMTEuNzQsMTguNDcsMTMuODYsMTQuNzYwNywxMy44OSwxNC43MDhsLjQ5NzYtLjg2ODItLjg2NzctLjQ5N2E1LDUsMCwxLDEsNi44MTItMS44NDM4bDEuNzMxNSwxLjAwMmE3LjAwMDgsNy4wMDA4LDAsMSwwLTEwLjM0NjIsMi4wMzU2Yy0uNDU3Ljc0MjctMS4xMDIxLDEuODcxNi0yLjA3MzcsMy41NzI4WicvPgogIDxyZWN0IGlkPSdfVHJhbnNwYXJlbnRfUmVjdGFuZ2xlXycgZGF0YS1uYW1lPScmbHQ7VHJhbnNwYXJlbnQgUmVjdGFuZ2xlJmd0OycgY2xhc3M9J2Nscy0xJwogICAgd2lkdGg9JzMyJyBoZWlnaHQ9JzMyJy8+Cjwvc3ZnPg=="
     }
   },
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
     "name": "Webhook Intermediate Catch Event Connector",
     "id": "io.camunda.connectors.webhook.WebhookConnectorIntermediate.v1",
-    "version": 4,
+    "version": 6,
     "description": "Configure webhook to receive callbacks",
     "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
     "category": {
@@ -587,7 +767,11 @@
         },
         "description": "The webhook ID is a part of the URL",
         "constraints": {
-          "notEmpty": true
+          "notEmpty": true,
+          "pattern": {
+            "value": "^[a-zA-Z0-9]+([-_][a-zA-Z0-9]+)*$",
+            "message": "can only contain letters, numbers, or single underscores/hyphens and cannot begin or end with an underscore/hyphen"
+          }
         }
       },
       {
@@ -866,6 +1050,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": "Condition",
         "type": "String",
@@ -901,6 +1097,18 @@
         },
         "description": "Expression to map the inbound payload to process variables"
       },
+      {
+        "label": "One time verification response expression",
+        "description": "Specify condition and response. Learn more in the <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#verification-expression' target='_blank'>documentation</a>",
+        "type": "Text",
+        "group": "webhookResponse",
+        "feel": "required",
+        "optional": true,
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.verificationExpression"
+        }
+      },
       {
         "label": "Response body expression",
         "type": "Text",
@@ -918,19 +1126,16 @@
       "contents": "data:image/svg+xml,%3Csvg id='icon' xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='0 0 32 32'%3E%3Cdefs%3E%3Cstyle%3E .cls-1 %7B fill: none; %7D %3C/style%3E%3C/defs%3E%3Cpath d='M24,26a3,3,0,1,0-2.8164-4H13v1a5,5,0,1,1-5-5V16a7,7,0,1,0,6.9287,8h6.2549A2.9914,2.9914,0,0,0,24,26Z'/%3E%3Cpath d='M24,16a7.024,7.024,0,0,0-2.57.4873l-3.1656-5.5395a3.0469,3.0469,0,1,0-1.7326.9985l4.1189,7.2085.8686-.4976a5.0006,5.0006,0,1,1-1.851,6.8418L17.937,26.501A7.0005,7.0005,0,1,0,24,16Z'/%3E%3Cpath d='M8.532,20.0537a3.03,3.03,0,1,0,1.7326.9985C11.74,18.47,13.86,14.7607,13.89,14.708l.4976-.8682-.8677-.497a5,5,0,1,1,6.812-1.8438l1.7315,1.002a7.0008,7.0008,0,1,0-10.3462,2.0356c-.457.7427-1.1021,1.8716-2.0737,3.5728Z'/%3E%3Crect id='_Transparent_Rectangle_' data-name='&lt;Transparent Rectangle&gt;' class='cls-1' width='32' height='32'/%3E%3C/svg%3E"
     },
     "engines": {
-      "camunda": "^8.2"
+      "camunda": "^8.5"
     }
   },
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "Webhook Intermediate Event Connector",
+    "name": "Webhook Intermediate Catch Event Connector",
     "id": "io.camunda.connectors.webhook.WebhookConnectorIntermediate.v1",
+    "version": 5,
     "description": "Configure webhook to receive callbacks",
-    "metadata": {
-      "keywords": []
-    },
-    "documentationRef": "https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/",
-    "version": 13,
+    "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
     "category": {
       "id": "connectors",
       "name": "Connectors"
@@ -940,9 +1145,6 @@
       "value": "bpmn:IntermediateCatchEvent",
       "eventDefinition": "bpmn:MessageEventDefinition"
     },
-    "engines": {
-      "camunda": "^8.3"
-    },
     "groups": [
       {
         "id": "endpoint",
@@ -956,49 +1158,52 @@
         "id": "authorization",
         "label": "Authorization"
       },
-      {
-        "id": "webhookResponse",
-        "label": "Webhook response"
-      },
       {
         "id": "activation",
         "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": "variable-mapping",
+        "label": "Variable mapping"
       },
       {
-        "id": "output",
-        "label": "Output mapping"
+        "id": "webhookResponse",
+        "label": "Webhook response"
       }
     ],
     "properties": [
       {
+        "type": "Hidden",
         "value": "io.camunda:webhook: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": "inbound.method",
+        "type": "Hidden",
+        "value": "ConfigurableInboundWebhook",
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.subtype"
+        }
+      },
+      {
+        "id": "webhookMethod",
         "label": "Webhook method",
+        "group": "endpoint",
         "description": "Select HTTP method",
-        "optional": false,
         "value": "any",
-        "group": "endpoint",
-        "binding": {
-          "name": "inbound.method",
-          "type": "zeebe:property"
-        },
         "type": "Dropdown",
         "choices": [
           {
@@ -1006,53 +1211,46 @@
             "value": "any"
           },
           {
-            "name": "GET",
+            "name": "Get",
             "value": "get"
           },
           {
-            "name": "POST",
+            "name": "Post",
             "value": "post"
           },
           {
-            "name": "PUT",
+            "name": "Put",
             "value": "put"
           },
           {
-            "name": "DELETE",
+            "name": "Delete",
             "value": "delete"
           }
-        ]
+        ],
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.method"
+        }
       },
       {
-        "id": "inbound.context",
         "label": "Webhook ID",
+        "type": "String",
+        "group": "endpoint",
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.context"
+        },
         "description": "The webhook ID is a part of the URL",
-        "optional": false,
         "constraints": {
-          "notEmpty": true,
-          "pattern": {
-            "value": "^[a-zA-Z0-9]+([-_][a-zA-Z0-9]+)*$",
-            "message": "can only contain letters, numbers, or single underscores/hyphens and cannot begin or end with an underscore/hyphen"
-          }
-        },
-        "group": "endpoint",
-        "binding": {
-          "name": "inbound.context",
-          "type": "zeebe:property"
-        },
-        "type": "String"
+          "notEmpty": true
+        }
       },
       {
-        "id": "inbound.shouldValidateHmac",
+        "id": "shouldValidateHmac",
         "label": "HMAC authentication",
-        "description": "Choose whether HMAC verification is enabled. <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a> and <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#example' target='_blank'>example</a> that explains how to use HMAC-related fields",
-        "optional": false,
-        "value": "disabled",
         "group": "authentication",
-        "binding": {
-          "name": "inbound.shouldValidateHmac",
-          "type": "zeebe:property"
-        },
+        "description": "Choose whether HMAC verification is enabled. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a> and <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#example' target='_blank'>example</a> that explains how to use HMAC-related fields",
+        "value": "disabled",
         "type": "Dropdown",
         "choices": [
           {
@@ -1063,60 +1261,47 @@
             "name": "Disabled",
             "value": "disabled"
           }
-        ]
+        ],
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.shouldValidateHmac"
+        }
       },
       {
-        "id": "inbound.hmacSecret",
         "label": "HMAC secret key",
         "description": "Shared secret key",
-        "optional": true,
-        "feel": "optional",
+        "type": "String",
         "group": "authentication",
+        "optional": true,
         "binding": {
-          "name": "inbound.hmacSecret",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.hmacSecret"
         },
         "condition": {
-          "property": "inbound.shouldValidateHmac",
-          "equals": "enabled",
-          "type": "simple"
-        },
-        "type": "String"
+          "property": "shouldValidateHmac",
+          "equals": "enabled"
+        }
       },
       {
-        "id": "inbound.hmacHeader",
         "label": "HMAC header",
         "description": "Name of header attribute that will contain the HMAC value",
-        "optional": true,
-        "feel": "optional",
+        "type": "String",
         "group": "authentication",
+        "optional": true,
         "binding": {
-          "name": "inbound.hmacHeader",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.hmacHeader"
         },
         "condition": {
-          "property": "inbound.shouldValidateHmac",
-          "equals": "enabled",
-          "type": "simple"
-        },
-        "type": "String"
+          "property": "shouldValidateHmac",
+          "equals": "enabled"
+        }
       },
       {
-        "id": "inbound.hmacAlgorithm",
         "label": "HMAC algorithm",
+        "group": "authentication",
         "description": "Choose HMAC algorithm",
-        "optional": false,
         "value": "sha_256",
-        "group": "authentication",
-        "binding": {
-          "name": "inbound.hmacAlgorithm",
-          "type": "zeebe:property"
-        },
-        "condition": {
-          "property": "inbound.shouldValidateHmac",
-          "equals": "enabled",
-          "type": "simple"
-        },
         "type": "Dropdown",
         "choices": [
           {
@@ -1131,507 +1316,351 @@
             "name": "SHA-512",
             "value": "sha_512"
           }
-        ]
+        ],
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.hmacAlgorithm"
+        },
+        "condition": {
+          "property": "shouldValidateHmac",
+          "equals": "enabled"
+        }
       },
       {
-        "id": "inbound.hmacScopes",
         "label": "HMAC scopes",
-        "description": "Set HMAC scopes for calculating signature data. See <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/' target='_blank'>documentation</a>",
-        "optional": true,
-        "feel": "required",
         "group": "authentication",
+        "description": "Set HMAC scopes for calculating signature data. See <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/' target='_blank'>documentation</a>",
+        "feel": "required",
+        "type": "String",
+        "optional": true,
         "binding": {
-          "name": "inbound.hmacScopes",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.hmacScopes"
         },
         "condition": {
-          "property": "inbound.shouldValidateHmac",
-          "equals": "enabled",
-          "type": "simple"
-        },
-        "type": "String"
+          "property": "shouldValidateHmac",
+          "equals": "enabled"
+        }
       },
       {
-        "id": "inbound.auth.type",
+        "id": "authorizationType",
         "label": "Authorization type",
-        "description": "Choose the authorization type",
-        "value": "NONE",
         "group": "authorization",
-        "binding": {
-          "name": "inbound.auth.type",
-          "type": "zeebe:property"
-        },
+        "description": "Choose the authorization type.",
+        "value": "NONE",
         "type": "Dropdown",
         "choices": [
           {
             "name": "None",
             "value": "NONE"
           },
+          {
+            "name": "JWT",
+            "value": "JWT"
+          },
           {
             "name": "Basic",
             "value": "BASIC"
           },
           {
-            "name": "API key",
+            "name": "API Key",
             "value": "APIKEY"
-          },
-          {
-            "name": "JWT",
-            "value": "JWT"
           }
-        ]
+        ],
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.auth.type"
+        }
       },
       {
-        "id": "inbound.auth.username",
-        "label": "Username",
-        "description": "Username for basic authentication",
-        "optional": false,
-        "feel": "optional",
+        "label": "JWK url",
+        "description": "Well-known url of JWKs",
+        "type": "String",
         "group": "authorization",
+        "feel": "optional",
+        "optional": true,
         "binding": {
-          "name": "inbound.auth.username",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.auth.jwt.jwkUrl"
         },
         "condition": {
-          "property": "inbound.auth.type",
-          "equals": "BASIC",
-          "type": "simple"
-        },
-        "type": "String"
+          "property": "authorizationType",
+          "equals": "JWT"
+        }
       },
       {
-        "id": "inbound.auth.password",
-        "label": "Password",
-        "description": "Password for basic authentication",
-        "optional": false,
-        "feel": "optional",
+        "label": "JWT role property expression",
+        "description": "Expression to extract the roles from the JWT token. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#how-to-extract-roles-from-jwt-data'>See documentation</a>",
+        "type": "String",
         "group": "authorization",
+        "feel": "required",
+        "optional": true,
         "binding": {
-          "name": "inbound.auth.password",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.auth.jwt.permissionsExpression"
         },
         "condition": {
-          "property": "inbound.auth.type",
-          "equals": "BASIC",
-          "type": "simple"
-        },
-        "type": "String"
+          "property": "authorizationType",
+          "equals": "JWT"
+        }
       },
       {
-        "id": "inbound.auth.apiKey",
-        "label": "API key",
-        "description": "Expected API key",
-        "optional": false,
-        "feel": "optional",
+        "label": "Required roles",
+        "description": "List of roles to test JWT roles against",
+        "type": "String",
         "group": "authorization",
+        "feel": "required",
+        "optional": true,
         "binding": {
-          "name": "inbound.auth.apiKey",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.auth.jwt.requiredPermissions"
         },
         "condition": {
-          "property": "inbound.auth.type",
-          "equals": "APIKEY",
-          "type": "simple"
-        },
-        "type": "String"
+          "property": "authorizationType",
+          "equals": "JWT"
+        }
       },
       {
-        "id": "inbound.auth.apiKeyLocator",
-        "label": "API key locator",
-        "description": "A FEEL expression that extracts API key from the request. <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#how-to-configure-api-key-authorization'>See documentation</a>",
-        "optional": false,
-        "value": "=split(request.headers.authorization, \" \")[2]",
-        "constraints": {
-          "notEmpty": true
-        },
-        "feel": "required",
+        "label": "Username",
+        "description": "Username for basic authentication",
+        "type": "String",
         "group": "authorization",
+        "feel": "optional",
         "binding": {
-          "name": "inbound.auth.apiKeyLocator",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.auth.username"
         },
         "condition": {
-          "property": "inbound.auth.type",
-          "equals": "APIKEY",
-          "type": "simple"
+          "property": "authorizationType",
+          "equals": "BASIC"
         },
-        "type": "String"
+        "constraints": {
+          "notEmpty": true
+        }
       },
       {
-        "id": "inbound.auth.jwt.jwkUrl",
-        "label": "JWK URL",
-        "description": "Well-known URL of JWKs",
-        "optional": false,
-        "feel": "optional",
+        "label": "Password",
+        "description": "Password for basic authentication",
+        "type": "String",
         "group": "authorization",
+        "feel": "optional",
         "binding": {
-          "name": "inbound.auth.jwt.jwkUrl",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.auth.password"
         },
         "condition": {
-          "property": "inbound.auth.type",
-          "equals": "JWT",
-          "type": "simple"
+          "property": "authorizationType",
+          "equals": "BASIC"
         },
-        "type": "String"
+        "constraints": {
+          "notEmpty": true
+        }
       },
       {
-        "id": "inbound.auth.jwt.permissionsExpression",
-        "label": "JWT role property expression",
-        "description": "Expression to extract the roles from the JWT token. <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#how-to-extract-roles-from-jwt-data'>See documentation</a>",
-        "optional": false,
-        "feel": "required",
+        "label": "API Key",
+        "description": "Expected API key",
+        "type": "String",
         "group": "authorization",
+        "feel": "optional",
         "binding": {
-          "name": "inbound.auth.jwt.permissionsExpression",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.auth.apiKey"
         },
         "condition": {
-          "property": "inbound.auth.type",
-          "equals": "JWT",
-          "type": "simple"
+          "property": "authorizationType",
+          "equals": "APIKEY"
         },
-        "type": "String"
+        "constraints": {
+          "notEmpty": true
+        }
       },
       {
-        "id": "inbound.auth.jwt.requiredPermissions",
-        "label": "Required roles",
-        "description": "List of roles to test JWT roles against",
-        "optional": false,
-        "feel": "required",
+        "label": "API Key locator",
+        "description": "A FEEL expression that extracts API key from the request. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#how-to-configure-api-key-authorization'>See documentation</a>",
+        "type": "String",
         "group": "authorization",
+        "feel": "required",
         "binding": {
-          "name": "inbound.auth.jwt.requiredPermissions",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.auth.apiKeyLocator"
         },
         "condition": {
-          "property": "inbound.auth.type",
-          "equals": "JWT",
-          "type": "simple"
+          "property": "authorizationType",
+          "equals": "APIKEY"
         },
-        "type": "String"
+        "constraints": {
+          "notEmpty": true
+        },
+        "value": "=split(request.headers.authorization, \" \")[2]"
       },
       {
-        "id": "inbound.responseExpression",
-        "label": "Response expression",
-        "description": "Expression used to generate the HTTP response",
-        "optional": true,
+        "label": "Correlation key (process)",
+        "type": "String",
+        "group": "activation",
         "feel": "required",
-        "group": "webhookResponse",
+        "description": "Sets up the correlation key from process variables",
         "binding": {
-          "name": "inbound.responseExpression",
-          "type": "zeebe:property"
+          "type": "bpmn:Message#zeebe:subscription#property",
+          "name": "correlationKey"
         },
-        "type": "Text"
+        "constraints": {
+          "notEmpty": true
+        }
       },
       {
-        "id": "inbound.verificationExpression",
-        "label": "One time verification response expression",
-        "description": "Specify condition and response. Learn more in the <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#verification-expression' target='_blank'>documentation</a>",
-        "optional": true,
+        "label": "Correlation key (payload)",
+        "type": "String",
+        "group": "activation",
         "feel": "required",
-        "group": "webhookResponse",
         "binding": {
-          "name": "inbound.verificationExpression",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "correlationKeyExpression"
         },
-        "type": "Text"
+        "description": "Extracts the correlation key from the incoming message payload",
+        "constraints": {
+          "notEmpty": true
+        }
       },
       {
-        "id": "activationCondition",
-        "label": "Activation condition",
-        "description": "Condition under which the Connector triggers. Leave empty to catch all events",
-        "optional": true,
+        "label": "Message ID expression",
         "feel": "required",
+        "type": "String",
+        "optional": true,
         "group": "activation",
         "binding": {
-          "name": "activationCondition",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "messageIdExpression"
         },
-        "type": "String"
+        "description": "Expression to extract unique identifier of a message"
       },
       {
-        "id": "consumeUnmatchedEvents",
-        "label": "Consume unmatched events",
-        "value": true,
+        "label": "Condition",
+        "type": "String",
         "group": "activation",
+        "feel": "required",
+        "optional": true,
         "binding": {
-          "name": "consumeUnmatchedEvents",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "activationCondition"
         },
-        "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"
+        "description": "Condition under which the connector triggers. Leave empty to catch all events. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a>"
       },
       {
-        "id": "correlationKeyProcess",
-        "label": "Correlation key (process)",
-        "description": "Sets up the correlation key from process variables",
-        "constraints": {
-          "notEmpty": true
-        },
-        "feel": "required",
-        "group": "correlation",
+        "label": "Result variable",
+        "type": "String",
+        "group": "variable-mapping",
+        "optional": true,
         "binding": {
-          "name": "correlationKey",
-          "type": "bpmn:Message#zeebe:subscription#property"
+          "type": "zeebe:property",
+          "name": "resultVariable"
         },
-        "type": "String"
+        "description": "Name of variable to store the result of the connector in"
       },
       {
-        "id": "correlationKeyPayload",
-        "label": "Correlation key (payload)",
-        "description": "Extracts the correlation key from the incoming message payload",
-        "constraints": {
-          "notEmpty": true
-        },
+        "label": "Result expression",
+        "type": "String",
+        "group": "variable-mapping",
         "feel": "required",
-        "group": "correlation",
+        "optional": true,
         "binding": {
-          "name": "correlationKeyExpression",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "resultExpression"
         },
-        "type": "String"
+        "description": "Expression to map the inbound payload to process variables"
       },
       {
-        "id": "messageIdExpression",
-        "label": "Message ID expression",
-        "description": "Expression to extract unique identifier of a message",
-        "optional": true,
+        "label": "One time verification response expression",
+        "description": "Specify condition and response. Learn more in the <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#verification-expression' target='_blank'>documentation</a>",
+        "type": "Text",
+        "group": "webhookResponse",
         "feel": "required",
-        "group": "correlation",
+        "optional": true,
         "binding": {
-          "name": "messageIdExpression",
-          "type": "zeebe:property"
-        },
-        "type": "String"
+          "type": "zeebe:property",
+          "name": "inbound.verificationExpression"
+        }
       },
       {
-        "id": "messageTtl",
-        "label": "Message TTL",
-        "description": "Time-to-live for the message in the broker (ISO-8601 duration)",
+        "label": "Response body expression",
+        "type": "Text",
+        "group": "webhookResponse",
+        "feel": "required",
         "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": "zeebe:property",
+          "name": "inbound.responseBodyExpression"
         },
-        "type": "String"
+        "description": "Specify condition and response"
+      }
+    ],
+    "icon": {
+      "contents": "data:image/svg+xml,%3Csvg id='icon' xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='0 0 32 32'%3E%3Cdefs%3E%3Cstyle%3E .cls-1 %7B fill: none; %7D %3C/style%3E%3C/defs%3E%3Cpath d='M24,26a3,3,0,1,0-2.8164-4H13v1a5,5,0,1,1-5-5V16a7,7,0,1,0,6.9287,8h6.2549A2.9914,2.9914,0,0,0,24,26Z'/%3E%3Cpath d='M24,16a7.024,7.024,0,0,0-2.57.4873l-3.1656-5.5395a3.0469,3.0469,0,1,0-1.7326.9985l4.1189,7.2085.8686-.4976a5.0006,5.0006,0,1,1-1.851,6.8418L17.937,26.501A7.0005,7.0005,0,1,0,24,16Z'/%3E%3Cpath d='M8.532,20.0537a3.03,3.03,0,1,0,1.7326.9985C11.74,18.47,13.86,14.7607,13.89,14.708l.4976-.8682-.8677-.497a5,5,0,1,1,6.812-1.8438l1.7315,1.002a7.0008,7.0008,0,1,0-10.3462,2.0356c-.457.7427-1.1021,1.8716-2.0737,3.5728Z'/%3E%3Crect id='_Transparent_Rectangle_' data-name='&lt;Transparent Rectangle&gt;' class='cls-1' width='32' height='32'/%3E%3C/svg%3E"
+    },
+    "engines": {
+      "camunda": "^8.4"
+    }
+  },
+  {
+    "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+    "name": "Webhook connector",
+    "id": "io.camunda.connectors.webhook.WebhookConnectorIntermediate.v1",
+    "version": 2,
+    "description": "Configure webhook to receive callbacks",
+    "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
+    "category": {
+      "id": "connectors",
+      "name": "Connectors"
+    },
+    "appliesTo": ["bpmn:IntermediateCatchEvent", "bpmn:IntermediateThrowEvent"],
+    "elementType": {
+      "value": "bpmn:IntermediateCatchEvent",
+      "eventDefinition": "bpmn:MessageEventDefinition"
+    },
+    "groups": [
+      {
+        "id": "endpoint",
+        "label": "Webhook configuration"
       },
       {
-        "id": "messageNameUuid",
+        "id": "activation",
+        "label": "Activation"
+      },
+      {
+        "id": "variable-mapping",
+        "label": "Variable mapping"
+      }
+    ],
+    "properties": [
+      {
+        "type": "Hidden",
+        "value": "io.camunda:webhook:1",
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.type"
+        }
+      },
+      {
+        "type": "Hidden",
         "generatedValue": {
           "type": "uuid"
         },
-        "group": "correlation",
         "binding": {
-          "name": "name",
-          "type": "bpmn:Message#property"
-        },
-        "type": "Hidden"
+          "type": "bpmn:Message#property",
+          "name": "name"
+        }
       },
       {
-        "id": "deduplicationModeManualFlag",
-        "label": "Manual mode",
-        "description": "By default, similar connectors receive the same deduplication ID. Customize by activating manual mode",
-        "value": false,
-        "group": "deduplication",
+        "type": "Hidden",
+        "value": "ConfigurableInboundWebhook",
         "binding": {
-          "name": "deduplicationModeManualFlag",
-          "type": "zeebe:property"
-        },
-        "type": "Boolean"
+          "type": "zeebe:property",
+          "name": "inbound.subtype"
+        }
       },
       {
-        "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": "Hidden"
-      },
-      {
-        "id": "resultVariable",
-        "label": "Result variable",
-        "description": "Name of variable to store the response in",
-        "group": "output",
-        "binding": {
-          "name": "resultVariable",
-          "type": "zeebe:property"
-        },
-        "type": "String"
-      },
-      {
-        "id": "resultExpression",
-        "label": "Result expression",
-        "description": "Expression to map the response into process variables",
-        "feel": "required",
-        "group": "output",
-        "binding": {
-          "name": "resultExpression",
-          "type": "zeebe:property"
-        },
-        "type": "Text"
-      }
-    ],
-    "icon": {
-      "contents": "data:image/svg+xml;base64,PHN2ZyBpZD0naWNvbicgeG1sbnM9J2h0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnJyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCAzMiAzMic+CiAgPGRlZnM+CiAgICA8c3R5bGU+LmNscy0xIHsgZmlsbDogbm9uZTsgfTwvc3R5bGU+CiAgPC9kZWZzPgogIDxwYXRoCiAgICBkPSdNMjQsMjZhMywzLDAsMSwwLTIuODE2NC00SDEzdjFhNSw1LDAsMSwxLTUtNVYxNmE3LDcsMCwxLDAsNi45Mjg3LDhoNi4yNTQ5QTIuOTkxNCwyLjk5MTQsMCwwLDAsMjQsMjZaJy8+CiAgPHBhdGgKICAgIGQ9J00yNCwxNmE3LjAyNCw3LjAyNCwwLDAsMC0yLjU3LjQ4NzNsLTMuMTY1Ni01LjUzOTVhMy4wNDY5LDMuMDQ2OSwwLDEsMC0xLjczMjYuOTk4NWw0LjExODksNy4yMDg1Ljg2ODYtLjQ5NzZhNS4wMDA2LDUuMDAwNiwwLDEsMS0xLjg1MSw2Ljg0MThMMTcuOTM3LDI2LjUwMUE3LjAwMDUsNy4wMDA1LDAsMSwwLDI0LDE2WicvPgogIDxwYXRoCiAgICBkPSdNOC41MzIsMjAuMDUzN2EzLjAzLDMuMDMsMCwxLDAsMS43MzI2Ljk5ODVDMTEuNzQsMTguNDcsMTMuODYsMTQuNzYwNywxMy44OSwxNC43MDhsLjQ5NzYtLjg2ODItLjg2NzctLjQ5N2E1LDUsMCwxLDEsNi44MTItMS44NDM4bDEuNzMxNSwxLjAwMmE3LjAwMDgsNy4wMDA4LDAsMSwwLTEwLjM0NjIsMi4wMzU2Yy0uNDU3Ljc0MjctMS4xMDIxLDEuODcxNi0yLjA3MzcsMy41NzI4WicvPgogIDxyZWN0IGlkPSdfVHJhbnNwYXJlbnRfUmVjdGFuZ2xlXycgZGF0YS1uYW1lPScmbHQ7VHJhbnNwYXJlbnQgUmVjdGFuZ2xlJmd0OycgY2xhc3M9J2Nscy0xJwogICAgd2lkdGg9JzMyJyBoZWlnaHQ9JzMyJy8+Cjwvc3ZnPg=="
-    }
-  },
-  {
-    "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "Webhook connector",
-    "id": "io.camunda.connectors.webhook.WebhookConnectorIntermediate.v1",
-    "version": 3,
-    "description": "Configure webhook to receive callbacks",
-    "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
-    "category": {
-      "id": "connectors",
-      "name": "Connectors"
-    },
-    "appliesTo": ["bpmn:IntermediateCatchEvent", "bpmn:IntermediateThrowEvent"],
-    "elementType": {
-      "value": "bpmn:IntermediateCatchEvent",
-      "eventDefinition": "bpmn:MessageEventDefinition"
-    },
-    "groups": [
-      {
-        "id": "endpoint",
-        "label": "Webhook configuration"
-      },
-      {
-        "id": "authentication",
-        "label": "Authentication"
-      },
-      {
-        "id": "authorization",
-        "label": "Authorization"
-      },
-      {
-        "id": "activation",
-        "label": "Activation"
-      },
-      {
-        "id": "variable-mapping",
-        "label": "Variable mapping"
-      }
-    ],
-    "properties": [
-      {
-        "type": "Hidden",
-        "value": "io.camunda:webhook:1",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.type"
-        }
-      },
-      {
-        "type": "Hidden",
-        "generatedValue": {
-          "type": "uuid"
-        },
-        "binding": {
-          "type": "bpmn:Message#property",
-          "name": "name"
-        }
-      },
-      {
-        "type": "Hidden",
-        "value": "ConfigurableInboundWebhook",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.subtype"
-        }
-      },
-      {
-        "id": "webhookMethod",
-        "label": "Webhook method",
-        "group": "endpoint",
-        "description": "Select HTTP method",
-        "value": "any",
-        "type": "Dropdown",
-        "choices": [
-          {
-            "name": "Any",
-            "value": "any"
-          },
-          {
-            "name": "Get",
-            "value": "get"
-          },
-          {
-            "name": "Post",
-            "value": "post"
-          },
-          {
-            "name": "Put",
-            "value": "put"
-          },
-          {
-            "name": "Delete",
-            "value": "delete"
-          }
-        ],
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.method"
-        }
-      },
-      {
-        "label": "Webhook ID",
-        "type": "String",
-        "group": "endpoint",
+        "label": "Webhook ID",
+        "type": "String",
+        "group": "endpoint",
         "binding": {
           "type": "zeebe:property",
           "name": "inbound.context"
@@ -1644,7 +1673,7 @@
       {
         "id": "shouldValidateHmac",
         "label": "HMAC authentication",
-        "group": "authentication",
+        "group": "endpoint",
         "description": "Choose whether HMAC verification is enabled. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a> and <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#example' target='_blank'>example</a> that explains how to use HMAC-related fields",
         "value": "disabled",
         "type": "Dropdown",
@@ -1667,7 +1696,7 @@
         "label": "HMAC secret key",
         "description": "Shared secret key",
         "type": "String",
-        "group": "authentication",
+        "group": "endpoint",
         "optional": true,
         "binding": {
           "type": "zeebe:property",
@@ -1682,7 +1711,7 @@
         "label": "HMAC header",
         "description": "Name of header attribute that will contain the HMAC value",
         "type": "String",
-        "group": "authentication",
+        "group": "endpoint",
         "optional": true,
         "binding": {
           "type": "zeebe:property",
@@ -1695,7 +1724,7 @@
       },
       {
         "label": "HMAC algorithm",
-        "group": "authentication",
+        "group": "endpoint",
         "description": "Choose HMAC algorithm",
         "value": "sha_256",
         "type": "Dropdown",
@@ -1723,220 +1752,53 @@
         }
       },
       {
-        "label": "HMAC scopes",
-        "group": "authentication",
-        "description": "Set HMAC scopes for calculating signature data. See <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/' target='_blank'>documentation</a>",
-        "feel": "required",
+        "label": "Correlation key (process)",
         "type": "String",
-        "optional": true,
+        "group": "activation",
+        "feel": "required",
+        "description": "Sets up the correlation key from process variables",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.hmacScopes"
+          "type": "bpmn:Message#zeebe:subscription#property",
+          "name": "correlationKey"
         },
-        "condition": {
-          "property": "shouldValidateHmac",
-          "equals": "enabled"
+        "constraints": {
+          "notEmpty": true
         }
       },
       {
-        "id": "authorizationType",
-        "label": "Authorization type",
-        "group": "authorization",
-        "description": "Choose the authorization type.",
-        "value": "NONE",
-        "type": "Dropdown",
-        "choices": [
-          {
-            "name": "None",
-            "value": "NONE"
-          },
-          {
-            "name": "JWT",
-            "value": "JWT"
-          },
-          {
-            "name": "Basic",
-            "value": "BASIC"
-          },
-          {
-            "name": "API Key",
-            "value": "APIKEY"
-          }
-        ],
+        "label": "Correlation key (payload)",
+        "type": "String",
+        "group": "activation",
+        "feel": "required",
         "binding": {
           "type": "zeebe:property",
-          "name": "inbound.auth.type"
+          "name": "correlationKeyExpression"
+        },
+        "description": "Extracts the correlation key from the incoming message payload",
+        "constraints": {
+          "notEmpty": true
         }
       },
       {
-        "label": "JWK url",
-        "description": "Well-known url of JWKs",
+        "label": "Condition",
         "type": "String",
-        "group": "authorization",
-        "feel": "optional",
+        "group": "activation",
+        "feel": "required",
         "optional": true,
         "binding": {
           "type": "zeebe:property",
-          "name": "inbound.auth.jwt.jwkUrl"
+          "name": "activationCondition"
         },
-        "condition": {
-          "property": "authorizationType",
-          "equals": "JWT"
-        }
+        "description": "Condition under which the connector triggers. Leave empty to catch all events. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a>"
       },
       {
-        "label": "JWT role property expression",
-        "description": "Expression to extract the roles from the JWT token. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#how-to-extract-roles-from-jwt-data'>See documentation</a>",
+        "label": "Result variable",
         "type": "String",
-        "group": "authorization",
-        "feel": "required",
+        "group": "variable-mapping",
         "optional": true,
         "binding": {
           "type": "zeebe:property",
-          "name": "inbound.auth.jwt.permissionsExpression"
-        },
-        "condition": {
-          "property": "authorizationType",
-          "equals": "JWT"
-        }
-      },
-      {
-        "label": "Required roles",
-        "description": "List of roles to test JWT roles against",
-        "type": "String",
-        "group": "authorization",
-        "feel": "required",
-        "optional": true,
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.jwt.requiredPermissions"
-        },
-        "condition": {
-          "property": "authorizationType",
-          "equals": "JWT"
-        }
-      },
-      {
-        "label": "Username",
-        "description": "Username for basic authentication",
-        "type": "String",
-        "group": "authorization",
-        "feel": "optional",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.username"
-        },
-        "condition": {
-          "property": "authorizationType",
-          "equals": "BASIC"
-        },
-        "constraints": {
-          "notEmpty": true
-        }
-      },
-      {
-        "label": "Password",
-        "description": "Password for basic authentication",
-        "type": "String",
-        "group": "authorization",
-        "feel": "optional",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.password"
-        },
-        "condition": {
-          "property": "authorizationType",
-          "equals": "BASIC"
-        },
-        "constraints": {
-          "notEmpty": true
-        }
-      },
-      {
-        "label": "API Key",
-        "description": "Expected API key",
-        "type": "String",
-        "group": "authorization",
-        "feel": "optional",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.apiKey"
-        },
-        "condition": {
-          "property": "authorizationType",
-          "equals": "APIKEY"
-        },
-        "constraints": {
-          "notEmpty": true
-        }
-      },
-      {
-        "label": "API Key locator",
-        "description": "A FEEL expression that extracts API key from the request. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#how-to-configure-api-key-authorization'>See documentation</a>",
-        "type": "String",
-        "group": "authorization",
-        "feel": "required",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.apiKeyLocator"
-        },
-        "condition": {
-          "property": "authorizationType",
-          "equals": "APIKEY"
-        },
-        "constraints": {
-          "notEmpty": true
-        },
-        "value": "=split(request.headers.authorization, \" \")[2]"
-      },
-      {
-        "label": "Correlation key (process)",
-        "type": "String",
-        "group": "activation",
-        "feel": "required",
-        "description": "Sets up the correlation key from process variables",
-        "binding": {
-          "type": "bpmn:Message#zeebe:subscription#property",
-          "name": "correlationKey"
-        },
-        "constraints": {
-          "notEmpty": true
-        }
-      },
-      {
-        "label": "Correlation key (payload)",
-        "type": "String",
-        "group": "activation",
-        "feel": "required",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "correlationKeyExpression"
-        },
-        "description": "Extracts the correlation key from the incoming message payload",
-        "constraints": {
-          "notEmpty": true
-        }
-      },
-      {
-        "label": "Condition",
-        "type": "String",
-        "group": "activation",
-        "feel": "required",
-        "optional": true,
-        "binding": {
-          "type": "zeebe:property",
-          "name": "activationCondition"
-        },
-        "description": "Condition under which the connector triggers. Leave empty to catch all events. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a>"
-      },
-      {
-        "label": "Result variable",
-        "type": "String",
-        "group": "variable-mapping",
-        "optional": true,
-        "binding": {
-          "type": "zeebe:property",
-          "name": "resultVariable"
+          "name": "resultVariable"
         },
         "description": "Name of variable to store the result of the connector in"
       },
@@ -1962,11 +1824,11 @@
   },
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "Webhook Intermediate Catch Event Connector",
+    "name": "Webhook Intermediate Event Connector",
     "id": "io.camunda.connectors.webhook.WebhookConnectorIntermediate.v1",
-    "version": 5,
     "description": "Configure webhook to receive callbacks",
-    "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
+    "documentationRef": "https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/",
+    "version": 11,
     "category": {
       "id": "connectors",
       "name": "Connectors"
@@ -1989,52 +1851,44 @@
         "id": "authorization",
         "label": "Authorization"
       },
+      {
+        "id": "webhookResponse",
+        "label": "Webhook response"
+      },
       {
         "id": "activation",
         "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": "webhookResponse",
-        "label": "Webhook response"
+        "id": "output",
+        "label": "Output mapping"
       }
     ],
     "properties": [
       {
-        "type": "Hidden",
         "value": "io.camunda:webhook: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",
-        "value": "ConfigurableInboundWebhook",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.subtype"
-        }
+        "type": "Hidden"
       },
       {
-        "id": "webhookMethod",
+        "id": "inbound.method",
         "label": "Webhook method",
-        "group": "endpoint",
         "description": "Select HTTP method",
+        "optional": false,
         "value": "any",
+        "group": "endpoint",
+        "binding": {
+          "name": "inbound.method",
+          "type": "zeebe:property"
+        },
         "type": "Dropdown",
         "choices": [
           {
@@ -2042,46 +1896,53 @@
             "value": "any"
           },
           {
-            "name": "Get",
+            "name": "GET",
             "value": "get"
           },
           {
-            "name": "Post",
+            "name": "POST",
             "value": "post"
           },
           {
-            "name": "Put",
+            "name": "PUT",
             "value": "put"
           },
           {
-            "name": "Delete",
+            "name": "DELETE",
             "value": "delete"
           }
-        ],
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.method"
-        }
+        ]
       },
       {
+        "id": "inbound.context",
         "label": "Webhook ID",
-        "type": "String",
+        "description": "The webhook ID is a part of the URL",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true,
+          "pattern": {
+            "value": "^[a-zA-Z0-9]+([-_][a-zA-Z0-9]+)*$",
+            "message": "can only contain letters, numbers, or single underscores/hyphens and cannot begin or end with an underscore/hyphen"
+          }
+        },
         "group": "endpoint",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.context"
+          "name": "inbound.context",
+          "type": "zeebe:property"
         },
-        "description": "The webhook ID is a part of the URL",
-        "constraints": {
-          "notEmpty": true
-        }
+        "type": "String"
       },
       {
-        "id": "shouldValidateHmac",
+        "id": "inbound.shouldValidateHmac",
         "label": "HMAC authentication",
-        "group": "authentication",
-        "description": "Choose whether HMAC verification is enabled. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a> and <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#example' target='_blank'>example</a> that explains how to use HMAC-related fields",
+        "description": "Choose whether HMAC verification is enabled. <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a> and <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#example' target='_blank'>example</a> that explains how to use HMAC-related fields",
+        "optional": false,
         "value": "disabled",
+        "group": "authentication",
+        "binding": {
+          "name": "inbound.shouldValidateHmac",
+          "type": "zeebe:property"
+        },
         "type": "Dropdown",
         "choices": [
           {
@@ -2092,47 +1953,60 @@
             "name": "Disabled",
             "value": "disabled"
           }
-        ],
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.shouldValidateHmac"
-        }
+        ]
       },
       {
+        "id": "inbound.hmacSecret",
         "label": "HMAC secret key",
         "description": "Shared secret key",
-        "type": "String",
-        "group": "authentication",
         "optional": true,
+        "feel": "optional",
+        "group": "authentication",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.hmacSecret"
+          "name": "inbound.hmacSecret",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "shouldValidateHmac",
-          "equals": "enabled"
-        }
+          "property": "inbound.shouldValidateHmac",
+          "equals": "enabled",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
+        "id": "inbound.hmacHeader",
         "label": "HMAC header",
         "description": "Name of header attribute that will contain the HMAC value",
-        "type": "String",
-        "group": "authentication",
         "optional": true,
+        "feel": "optional",
+        "group": "authentication",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.hmacHeader"
+          "name": "inbound.hmacHeader",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "shouldValidateHmac",
-          "equals": "enabled"
-        }
+          "property": "inbound.shouldValidateHmac",
+          "equals": "enabled",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
+        "id": "inbound.hmacAlgorithm",
         "label": "HMAC algorithm",
-        "group": "authentication",
         "description": "Choose HMAC algorithm",
+        "optional": false,
         "value": "sha_256",
+        "group": "authentication",
+        "binding": {
+          "name": "inbound.hmacAlgorithm",
+          "type": "zeebe:property"
+        },
+        "condition": {
+          "property": "inbound.shouldValidateHmac",
+          "equals": "enabled",
+          "type": "simple"
+        },
         "type": "Dropdown",
         "choices": [
           {
@@ -2147,297 +2021,350 @@
             "name": "SHA-512",
             "value": "sha_512"
           }
-        ],
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.hmacAlgorithm"
-        },
-        "condition": {
-          "property": "shouldValidateHmac",
-          "equals": "enabled"
-        }
+        ]
       },
       {
+        "id": "inbound.hmacScopes",
         "label": "HMAC scopes",
-        "group": "authentication",
-        "description": "Set HMAC scopes for calculating signature data. See <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/' target='_blank'>documentation</a>",
-        "feel": "required",
-        "type": "String",
+        "description": "Set HMAC scopes for calculating signature data. See <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/' target='_blank'>documentation</a>",
         "optional": true,
+        "feel": "required",
+        "group": "authentication",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.hmacScopes"
+          "name": "inbound.hmacScopes",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "shouldValidateHmac",
-          "equals": "enabled"
-        }
+          "property": "inbound.shouldValidateHmac",
+          "equals": "enabled",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
-        "id": "authorizationType",
+        "id": "inbound.auth.type",
         "label": "Authorization type",
-        "group": "authorization",
-        "description": "Choose the authorization type.",
+        "description": "Choose the authorization type",
         "value": "NONE",
+        "group": "authorization",
+        "binding": {
+          "name": "inbound.auth.type",
+          "type": "zeebe:property"
+        },
         "type": "Dropdown",
         "choices": [
           {
             "name": "None",
             "value": "NONE"
           },
-          {
-            "name": "JWT",
-            "value": "JWT"
-          },
           {
             "name": "Basic",
             "value": "BASIC"
           },
           {
-            "name": "API Key",
+            "name": "API key",
             "value": "APIKEY"
+          },
+          {
+            "name": "JWT",
+            "value": "JWT"
           }
-        ],
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.type"
-        }
+        ]
       },
       {
-        "label": "JWK url",
-        "description": "Well-known url of JWKs",
-        "type": "String",
-        "group": "authorization",
+        "id": "inbound.auth.username",
+        "label": "Username",
+        "description": "Username for basic authentication",
+        "optional": false,
         "feel": "optional",
-        "optional": true,
+        "group": "authorization",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.jwt.jwkUrl"
+          "name": "inbound.auth.username",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "authorizationType",
-          "equals": "JWT"
-        }
+          "property": "inbound.auth.type",
+          "equals": "BASIC",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
-        "label": "JWT role property expression",
-        "description": "Expression to extract the roles from the JWT token. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#how-to-extract-roles-from-jwt-data'>See documentation</a>",
-        "type": "String",
+        "id": "inbound.auth.password",
+        "label": "Password",
+        "description": "Password for basic authentication",
+        "optional": false,
+        "feel": "optional",
         "group": "authorization",
-        "feel": "required",
-        "optional": true,
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.jwt.permissionsExpression"
+          "name": "inbound.auth.password",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "authorizationType",
-          "equals": "JWT"
-        }
+          "property": "inbound.auth.type",
+          "equals": "BASIC",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
-        "label": "Required roles",
-        "description": "List of roles to test JWT roles against",
-        "type": "String",
+        "id": "inbound.auth.apiKey",
+        "label": "API key",
+        "description": "Expected API key",
+        "optional": false,
+        "feel": "optional",
         "group": "authorization",
-        "feel": "required",
-        "optional": true,
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.jwt.requiredPermissions"
+          "name": "inbound.auth.apiKey",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "authorizationType",
-          "equals": "JWT"
-        }
+          "property": "inbound.auth.type",
+          "equals": "APIKEY",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
-        "label": "Username",
-        "description": "Username for basic authentication",
-        "type": "String",
+        "id": "inbound.auth.apiKeyLocator",
+        "label": "API key locator",
+        "description": "A FEEL expression that extracts API key from the request. <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#how-to-configure-api-key-authorization'>See documentation</a>",
+        "optional": false,
+        "value": "=split(request.headers.authorization, \" \")[2]",
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "required",
         "group": "authorization",
-        "feel": "optional",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.username"
+          "name": "inbound.auth.apiKeyLocator",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "authorizationType",
-          "equals": "BASIC"
+          "property": "inbound.auth.type",
+          "equals": "APIKEY",
+          "type": "simple"
         },
-        "constraints": {
-          "notEmpty": true
-        }
+        "type": "String"
       },
       {
-        "label": "Password",
-        "description": "Password for basic authentication",
-        "type": "String",
-        "group": "authorization",
+        "id": "inbound.auth.jwt.jwkUrl",
+        "label": "JWK URL",
+        "description": "Well-known URL of JWKs",
+        "optional": false,
         "feel": "optional",
+        "group": "authorization",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.password"
+          "name": "inbound.auth.jwt.jwkUrl",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "authorizationType",
-          "equals": "BASIC"
+          "property": "inbound.auth.type",
+          "equals": "JWT",
+          "type": "simple"
         },
-        "constraints": {
-          "notEmpty": true
-        }
+        "type": "String"
       },
       {
-        "label": "API Key",
-        "description": "Expected API key",
-        "type": "String",
+        "id": "inbound.auth.jwt.permissionsExpression",
+        "label": "JWT role property expression",
+        "description": "Expression to extract the roles from the JWT token. <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#how-to-extract-roles-from-jwt-data'>See documentation</a>",
+        "optional": false,
+        "feel": "required",
         "group": "authorization",
-        "feel": "optional",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.apiKey"
+          "name": "inbound.auth.jwt.permissionsExpression",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "authorizationType",
-          "equals": "APIKEY"
+          "property": "inbound.auth.type",
+          "equals": "JWT",
+          "type": "simple"
         },
-        "constraints": {
-          "notEmpty": true
-        }
+        "type": "String"
       },
       {
-        "label": "API Key locator",
-        "description": "A FEEL expression that extracts API key from the request. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#how-to-configure-api-key-authorization'>See documentation</a>",
-        "type": "String",
-        "group": "authorization",
+        "id": "inbound.auth.jwt.requiredPermissions",
+        "label": "Required roles",
+        "description": "List of roles to test JWT roles against",
+        "optional": false,
         "feel": "required",
+        "group": "authorization",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.auth.apiKeyLocator"
+          "name": "inbound.auth.jwt.requiredPermissions",
+          "type": "zeebe:property"
         },
         "condition": {
-          "property": "authorizationType",
-          "equals": "APIKEY"
-        },
-        "constraints": {
-          "notEmpty": true
+          "property": "inbound.auth.type",
+          "equals": "JWT",
+          "type": "simple"
         },
-        "value": "=split(request.headers.authorization, \" \")[2]"
+        "type": "String"
       },
       {
-        "label": "Correlation key (process)",
-        "type": "String",
-        "group": "activation",
-        "feel": "required",
-        "description": "Sets up the correlation key from process variables",
-        "binding": {
-          "type": "bpmn:Message#zeebe:subscription#property",
-          "name": "correlationKey"
+        "id": "inbound.responseExpression",
+        "label": "Response expression",
+        "description": "Expression used to generate the HTTP response",
+        "optional": true,
+        "feel": "required",
+        "group": "webhookResponse",
+        "binding": {
+          "name": "inbound.responseExpression",
+          "type": "zeebe:property"
         },
-        "constraints": {
-          "notEmpty": true
-        }
+        "type": "Text"
       },
       {
-        "label": "Correlation key (payload)",
-        "type": "String",
-        "group": "activation",
+        "id": "inbound.verificationExpression",
+        "label": "One time verification response expression",
+        "description": "Specify condition and response. Learn more in the <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#verification-expression' target='_blank'>documentation</a>",
+        "optional": true,
         "feel": "required",
+        "group": "webhookResponse",
         "binding": {
-          "type": "zeebe:property",
-          "name": "correlationKeyExpression"
+          "name": "inbound.verificationExpression",
+          "type": "zeebe:property"
         },
-        "description": "Extracts the correlation key from the incoming message payload",
-        "constraints": {
-          "notEmpty": true
-        }
+        "type": "Text"
       },
       {
-        "label": "Message ID expression",
-        "feel": "required",
-        "type": "String",
+        "id": "activationCondition",
+        "label": "Activation condition",
+        "description": "Condition under which the Connector triggers. Leave empty to catch all events",
         "optional": true,
+        "feel": "required",
         "group": "activation",
         "binding": {
-          "type": "zeebe:property",
-          "name": "messageIdExpression"
+          "name": "activationCondition",
+          "type": "zeebe:property"
         },
-        "description": "Expression to extract unique identifier of a message"
+        "type": "String"
       },
       {
-        "label": "Condition",
-        "type": "String",
+        "id": "consumeUnmatchedEvents",
+        "label": "Consume unmatched events",
+        "value": true,
         "group": "activation",
-        "feel": "required",
-        "optional": true,
         "binding": {
-          "type": "zeebe:property",
-          "name": "activationCondition"
+          "name": "consumeUnmatchedEvents",
+          "type": "zeebe:property"
         },
-        "description": "Condition under which the connector triggers. Leave empty to catch all events. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a>"
+        "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"
       },
       {
-        "label": "Result variable",
-        "type": "String",
-        "group": "variable-mapping",
-        "optional": true,
+        "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": "resultVariable"
+          "name": "correlationKey",
+          "type": "bpmn:Message#zeebe:subscription#property"
         },
-        "description": "Name of variable to store the result of the connector in"
+        "type": "String"
       },
       {
-        "label": "Result expression",
-        "type": "String",
-        "group": "variable-mapping",
+        "id": "correlationKeyPayload",
+        "label": "Correlation key (payload)",
+        "description": "Extracts the correlation key from the incoming message payload",
+        "constraints": {
+          "notEmpty": true
+        },
         "feel": "required",
-        "optional": true,
+        "group": "correlation",
         "binding": {
-          "type": "zeebe:property",
-          "name": "resultExpression"
+          "name": "correlationKeyExpression",
+          "type": "zeebe:property"
         },
-        "description": "Expression to map the inbound payload to process variables"
+        "type": "String"
       },
       {
-        "label": "One time verification response expression",
-        "description": "Specify condition and response. Learn more in the <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#verification-expression' target='_blank'>documentation</a>",
-        "type": "Text",
-        "group": "webhookResponse",
+        "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": {
-          "type": "zeebe:property",
-          "name": "inbound.verificationExpression"
-        }
+          "name": "messageTtl",
+          "type": "zeebe:property"
+        },
+        "type": "String"
       },
       {
-        "label": "Response body expression",
-        "type": "Text",
-        "group": "webhookResponse",
+        "id": "messageNameUuid",
+        "generatedValue": {
+          "type": "uuid"
+        },
+        "group": "correlation",
+        "binding": {
+          "name": "name",
+          "type": "bpmn:Message#property"
+        },
+        "type": "Hidden"
+      },
+      {
+        "id": "resultVariable",
+        "label": "Result variable",
+        "description": "Name of variable to store the response in",
+        "group": "output",
+        "binding": {
+          "name": "resultVariable",
+          "type": "zeebe:property"
+        },
+        "type": "String"
+      },
+      {
+        "id": "resultExpression",
+        "label": "Result expression",
+        "description": "Expression to map the response into process variables",
         "feel": "required",
-        "optional": true,
+        "group": "output",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.responseBodyExpression"
+          "name": "resultExpression",
+          "type": "zeebe:property"
         },
-        "description": "Specify condition and response"
+        "type": "Text"
       }
     ],
     "icon": {
-      "contents": "data:image/svg+xml,%3Csvg id='icon' xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='0 0 32 32'%3E%3Cdefs%3E%3Cstyle%3E .cls-1 %7B fill: none; %7D %3C/style%3E%3C/defs%3E%3Cpath d='M24,26a3,3,0,1,0-2.8164-4H13v1a5,5,0,1,1-5-5V16a7,7,0,1,0,6.9287,8h6.2549A2.9914,2.9914,0,0,0,24,26Z'/%3E%3Cpath d='M24,16a7.024,7.024,0,0,0-2.57.4873l-3.1656-5.5395a3.0469,3.0469,0,1,0-1.7326.9985l4.1189,7.2085.8686-.4976a5.0006,5.0006,0,1,1-1.851,6.8418L17.937,26.501A7.0005,7.0005,0,1,0,24,16Z'/%3E%3Cpath d='M8.532,20.0537a3.03,3.03,0,1,0,1.7326.9985C11.74,18.47,13.86,14.7607,13.89,14.708l.4976-.8682-.8677-.497a5,5,0,1,1,6.812-1.8438l1.7315,1.002a7.0008,7.0008,0,1,0-10.3462,2.0356c-.457.7427-1.1021,1.8716-2.0737,3.5728Z'/%3E%3Crect id='_Transparent_Rectangle_' data-name='&lt;Transparent Rectangle&gt;' class='cls-1' width='32' height='32'/%3E%3C/svg%3E"
+      "contents": "data:image/svg+xml;base64,PHN2ZyBpZD0naWNvbicgeG1sbnM9J2h0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnJyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCAzMiAzMic+CiAgPGRlZnM+CiAgICA8c3R5bGU+LmNscy0xIHsgZmlsbDogbm9uZTsgfTwvc3R5bGU+CiAgPC9kZWZzPgogIDxwYXRoCiAgICBkPSdNMjQsMjZhMywzLDAsMSwwLTIuODE2NC00SDEzdjFhNSw1LDAsMSwxLTUtNVYxNmE3LDcsMCwxLDAsNi45Mjg3LDhoNi4yNTQ5QTIuOTkxNCwyLjk5MTQsMCwwLDAsMjQsMjZaJy8+CiAgPHBhdGgKICAgIGQ9J00yNCwxNmE3LjAyNCw3LjAyNCwwLDAsMC0yLjU3LjQ4NzNsLTMuMTY1Ni01LjUzOTVhMy4wNDY5LDMuMDQ2OSwwLDEsMC0xLjczMjYuOTk4NWw0LjExODksNy4yMDg1Ljg2ODYtLjQ5NzZhNS4wMDA2LDUuMDAwNiwwLDEsMS0xLjg1MSw2Ljg0MThMMTcuOTM3LDI2LjUwMUE3LjAwMDUsNy4wMDA1LDAsMSwwLDI0LDE2WicvPgogIDxwYXRoCiAgICBkPSdNOC41MzIsMjAuMDUzN2EzLjAzLDMuMDMsMCwxLDAsMS43MzI2Ljk5ODVDMTEuNzQsMTguNDcsMTMuODYsMTQuNzYwNywxMy44OSwxNC43MDhsLjQ5NzYtLjg2ODItLjg2NzctLjQ5N2E1LDUsMCwxLDEsNi44MTItMS44NDM4bDEuNzMxNSwxLjAwMmE3LjAwMDgsNy4wMDA4LDAsMSwwLTEwLjM0NjIsMi4wMzU2Yy0uNDU3Ljc0MjctMS4xMDIxLDEuODcxNi0yLjA3MzcsMy41NzI4WicvPgogIDxyZWN0IGlkPSdfVHJhbnNwYXJlbnRfUmVjdGFuZ2xlXycgZGF0YS1uYW1lPScmbHQ7VHJhbnNwYXJlbnQgUmVjdGFuZ2xlJmd0OycgY2xhc3M9J2Nscy0xJwogICAgd2lkdGg9JzMyJyBoZWlnaHQ9JzMyJy8+Cjwvc3ZnPg=="
     },
     "engines": {
-      "camunda": "^8.4"
+      "camunda": "^8.6"
     }
   },
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "Webhook connector",
+    "name": "Webhook Intermediate Event Connector",
     "id": "io.camunda.connectors.webhook.WebhookConnectorIntermediate.v1",
-    "version": 2,
     "description": "Configure webhook to receive callbacks",
     "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
+    "version": 10,
     "category": {
       "id": "connectors",
       "name": "Connectors"
@@ -2452,279 +2379,56 @@
         "id": "endpoint",
         "label": "Webhook configuration"
       },
+      {
+        "id": "authentication",
+        "label": "Authentication"
+      },
+      {
+        "id": "authorization",
+        "label": "Authorization"
+      },
+      {
+        "id": "webhookResponse",
+        "label": "Webhook response"
+      },
       {
         "id": "activation",
         "label": "Activation"
       },
       {
-        "id": "variable-mapping",
-        "label": "Variable mapping"
+        "id": "correlation",
+        "label": "Correlation"
+      },
+      {
+        "id": "output",
+        "label": "Output mapping"
       }
     ],
     "properties": [
       {
-        "type": "Hidden",
         "value": "io.camunda:webhook: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",
-        "value": "ConfigurableInboundWebhook",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.subtype"
-        }
+        "type": "Hidden"
       },
       {
-        "label": "Webhook ID",
-        "type": "String",
+        "id": "inbound.method",
+        "label": "Webhook method",
+        "description": "Select HTTP method",
+        "optional": false,
+        "value": "any",
         "group": "endpoint",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.context"
+          "name": "inbound.method",
+          "type": "zeebe:property"
         },
-        "description": "The webhook ID is a part of the URL",
-        "constraints": {
-          "notEmpty": true
-        }
-      },
-      {
-        "id": "shouldValidateHmac",
-        "label": "HMAC authentication",
-        "group": "endpoint",
-        "description": "Choose whether HMAC verification is enabled. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a> and <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#example' target='_blank'>example</a> that explains how to use HMAC-related fields",
-        "value": "disabled",
         "type": "Dropdown",
         "choices": [
           {
-            "name": "Enabled",
-            "value": "enabled"
-          },
-          {
-            "name": "Disabled",
-            "value": "disabled"
-          }
-        ],
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.shouldValidateHmac"
-        }
-      },
-      {
-        "label": "HMAC secret key",
-        "description": "Shared secret key",
-        "type": "String",
-        "group": "endpoint",
-        "optional": true,
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.hmacSecret"
-        },
-        "condition": {
-          "property": "shouldValidateHmac",
-          "equals": "enabled"
-        }
-      },
-      {
-        "label": "HMAC header",
-        "description": "Name of header attribute that will contain the HMAC value",
-        "type": "String",
-        "group": "endpoint",
-        "optional": true,
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.hmacHeader"
-        },
-        "condition": {
-          "property": "shouldValidateHmac",
-          "equals": "enabled"
-        }
-      },
-      {
-        "label": "HMAC algorithm",
-        "group": "endpoint",
-        "description": "Choose HMAC algorithm",
-        "value": "sha_256",
-        "type": "Dropdown",
-        "choices": [
-          {
-            "name": "SHA-1",
-            "value": "sha_1"
-          },
-          {
-            "name": "SHA-256",
-            "value": "sha_256"
-          },
-          {
-            "name": "SHA-512",
-            "value": "sha_512"
-          }
-        ],
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.hmacAlgorithm"
-        },
-        "condition": {
-          "property": "shouldValidateHmac",
-          "equals": "enabled"
-        }
-      },
-      {
-        "label": "Correlation key (process)",
-        "type": "String",
-        "group": "activation",
-        "feel": "required",
-        "description": "Sets up the correlation key from process variables",
-        "binding": {
-          "type": "bpmn:Message#zeebe:subscription#property",
-          "name": "correlationKey"
-        },
-        "constraints": {
-          "notEmpty": true
-        }
-      },
-      {
-        "label": "Correlation key (payload)",
-        "type": "String",
-        "group": "activation",
-        "feel": "required",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "correlationKeyExpression"
-        },
-        "description": "Extracts the correlation key from the incoming message payload",
-        "constraints": {
-          "notEmpty": true
-        }
-      },
-      {
-        "label": "Condition",
-        "type": "String",
-        "group": "activation",
-        "feel": "required",
-        "optional": true,
-        "binding": {
-          "type": "zeebe:property",
-          "name": "activationCondition"
-        },
-        "description": "Condition under which the connector triggers. Leave empty to catch all events. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a>"
-      },
-      {
-        "label": "Result variable",
-        "type": "String",
-        "group": "variable-mapping",
-        "optional": true,
-        "binding": {
-          "type": "zeebe:property",
-          "name": "resultVariable"
-        },
-        "description": "Name of variable to store the result of the connector in"
-      },
-      {
-        "label": "Result expression",
-        "type": "String",
-        "group": "variable-mapping",
-        "feel": "required",
-        "optional": true,
-        "binding": {
-          "type": "zeebe:property",
-          "name": "resultExpression"
-        },
-        "description": "Expression to map the inbound payload to process variables"
-      }
-    ],
-    "icon": {
-      "contents": "data:image/svg+xml,%3Csvg id='icon' xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='0 0 32 32'%3E%3Cdefs%3E%3Cstyle%3E .cls-1 %7B fill: none; %7D %3C/style%3E%3C/defs%3E%3Cpath d='M24,26a3,3,0,1,0-2.8164-4H13v1a5,5,0,1,1-5-5V16a7,7,0,1,0,6.9287,8h6.2549A2.9914,2.9914,0,0,0,24,26Z'/%3E%3Cpath d='M24,16a7.024,7.024,0,0,0-2.57.4873l-3.1656-5.5395a3.0469,3.0469,0,1,0-1.7326.9985l4.1189,7.2085.8686-.4976a5.0006,5.0006,0,1,1-1.851,6.8418L17.937,26.501A7.0005,7.0005,0,1,0,24,16Z'/%3E%3Cpath d='M8.532,20.0537a3.03,3.03,0,1,0,1.7326.9985C11.74,18.47,13.86,14.7607,13.89,14.708l.4976-.8682-.8677-.497a5,5,0,1,1,6.812-1.8438l1.7315,1.002a7.0008,7.0008,0,1,0-10.3462,2.0356c-.457.7427-1.1021,1.8716-2.0737,3.5728Z'/%3E%3Crect id='_Transparent_Rectangle_' data-name='&lt;Transparent Rectangle&gt;' class='cls-1' width='32' height='32'/%3E%3C/svg%3E"
-    },
-    "engines": {
-      "camunda": "^8.2"
-    }
-  },
-  {
-    "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "Webhook Intermediate Event Connector",
-    "id": "io.camunda.connectors.webhook.WebhookConnectorIntermediate.v1",
-    "description": "Configure webhook to receive callbacks",
-    "documentationRef": "https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/",
-    "version": 11,
-    "category": {
-      "id": "connectors",
-      "name": "Connectors"
-    },
-    "appliesTo": ["bpmn:IntermediateCatchEvent", "bpmn:IntermediateThrowEvent"],
-    "elementType": {
-      "value": "bpmn:IntermediateCatchEvent",
-      "eventDefinition": "bpmn:MessageEventDefinition"
-    },
-    "groups": [
-      {
-        "id": "endpoint",
-        "label": "Webhook configuration"
-      },
-      {
-        "id": "authentication",
-        "label": "Authentication"
-      },
-      {
-        "id": "authorization",
-        "label": "Authorization"
-      },
-      {
-        "id": "webhookResponse",
-        "label": "Webhook response"
-      },
-      {
-        "id": "activation",
-        "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": "output",
-        "label": "Output mapping"
-      }
-    ],
-    "properties": [
-      {
-        "value": "io.camunda:webhook:1",
-        "binding": {
-          "name": "inbound.type",
-          "type": "zeebe:property"
-        },
-        "type": "Hidden"
-      },
-      {
-        "id": "inbound.method",
-        "label": "Webhook method",
-        "description": "Select HTTP method",
-        "optional": false,
-        "value": "any",
-        "group": "endpoint",
-        "binding": {
-          "name": "inbound.method",
-          "type": "zeebe:property"
-        },
-        "type": "Dropdown",
-        "choices": [
-          {
-            "name": "Any",
-            "value": "any"
+            "name": "Any",
+            "value": "any"
           },
           {
             "name": "GET",
@@ -2766,7 +2470,7 @@
       {
         "id": "inbound.shouldValidateHmac",
         "label": "HMAC authentication",
-        "description": "Choose whether HMAC verification is enabled. <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a> and <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#example' target='_blank'>example</a> that explains how to use HMAC-related fields",
+        "description": "Choose whether HMAC verification is enabled. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a> and <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#example' target='_blank'>example</a> that explains how to use HMAC-related fields",
         "optional": false,
         "value": "disabled",
         "group": "authentication",
@@ -2857,7 +2561,7 @@
       {
         "id": "inbound.hmacScopes",
         "label": "HMAC scopes",
-        "description": "Set HMAC scopes for calculating signature data. See <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/' target='_blank'>documentation</a>",
+        "description": "Set HMAC scopes for calculating signature data. See <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/' target='_blank'>documentation</a>",
         "optional": true,
         "feel": "required",
         "group": "authentication",
@@ -2959,7 +2663,7 @@
       {
         "id": "inbound.auth.apiKeyLocator",
         "label": "API key locator",
-        "description": "A FEEL expression that extracts API key from the request. <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#how-to-configure-api-key-authorization'>See documentation</a>",
+        "description": "A FEEL expression that extracts API key from the request. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#how-to-configure-api-key-authorization'>See documentation</a>",
         "optional": false,
         "value": "=split(request.headers.authorization, \" \")[2]",
         "constraints": {
@@ -2999,7 +2703,7 @@
       {
         "id": "inbound.auth.jwt.permissionsExpression",
         "label": "JWT role property expression",
-        "description": "Expression to extract the roles from the JWT token. <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#how-to-extract-roles-from-jwt-data'>See documentation</a>",
+        "description": "Expression to extract the roles from the JWT token. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#how-to-extract-roles-from-jwt-data'>See documentation</a>",
         "optional": false,
         "feel": "required",
         "group": "authorization",
@@ -3033,14 +2737,14 @@
         "type": "String"
       },
       {
-        "id": "inbound.responseExpression",
-        "label": "Response expression",
-        "description": "Expression used to generate the HTTP response",
+        "id": "inbound.responseBodyExpression",
+        "label": "Response body expression",
+        "description": "Specify condition and response",
         "optional": true,
         "feel": "required",
         "group": "webhookResponse",
         "binding": {
-          "name": "inbound.responseExpression",
+          "name": "inbound.responseBodyExpression",
           "type": "zeebe:property"
         },
         "type": "Text"
@@ -3071,18 +2775,6 @@
         },
         "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)",
@@ -3126,26 +2818,6 @@
         },
         "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": {
@@ -3186,7 +2858,7 @@
       "contents": "data:image/svg+xml;base64,PHN2ZyBpZD0naWNvbicgeG1sbnM9J2h0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnJyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCAzMiAzMic+CiAgPGRlZnM+CiAgICA8c3R5bGU+LmNscy0xIHsgZmlsbDogbm9uZTsgfTwvc3R5bGU+CiAgPC9kZWZzPgogIDxwYXRoCiAgICBkPSdNMjQsMjZhMywzLDAsMSwwLTIuODE2NC00SDEzdjFhNSw1LDAsMSwxLTUtNVYxNmE3LDcsMCwxLDAsNi45Mjg3LDhoNi4yNTQ5QTIuOTkxNCwyLjk5MTQsMCwwLDAsMjQsMjZaJy8+CiAgPHBhdGgKICAgIGQ9J00yNCwxNmE3LjAyNCw3LjAyNCwwLDAsMC0yLjU3LjQ4NzNsLTMuMTY1Ni01LjUzOTVhMy4wNDY5LDMuMDQ2OSwwLDEsMC0xLjczMjYuOTk4NWw0LjExODksNy4yMDg1Ljg2ODYtLjQ5NzZhNS4wMDA2LDUuMDAwNiwwLDEsMS0xLjg1MSw2Ljg0MThMMTcuOTM3LDI2LjUwMUE3LjAwMDUsNy4wMDA1LDAsMSwwLDI0LDE2WicvPgogIDxwYXRoCiAgICBkPSdNOC41MzIsMjAuMDUzN2EzLjAzLDMuMDMsMCwxLDAsMS43MzI2Ljk5ODVDMTEuNzQsMTguNDcsMTMuODYsMTQuNzYwNywxMy44OSwxNC43MDhsLjQ5NzYtLjg2ODItLjg2NzctLjQ5N2E1LDUsMCwxLDEsNi44MTItMS44NDM4bDEuNzMxNSwxLjAwMmE3LjAwMDgsNy4wMDA4LDAsMSwwLTEwLjM0NjIsMi4wMzU2Yy0uNDU3Ljc0MjctMS4xMDIxLDEuODcxNi0yLjA3MzcsMy41NzI4WicvPgogIDxyZWN0IGlkPSdfVHJhbnNwYXJlbnRfUmVjdGFuZ2xlXycgZGF0YS1uYW1lPScmbHQ7VHJhbnNwYXJlbnQgUmVjdGFuZ2xlJmd0OycgY2xhc3M9J2Nscy0xJwogICAgd2lkdGg9JzMyJyBoZWlnaHQ9JzMyJy8+Cjwvc3ZnPg=="
     },
     "engines": {
-      "camunda": "^8.6"
+      "camunda": "^8.5"
     }
   },
   {
@@ -3194,11 +2866,14 @@
     "name": "Webhook Intermediate Event Connector",
     "id": "io.camunda.connectors.webhook.WebhookConnectorIntermediate.v1",
     "description": "Configure webhook to receive callbacks",
-    "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
-    "version": 10,
-    "category": {
-      "id": "connectors",
-      "name": "Connectors"
+    "metadata": {
+      "keywords": []
+    },
+    "documentationRef": "https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/",
+    "version": 12,
+    "category": {
+      "id": "connectors",
+      "name": "Connectors"
     },
     "appliesTo": ["bpmn:IntermediateCatchEvent", "bpmn:IntermediateThrowEvent"],
     "elementType": {
@@ -3228,7 +2903,8 @@
       },
       {
         "id": "correlation",
-        "label": "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": "output",
@@ -3301,7 +2977,7 @@
       {
         "id": "inbound.shouldValidateHmac",
         "label": "HMAC authentication",
-        "description": "Choose whether HMAC verification is enabled. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a> and <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#example' target='_blank'>example</a> that explains how to use HMAC-related fields",
+        "description": "Choose whether HMAC verification is enabled. <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a> and <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#example' target='_blank'>example</a> that explains how to use HMAC-related fields",
         "optional": false,
         "value": "disabled",
         "group": "authentication",
@@ -3392,7 +3068,7 @@
       {
         "id": "inbound.hmacScopes",
         "label": "HMAC scopes",
-        "description": "Set HMAC scopes for calculating signature data. See <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/' target='_blank'>documentation</a>",
+        "description": "Set HMAC scopes for calculating signature data. See <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/' target='_blank'>documentation</a>",
         "optional": true,
         "feel": "required",
         "group": "authentication",
@@ -3494,7 +3170,7 @@
       {
         "id": "inbound.auth.apiKeyLocator",
         "label": "API key locator",
-        "description": "A FEEL expression that extracts API key from the request. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#how-to-configure-api-key-authorization'>See documentation</a>",
+        "description": "A FEEL expression that extracts API key from the request. <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#how-to-configure-api-key-authorization'>See documentation</a>",
         "optional": false,
         "value": "=split(request.headers.authorization, \" \")[2]",
         "constraints": {
@@ -3534,7 +3210,7 @@
       {
         "id": "inbound.auth.jwt.permissionsExpression",
         "label": "JWT role property expression",
-        "description": "Expression to extract the roles from the JWT token. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#how-to-extract-roles-from-jwt-data'>See documentation</a>",
+        "description": "Expression to extract the roles from the JWT token. <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#how-to-extract-roles-from-jwt-data'>See documentation</a>",
         "optional": false,
         "feel": "required",
         "group": "authorization",
@@ -3568,14 +3244,14 @@
         "type": "String"
       },
       {
-        "id": "inbound.responseBodyExpression",
-        "label": "Response body expression",
-        "description": "Specify condition and response",
+        "id": "inbound.responseExpression",
+        "label": "Response expression",
+        "description": "Expression used to generate the HTTP response",
         "optional": true,
         "feel": "required",
         "group": "webhookResponse",
         "binding": {
-          "name": "inbound.responseBodyExpression",
+          "name": "inbound.responseExpression",
           "type": "zeebe:property"
         },
         "type": "Text"
@@ -3606,6 +3282,18 @@
         },
         "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)",
@@ -3649,6 +3337,26 @@
         },
         "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": {
@@ -3685,23 +3393,20 @@
         "type": "Text"
       }
     ],
+    "engines": {
+      "camunda": "^8.3"
+    },
     "icon": {
       "contents": "data:image/svg+xml;base64,PHN2ZyBpZD0naWNvbicgeG1sbnM9J2h0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnJyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCAzMiAzMic+CiAgPGRlZnM+CiAgICA8c3R5bGU+LmNscy0xIHsgZmlsbDogbm9uZTsgfTwvc3R5bGU+CiAgPC9kZWZzPgogIDxwYXRoCiAgICBkPSdNMjQsMjZhMywzLDAsMSwwLTIuODE2NC00SDEzdjFhNSw1LDAsMSwxLTUtNVYxNmE3LDcsMCwxLDAsNi45Mjg3LDhoNi4yNTQ5QTIuOTkxNCwyLjk5MTQsMCwwLDAsMjQsMjZaJy8+CiAgPHBhdGgKICAgIGQ9J00yNCwxNmE3LjAyNCw3LjAyNCwwLDAsMC0yLjU3LjQ4NzNsLTMuMTY1Ni01LjUzOTVhMy4wNDY5LDMuMDQ2OSwwLDEsMC0xLjczMjYuOTk4NWw0LjExODksNy4yMDg1Ljg2ODYtLjQ5NzZhNS4wMDA2LDUuMDAwNiwwLDEsMS0xLjg1MSw2Ljg0MThMMTcuOTM3LDI2LjUwMUE3LjAwMDUsNy4wMDA1LDAsMSwwLDI0LDE2WicvPgogIDxwYXRoCiAgICBkPSdNOC41MzIsMjAuMDUzN2EzLjAzLDMuMDMsMCwxLDAsMS43MzI2Ljk5ODVDMTEuNzQsMTguNDcsMTMuODYsMTQuNzYwNywxMy44OSwxNC43MDhsLjQ5NzYtLjg2ODItLjg2NzctLjQ5N2E1LDUsMCwxLDEsNi44MTItMS44NDM4bDEuNzMxNSwxLjAwMmE3LjAwMDgsNy4wMDA4LDAsMSwwLTEwLjM0NjIsMi4wMzU2Yy0uNDU3Ljc0MjctMS4xMDIxLDEuODcxNi0yLjA3MzcsMy41NzI4WicvPgogIDxyZWN0IGlkPSdfVHJhbnNwYXJlbnRfUmVjdGFuZ2xlXycgZGF0YS1uYW1lPScmbHQ7VHJhbnNwYXJlbnQgUmVjdGFuZ2xlJmd0OycgY2xhc3M9J2Nscy0xJwogICAgd2lkdGg9JzMyJyBoZWlnaHQ9JzMyJy8+Cjwvc3ZnPg=="
-    },
-    "engines": {
-      "camunda": "^8.5"
     }
   },
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "Webhook Intermediate Event Connector",
+    "name": "Webhook connector",
     "id": "io.camunda.connectors.webhook.WebhookConnectorIntermediate.v1",
+    "version": 3,
     "description": "Configure webhook to receive callbacks",
-    "metadata": {
-      "keywords": []
-    },
-    "documentationRef": "https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/",
-    "version": 12,
+    "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
     "category": {
       "id": "connectors",
       "name": "Connectors"
@@ -3724,44 +3429,48 @@
         "id": "authorization",
         "label": "Authorization"
       },
-      {
-        "id": "webhookResponse",
-        "label": "Webhook response"
-      },
       {
         "id": "activation",
         "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": "output",
-        "label": "Output mapping"
+        "id": "variable-mapping",
+        "label": "Variable mapping"
       }
     ],
     "properties": [
       {
+        "type": "Hidden",
         "value": "io.camunda:webhook: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": "inbound.method",
+        "type": "Hidden",
+        "value": "ConfigurableInboundWebhook",
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.subtype"
+        }
+      },
+      {
+        "id": "webhookMethod",
         "label": "Webhook method",
+        "group": "endpoint",
         "description": "Select HTTP method",
-        "optional": false,
         "value": "any",
-        "group": "endpoint",
-        "binding": {
-          "name": "inbound.method",
-          "type": "zeebe:property"
-        },
         "type": "Dropdown",
         "choices": [
           {
@@ -3769,53 +3478,46 @@
             "value": "any"
           },
           {
-            "name": "GET",
+            "name": "Get",
             "value": "get"
           },
           {
-            "name": "POST",
+            "name": "Post",
             "value": "post"
           },
           {
-            "name": "PUT",
+            "name": "Put",
             "value": "put"
           },
           {
-            "name": "DELETE",
+            "name": "Delete",
             "value": "delete"
           }
-        ]
+        ],
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.method"
+        }
       },
       {
-        "id": "inbound.context",
         "label": "Webhook ID",
-        "description": "The webhook ID is a part of the URL",
-        "optional": false,
-        "constraints": {
-          "notEmpty": true,
-          "pattern": {
-            "value": "^[a-zA-Z0-9]+([-_][a-zA-Z0-9]+)*$",
-            "message": "can only contain letters, numbers, or single underscores/hyphens and cannot begin or end with an underscore/hyphen"
-          }
-        },
+        "type": "String",
         "group": "endpoint",
         "binding": {
-          "name": "inbound.context",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.context"
         },
-        "type": "String"
+        "description": "The webhook ID is a part of the URL",
+        "constraints": {
+          "notEmpty": true
+        }
       },
       {
-        "id": "inbound.shouldValidateHmac",
+        "id": "shouldValidateHmac",
         "label": "HMAC authentication",
-        "description": "Choose whether HMAC verification is enabled. <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a> and <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#example' target='_blank'>example</a> that explains how to use HMAC-related fields",
-        "optional": false,
-        "value": "disabled",
         "group": "authentication",
-        "binding": {
-          "name": "inbound.shouldValidateHmac",
-          "type": "zeebe:property"
-        },
+        "description": "Choose whether HMAC verification is enabled. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a> and <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#example' target='_blank'>example</a> that explains how to use HMAC-related fields",
+        "value": "disabled",
         "type": "Dropdown",
         "choices": [
           {
@@ -3826,60 +3528,47 @@
             "name": "Disabled",
             "value": "disabled"
           }
-        ]
+        ],
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.shouldValidateHmac"
+        }
       },
       {
-        "id": "inbound.hmacSecret",
         "label": "HMAC secret key",
         "description": "Shared secret key",
-        "optional": true,
-        "feel": "optional",
+        "type": "String",
         "group": "authentication",
+        "optional": true,
         "binding": {
-          "name": "inbound.hmacSecret",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.hmacSecret"
         },
         "condition": {
-          "property": "inbound.shouldValidateHmac",
-          "equals": "enabled",
-          "type": "simple"
-        },
-        "type": "String"
+          "property": "shouldValidateHmac",
+          "equals": "enabled"
+        }
       },
       {
-        "id": "inbound.hmacHeader",
         "label": "HMAC header",
         "description": "Name of header attribute that will contain the HMAC value",
-        "optional": true,
-        "feel": "optional",
+        "type": "String",
         "group": "authentication",
+        "optional": true,
         "binding": {
-          "name": "inbound.hmacHeader",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.hmacHeader"
         },
         "condition": {
-          "property": "inbound.shouldValidateHmac",
-          "equals": "enabled",
-          "type": "simple"
-        },
-        "type": "String"
+          "property": "shouldValidateHmac",
+          "equals": "enabled"
+        }
       },
       {
-        "id": "inbound.hmacAlgorithm",
         "label": "HMAC algorithm",
+        "group": "authentication",
         "description": "Choose HMAC algorithm",
-        "optional": false,
         "value": "sha_256",
-        "group": "authentication",
-        "binding": {
-          "name": "inbound.hmacAlgorithm",
-          "type": "zeebe:property"
-        },
-        "condition": {
-          "property": "inbound.shouldValidateHmac",
-          "equals": "enabled",
-          "type": "simple"
-        },
         "type": "Dropdown",
         "choices": [
           {
@@ -3894,341 +3583,252 @@
             "name": "SHA-512",
             "value": "sha_512"
           }
-        ]
+        ],
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.hmacAlgorithm"
+        },
+        "condition": {
+          "property": "shouldValidateHmac",
+          "equals": "enabled"
+        }
       },
       {
-        "id": "inbound.hmacScopes",
         "label": "HMAC scopes",
-        "description": "Set HMAC scopes for calculating signature data. See <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/' target='_blank'>documentation</a>",
-        "optional": true,
-        "feel": "required",
         "group": "authentication",
+        "description": "Set HMAC scopes for calculating signature data. See <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/' target='_blank'>documentation</a>",
+        "feel": "required",
+        "type": "String",
+        "optional": true,
         "binding": {
-          "name": "inbound.hmacScopes",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.hmacScopes"
         },
         "condition": {
-          "property": "inbound.shouldValidateHmac",
-          "equals": "enabled",
-          "type": "simple"
-        },
-        "type": "String"
+          "property": "shouldValidateHmac",
+          "equals": "enabled"
+        }
       },
       {
-        "id": "inbound.auth.type",
+        "id": "authorizationType",
         "label": "Authorization type",
-        "description": "Choose the authorization type",
-        "value": "NONE",
         "group": "authorization",
-        "binding": {
-          "name": "inbound.auth.type",
-          "type": "zeebe:property"
-        },
+        "description": "Choose the authorization type.",
+        "value": "NONE",
         "type": "Dropdown",
         "choices": [
           {
             "name": "None",
             "value": "NONE"
           },
+          {
+            "name": "JWT",
+            "value": "JWT"
+          },
           {
             "name": "Basic",
             "value": "BASIC"
           },
           {
-            "name": "API key",
+            "name": "API Key",
             "value": "APIKEY"
-          },
-          {
-            "name": "JWT",
-            "value": "JWT"
           }
-        ]
+        ],
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.auth.type"
+        }
       },
       {
-        "id": "inbound.auth.username",
-        "label": "Username",
-        "description": "Username for basic authentication",
-        "optional": false,
-        "feel": "optional",
+        "label": "JWK url",
+        "description": "Well-known url of JWKs",
+        "type": "String",
         "group": "authorization",
+        "feel": "optional",
+        "optional": true,
         "binding": {
-          "name": "inbound.auth.username",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.auth.jwt.jwkUrl"
         },
         "condition": {
-          "property": "inbound.auth.type",
-          "equals": "BASIC",
-          "type": "simple"
-        },
-        "type": "String"
+          "property": "authorizationType",
+          "equals": "JWT"
+        }
       },
       {
-        "id": "inbound.auth.password",
-        "label": "Password",
-        "description": "Password for basic authentication",
-        "optional": false,
-        "feel": "optional",
+        "label": "JWT role property expression",
+        "description": "Expression to extract the roles from the JWT token. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#how-to-extract-roles-from-jwt-data'>See documentation</a>",
+        "type": "String",
         "group": "authorization",
+        "feel": "required",
+        "optional": true,
         "binding": {
-          "name": "inbound.auth.password",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.auth.jwt.permissionsExpression"
         },
         "condition": {
-          "property": "inbound.auth.type",
-          "equals": "BASIC",
-          "type": "simple"
-        },
-        "type": "String"
+          "property": "authorizationType",
+          "equals": "JWT"
+        }
       },
       {
-        "id": "inbound.auth.apiKey",
-        "label": "API key",
-        "description": "Expected API key",
-        "optional": false,
-        "feel": "optional",
+        "label": "Required roles",
+        "description": "List of roles to test JWT roles against",
+        "type": "String",
         "group": "authorization",
+        "feel": "required",
+        "optional": true,
         "binding": {
-          "name": "inbound.auth.apiKey",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.auth.jwt.requiredPermissions"
         },
         "condition": {
-          "property": "inbound.auth.type",
-          "equals": "APIKEY",
-          "type": "simple"
-        },
-        "type": "String"
+          "property": "authorizationType",
+          "equals": "JWT"
+        }
       },
       {
-        "id": "inbound.auth.apiKeyLocator",
-        "label": "API key locator",
-        "description": "A FEEL expression that extracts API key from the request. <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#how-to-configure-api-key-authorization'>See documentation</a>",
-        "optional": false,
-        "value": "=split(request.headers.authorization, \" \")[2]",
-        "constraints": {
-          "notEmpty": true
-        },
-        "feel": "required",
+        "label": "Username",
+        "description": "Username for basic authentication",
+        "type": "String",
         "group": "authorization",
+        "feel": "optional",
         "binding": {
-          "name": "inbound.auth.apiKeyLocator",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.auth.username"
         },
         "condition": {
-          "property": "inbound.auth.type",
-          "equals": "APIKEY",
-          "type": "simple"
+          "property": "authorizationType",
+          "equals": "BASIC"
         },
-        "type": "String"
+        "constraints": {
+          "notEmpty": true
+        }
       },
       {
-        "id": "inbound.auth.jwt.jwkUrl",
-        "label": "JWK URL",
-        "description": "Well-known URL of JWKs",
-        "optional": false,
-        "feel": "optional",
+        "label": "Password",
+        "description": "Password for basic authentication",
+        "type": "String",
         "group": "authorization",
+        "feel": "optional",
         "binding": {
-          "name": "inbound.auth.jwt.jwkUrl",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.auth.password"
         },
         "condition": {
-          "property": "inbound.auth.type",
-          "equals": "JWT",
-          "type": "simple"
+          "property": "authorizationType",
+          "equals": "BASIC"
         },
-        "type": "String"
+        "constraints": {
+          "notEmpty": true
+        }
       },
       {
-        "id": "inbound.auth.jwt.permissionsExpression",
-        "label": "JWT role property expression",
-        "description": "Expression to extract the roles from the JWT token. <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#how-to-extract-roles-from-jwt-data'>See documentation</a>",
-        "optional": false,
-        "feel": "required",
+        "label": "API Key",
+        "description": "Expected API key",
+        "type": "String",
         "group": "authorization",
+        "feel": "optional",
         "binding": {
-          "name": "inbound.auth.jwt.permissionsExpression",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.auth.apiKey"
         },
         "condition": {
-          "property": "inbound.auth.type",
-          "equals": "JWT",
-          "type": "simple"
+          "property": "authorizationType",
+          "equals": "APIKEY"
         },
-        "type": "String"
+        "constraints": {
+          "notEmpty": true
+        }
       },
       {
-        "id": "inbound.auth.jwt.requiredPermissions",
-        "label": "Required roles",
-        "description": "List of roles to test JWT roles against",
-        "optional": false,
-        "feel": "required",
+        "label": "API Key locator",
+        "description": "A FEEL expression that extracts API key from the request. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#how-to-configure-api-key-authorization'>See documentation</a>",
+        "type": "String",
         "group": "authorization",
+        "feel": "required",
         "binding": {
-          "name": "inbound.auth.jwt.requiredPermissions",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.auth.apiKeyLocator"
         },
         "condition": {
-          "property": "inbound.auth.type",
-          "equals": "JWT",
-          "type": "simple"
+          "property": "authorizationType",
+          "equals": "APIKEY"
         },
-        "type": "String"
+        "constraints": {
+          "notEmpty": true
+        },
+        "value": "=split(request.headers.authorization, \" \")[2]"
       },
       {
-        "id": "inbound.responseExpression",
-        "label": "Response expression",
-        "description": "Expression used to generate the HTTP response",
-        "optional": true,
+        "label": "Correlation key (process)",
+        "type": "String",
+        "group": "activation",
         "feel": "required",
-        "group": "webhookResponse",
+        "description": "Sets up the correlation key from process variables",
         "binding": {
-          "name": "inbound.responseExpression",
-          "type": "zeebe:property"
+          "type": "bpmn:Message#zeebe:subscription#property",
+          "name": "correlationKey"
         },
-        "type": "Text"
+        "constraints": {
+          "notEmpty": true
+        }
       },
       {
-        "id": "inbound.verificationExpression",
-        "label": "One time verification response expression",
-        "description": "Specify condition and response. Learn more in the <a href='https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#verification-expression' target='_blank'>documentation</a>",
-        "optional": true,
+        "label": "Correlation key (payload)",
+        "type": "String",
+        "group": "activation",
         "feel": "required",
-        "group": "webhookResponse",
         "binding": {
-          "name": "inbound.verificationExpression",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "correlationKeyExpression"
         },
-        "type": "Text"
+        "description": "Extracts the correlation key from the incoming message payload",
+        "constraints": {
+          "notEmpty": true
+        }
       },
       {
-        "id": "activationCondition",
-        "label": "Activation condition",
-        "description": "Condition under which the Connector triggers. Leave empty to catch all events",
-        "optional": true,
-        "feel": "required",
+        "label": "Condition",
+        "type": "String",
         "group": "activation",
+        "feel": "required",
+        "optional": true,
         "binding": {
-          "name": "activationCondition",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "activationCondition"
         },
-        "type": "String"
+        "description": "Condition under which the connector triggers. Leave empty to catch all events. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a>"
       },
       {
-        "id": "consumeUnmatchedEvents",
-        "label": "Consume unmatched events",
-        "value": true,
-        "group": "activation",
+        "label": "Result variable",
+        "type": "String",
+        "group": "variable-mapping",
+        "optional": true,
         "binding": {
-          "name": "consumeUnmatchedEvents",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "resultVariable"
         },
-        "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"
+        "description": "Name of variable to store the result of the connector in"
       },
       {
-        "id": "correlationKeyProcess",
-        "label": "Correlation key (process)",
-        "description": "Sets up the correlation key from process variables",
-        "constraints": {
-          "notEmpty": true
-        },
+        "label": "Result expression",
+        "type": "String",
+        "group": "variable-mapping",
         "feel": "required",
-        "group": "correlation",
+        "optional": true,
         "binding": {
-          "name": "correlationKey",
-          "type": "bpmn:Message#zeebe:subscription#property"
+          "type": "zeebe:property",
+          "name": "resultExpression"
         },
-        "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,
-        "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": "resultVariable",
-        "label": "Result variable",
-        "description": "Name of variable to store the response in",
-        "group": "output",
-        "binding": {
-          "name": "resultVariable",
-          "type": "zeebe:property"
-        },
-        "type": "String"
-      },
-      {
-        "id": "resultExpression",
-        "label": "Result expression",
-        "description": "Expression to map the response into process variables",
-        "feel": "required",
-        "group": "output",
-        "binding": {
-          "name": "resultExpression",
-          "type": "zeebe:property"
-        },
-        "type": "Text"
+        "description": "Expression to map the inbound payload to process variables"
       }
     ],
-    "engines": {
-      "camunda": "^8.3"
-    },
     "icon": {
-      "contents": "data:image/svg+xml;base64,PHN2ZyBpZD0naWNvbicgeG1sbnM9J2h0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnJyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCAzMiAzMic+CiAgPGRlZnM+CiAgICA8c3R5bGU+LmNscy0xIHsgZmlsbDogbm9uZTsgfTwvc3R5bGU+CiAgPC9kZWZzPgogIDxwYXRoCiAgICBkPSdNMjQsMjZhMywzLDAsMSwwLTIuODE2NC00SDEzdjFhNSw1LDAsMSwxLTUtNVYxNmE3LDcsMCwxLDAsNi45Mjg3LDhoNi4yNTQ5QTIuOTkxNCwyLjk5MTQsMCwwLDAsMjQsMjZaJy8+CiAgPHBhdGgKICAgIGQ9J00yNCwxNmE3LjAyNCw3LjAyNCwwLDAsMC0yLjU3LjQ4NzNsLTMuMTY1Ni01LjUzOTVhMy4wNDY5LDMuMDQ2OSwwLDEsMC0xLjczMjYuOTk4NWw0LjExODksNy4yMDg1Ljg2ODYtLjQ5NzZhNS4wMDA2LDUuMDAwNiwwLDEsMS0xLjg1MSw2Ljg0MThMMTcuOTM3LDI2LjUwMUE3LjAwMDUsNy4wMDA1LDAsMSwwLDI0LDE2WicvPgogIDxwYXRoCiAgICBkPSdNOC41MzIsMjAuMDUzN2EzLjAzLDMuMDMsMCwxLDAsMS43MzI2Ljk5ODVDMTEuNzQsMTguNDcsMTMuODYsMTQuNzYwNywxMy44OSwxNC43MDhsLjQ5NzYtLjg2ODItLjg2NzctLjQ5N2E1LDUsMCwxLDEsNi44MTItMS44NDM4bDEuNzMxNSwxLjAwMmE3LjAwMDgsNy4wMDA4LDAsMSwwLTEwLjM0NjIsMi4wMzU2Yy0uNDU3Ljc0MjctMS4xMDIxLDEuODcxNi0yLjA3MzcsMy41NzI4WicvPgogIDxyZWN0IGlkPSdfVHJhbnNwYXJlbnRfUmVjdGFuZ2xlXycgZGF0YS1uYW1lPScmbHQ7VHJhbnNwYXJlbnQgUmVjdGFuZ2xlJmd0OycgY2xhc3M9J2Nscy0xJwogICAgd2lkdGg9JzMyJyBoZWlnaHQ9JzMyJy8+Cjwvc3ZnPg=="
+      "contents": "data:image/svg+xml,%3Csvg id='icon' xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='0 0 32 32'%3E%3Cdefs%3E%3Cstyle%3E .cls-1 %7B fill: none; %7D %3C/style%3E%3C/defs%3E%3Cpath d='M24,26a3,3,0,1,0-2.8164-4H13v1a5,5,0,1,1-5-5V16a7,7,0,1,0,6.9287,8h6.2549A2.9914,2.9914,0,0,0,24,26Z'/%3E%3Cpath d='M24,16a7.024,7.024,0,0,0-2.57.4873l-3.1656-5.5395a3.0469,3.0469,0,1,0-1.7326.9985l4.1189,7.2085.8686-.4976a5.0006,5.0006,0,1,1-1.851,6.8418L17.937,26.501A7.0005,7.0005,0,1,0,24,16Z'/%3E%3Cpath d='M8.532,20.0537a3.03,3.03,0,1,0,1.7326.9985C11.74,18.47,13.86,14.7607,13.89,14.708l.4976-.8682-.8677-.497a5,5,0,1,1,6.812-1.8438l1.7315,1.002a7.0008,7.0008,0,1,0-10.3462,2.0356c-.457.7427-1.1021,1.8716-2.0737,3.5728Z'/%3E%3Crect id='_Transparent_Rectangle_' data-name='&lt;Transparent Rectangle&gt;' class='cls-1' width='32' height='32'/%3E%3C/svg%3E"
+    },
+    "engines": {
+      "camunda": "^8.2"
     }
   },
   {
@@ -4240,7 +3840,7 @@
       "keywords": []
     },
     "documentationRef": "https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/",
-    "version": 14,
+    "version": 13,
     "category": {
       "id": "connectors",
       "name": "Connectors"
@@ -4274,10 +3874,6 @@
         "id": "activation",
         "label": "Activation"
       },
-      {
-        "id": "synchronousResponse",
-        "label": "Response mode"
-      },
       {
         "id": "correlation",
         "label": "Correlation",
@@ -4676,29 +4272,6 @@
         "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": "synchronousResponse",
-        "label": "Response mode",
-        "description": "Synchronous or Asynchronous <a href=\"https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/#response-mode\" target=\"_blank\">response handling</a>",
-        "value": "false",
-        "group": "synchronousResponse",
-        "binding": {
-          "name": "synchronousResponse",
-          "type": "zeebe:property"
-        },
-        "tooltip": "Select synchronous to wait for the result of the correlation. This is either the result of the created process or the process instance key that matched the correlated message subscription. Select asynchronous to trigger the correlation and return immediately without waiting for a result. This affects the data available in the <a href=\"https://docs.camunda.io/docs/components/connectors/connectors/protocol/http-webhook/#use-the-correlation-object\">correlation</a> object for the response expression.",
-        "type": "Dropdown",
-        "choices": [
-          {
-            "name": "Asynchronous",
-            "value": "false"
-          },
-          {
-            "name": "Synchronous",
-            "value": "true"
-          }
-        ]
-      },
       {
         "id": "correlationKeyProcess",
         "label": "Correlation key (process)",
@@ -4740,11 +4313,6 @@
           "name": "messageIdExpression",
           "type": "zeebe:property"
         },
-        "condition": {
-          "property": "synchronousResponse",
-          "equals": "false",
-          "type": "simple"
-        },
         "type": "String"
       },
       {
@@ -4765,11 +4333,6 @@
           "name": "messageTtl",
           "type": "zeebe:property"
         },
-        "condition": {
-          "property": "synchronousResponse",
-          "equals": "false",
-          "type": "simple"
-        },
         "type": "String"
       },
       {
@@ -4875,5 +4438,452 @@
     "icon": {
       "contents": "data:image/svg+xml;base64,PHN2ZyBpZD0naWNvbicgeG1sbnM9J2h0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnJyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCAzMiAzMic+CiAgPGRlZnM+CiAgICA8c3R5bGU+LmNscy0xIHsgZmlsbDogbm9uZTsgfTwvc3R5bGU+CiAgPC9kZWZzPgogIDxwYXRoCiAgICBkPSdNMjQsMjZhMywzLDAsMSwwLTIuODE2NC00SDEzdjFhNSw1LDAsMSwxLTUtNVYxNmE3LDcsMCwxLDAsNi45Mjg3LDhoNi4yNTQ5QTIuOTkxNCwyLjk5MTQsMCwwLDAsMjQsMjZaJy8+CiAgPHBhdGgKICAgIGQ9J00yNCwxNmE3LjAyNCw3LjAyNCwwLDAsMC0yLjU3LjQ4NzNsLTMuMTY1Ni01LjUzOTVhMy4wNDY5LDMuMDQ2OSwwLDEsMC0xLjczMjYuOTk4NWw0LjExODksNy4yMDg1Ljg2ODYtLjQ5NzZhNS4wMDA2LDUuMDAwNiwwLDEsMS0xLjg1MSw2Ljg0MThMMTcuOTM3LDI2LjUwMUE3LjAwMDUsNy4wMDA1LDAsMSwwLDI0LDE2WicvPgogIDxwYXRoCiAgICBkPSdNOC41MzIsMjAuMDUzN2EzLjAzLDMuMDMsMCwxLDAsMS43MzI2Ljk5ODVDMTEuNzQsMTguNDcsMTMuODYsMTQuNzYwNywxMy44OSwxNC43MDhsLjQ5NzYtLjg2ODItLjg2NzctLjQ5N2E1LDUsMCwxLDEsNi44MTItMS44NDM4bDEuNzMxNSwxLjAwMmE3LjAwMDgsNy4wMDA4LDAsMSwwLTEwLjM0NjIsMi4wMzU2Yy0uNDU3Ljc0MjctMS4xMDIxLDEuODcxNi0yLjA3MzcsMy41NzI4WicvPgogIDxyZWN0IGlkPSdfVHJhbnNwYXJlbnRfUmVjdGFuZ2xlXycgZGF0YS1uYW1lPScmbHQ7VHJhbnNwYXJlbnQgUmVjdGFuZ2xlJmd0OycgY2xhc3M9J2Nscy0xJwogICAgd2lkdGg9JzMyJyBoZWlnaHQ9JzMyJy8+Cjwvc3ZnPg=="
     }
+  },
+  {
+    "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+    "name": "Webhook Intermediate Catch Event Connector",
+    "id": "io.camunda.connectors.webhook.WebhookConnectorIntermediate.v1",
+    "version": 4,
+    "description": "Configure webhook to receive callbacks",
+    "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
+    "category": {
+      "id": "connectors",
+      "name": "Connectors"
+    },
+    "appliesTo": ["bpmn:IntermediateCatchEvent", "bpmn:IntermediateThrowEvent"],
+    "elementType": {
+      "value": "bpmn:IntermediateCatchEvent",
+      "eventDefinition": "bpmn:MessageEventDefinition"
+    },
+    "groups": [
+      {
+        "id": "endpoint",
+        "label": "Webhook configuration"
+      },
+      {
+        "id": "authentication",
+        "label": "Authentication"
+      },
+      {
+        "id": "authorization",
+        "label": "Authorization"
+      },
+      {
+        "id": "activation",
+        "label": "Activation"
+      },
+      {
+        "id": "variable-mapping",
+        "label": "Variable mapping"
+      },
+      {
+        "id": "webhookResponse",
+        "label": "Webhook response"
+      }
+    ],
+    "properties": [
+      {
+        "type": "Hidden",
+        "value": "io.camunda:webhook:1",
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.type"
+        }
+      },
+      {
+        "type": "Hidden",
+        "generatedValue": {
+          "type": "uuid"
+        },
+        "binding": {
+          "type": "bpmn:Message#property",
+          "name": "name"
+        }
+      },
+      {
+        "type": "Hidden",
+        "value": "ConfigurableInboundWebhook",
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.subtype"
+        }
+      },
+      {
+        "id": "webhookMethod",
+        "label": "Webhook method",
+        "group": "endpoint",
+        "description": "Select HTTP method",
+        "value": "any",
+        "type": "Dropdown",
+        "choices": [
+          {
+            "name": "Any",
+            "value": "any"
+          },
+          {
+            "name": "Get",
+            "value": "get"
+          },
+          {
+            "name": "Post",
+            "value": "post"
+          },
+          {
+            "name": "Put",
+            "value": "put"
+          },
+          {
+            "name": "Delete",
+            "value": "delete"
+          }
+        ],
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.method"
+        }
+      },
+      {
+        "label": "Webhook ID",
+        "type": "String",
+        "group": "endpoint",
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.context"
+        },
+        "description": "The webhook ID is a part of the URL",
+        "constraints": {
+          "notEmpty": true
+        }
+      },
+      {
+        "id": "shouldValidateHmac",
+        "label": "HMAC authentication",
+        "group": "authentication",
+        "description": "Choose whether HMAC verification is enabled. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a> and <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#example' target='_blank'>example</a> that explains how to use HMAC-related fields",
+        "value": "disabled",
+        "type": "Dropdown",
+        "choices": [
+          {
+            "name": "Enabled",
+            "value": "enabled"
+          },
+          {
+            "name": "Disabled",
+            "value": "disabled"
+          }
+        ],
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.shouldValidateHmac"
+        }
+      },
+      {
+        "label": "HMAC secret key",
+        "description": "Shared secret key",
+        "type": "String",
+        "group": "authentication",
+        "optional": true,
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.hmacSecret"
+        },
+        "condition": {
+          "property": "shouldValidateHmac",
+          "equals": "enabled"
+        }
+      },
+      {
+        "label": "HMAC header",
+        "description": "Name of header attribute that will contain the HMAC value",
+        "type": "String",
+        "group": "authentication",
+        "optional": true,
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.hmacHeader"
+        },
+        "condition": {
+          "property": "shouldValidateHmac",
+          "equals": "enabled"
+        }
+      },
+      {
+        "label": "HMAC algorithm",
+        "group": "authentication",
+        "description": "Choose HMAC algorithm",
+        "value": "sha_256",
+        "type": "Dropdown",
+        "choices": [
+          {
+            "name": "SHA-1",
+            "value": "sha_1"
+          },
+          {
+            "name": "SHA-256",
+            "value": "sha_256"
+          },
+          {
+            "name": "SHA-512",
+            "value": "sha_512"
+          }
+        ],
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.hmacAlgorithm"
+        },
+        "condition": {
+          "property": "shouldValidateHmac",
+          "equals": "enabled"
+        }
+      },
+      {
+        "label": "HMAC scopes",
+        "group": "authentication",
+        "description": "Set HMAC scopes for calculating signature data. See <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/' target='_blank'>documentation</a>",
+        "feel": "required",
+        "type": "String",
+        "optional": true,
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.hmacScopes"
+        },
+        "condition": {
+          "property": "shouldValidateHmac",
+          "equals": "enabled"
+        }
+      },
+      {
+        "id": "authorizationType",
+        "label": "Authorization type",
+        "group": "authorization",
+        "description": "Choose the authorization type.",
+        "value": "NONE",
+        "type": "Dropdown",
+        "choices": [
+          {
+            "name": "None",
+            "value": "NONE"
+          },
+          {
+            "name": "JWT",
+            "value": "JWT"
+          },
+          {
+            "name": "Basic",
+            "value": "BASIC"
+          },
+          {
+            "name": "API Key",
+            "value": "APIKEY"
+          }
+        ],
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.auth.type"
+        }
+      },
+      {
+        "label": "JWK url",
+        "description": "Well-known url of JWKs",
+        "type": "String",
+        "group": "authorization",
+        "feel": "optional",
+        "optional": true,
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.auth.jwt.jwkUrl"
+        },
+        "condition": {
+          "property": "authorizationType",
+          "equals": "JWT"
+        }
+      },
+      {
+        "label": "JWT role property expression",
+        "description": "Expression to extract the roles from the JWT token. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#how-to-extract-roles-from-jwt-data'>See documentation</a>",
+        "type": "String",
+        "group": "authorization",
+        "feel": "required",
+        "optional": true,
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.auth.jwt.permissionsExpression"
+        },
+        "condition": {
+          "property": "authorizationType",
+          "equals": "JWT"
+        }
+      },
+      {
+        "label": "Required roles",
+        "description": "List of roles to test JWT roles against",
+        "type": "String",
+        "group": "authorization",
+        "feel": "required",
+        "optional": true,
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.auth.jwt.requiredPermissions"
+        },
+        "condition": {
+          "property": "authorizationType",
+          "equals": "JWT"
+        }
+      },
+      {
+        "label": "Username",
+        "description": "Username for basic authentication",
+        "type": "String",
+        "group": "authorization",
+        "feel": "optional",
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.auth.username"
+        },
+        "condition": {
+          "property": "authorizationType",
+          "equals": "BASIC"
+        },
+        "constraints": {
+          "notEmpty": true
+        }
+      },
+      {
+        "label": "Password",
+        "description": "Password for basic authentication",
+        "type": "String",
+        "group": "authorization",
+        "feel": "optional",
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.auth.password"
+        },
+        "condition": {
+          "property": "authorizationType",
+          "equals": "BASIC"
+        },
+        "constraints": {
+          "notEmpty": true
+        }
+      },
+      {
+        "label": "API Key",
+        "description": "Expected API key",
+        "type": "String",
+        "group": "authorization",
+        "feel": "optional",
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.auth.apiKey"
+        },
+        "condition": {
+          "property": "authorizationType",
+          "equals": "APIKEY"
+        },
+        "constraints": {
+          "notEmpty": true
+        }
+      },
+      {
+        "label": "API Key locator",
+        "description": "A FEEL expression that extracts API key from the request. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#how-to-configure-api-key-authorization'>See documentation</a>",
+        "type": "String",
+        "group": "authorization",
+        "feel": "required",
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.auth.apiKeyLocator"
+        },
+        "condition": {
+          "property": "authorizationType",
+          "equals": "APIKEY"
+        },
+        "constraints": {
+          "notEmpty": true
+        },
+        "value": "=split(request.headers.authorization, \" \")[2]"
+      },
+      {
+        "label": "Correlation key (process)",
+        "type": "String",
+        "group": "activation",
+        "feel": "required",
+        "description": "Sets up the correlation key from process variables",
+        "binding": {
+          "type": "bpmn:Message#zeebe:subscription#property",
+          "name": "correlationKey"
+        },
+        "constraints": {
+          "notEmpty": true
+        }
+      },
+      {
+        "label": "Correlation key (payload)",
+        "type": "String",
+        "group": "activation",
+        "feel": "required",
+        "binding": {
+          "type": "zeebe:property",
+          "name": "correlationKeyExpression"
+        },
+        "description": "Extracts the correlation key from the incoming message payload",
+        "constraints": {
+          "notEmpty": true
+        }
+      },
+      {
+        "label": "Condition",
+        "type": "String",
+        "group": "activation",
+        "feel": "required",
+        "optional": true,
+        "binding": {
+          "type": "zeebe:property",
+          "name": "activationCondition"
+        },
+        "description": "Condition under which the connector triggers. Leave empty to catch all events. <a href='https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/#make-your-http-webhook-connector-for-receiving-messages-executable' target='_blank'>See documentation</a>"
+      },
+      {
+        "label": "Result variable",
+        "type": "String",
+        "group": "variable-mapping",
+        "optional": true,
+        "binding": {
+          "type": "zeebe:property",
+          "name": "resultVariable"
+        },
+        "description": "Name of variable to store the result of the connector in"
+      },
+      {
+        "label": "Result expression",
+        "type": "String",
+        "group": "variable-mapping",
+        "feel": "required",
+        "optional": true,
+        "binding": {
+          "type": "zeebe:property",
+          "name": "resultExpression"
+        },
+        "description": "Expression to map the inbound payload to process variables"
+      },
+      {
+        "label": "Response body expression",
+        "type": "Text",
+        "group": "webhookResponse",
+        "feel": "required",
+        "optional": true,
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.responseBodyExpression"
+        },
+        "description": "Specify condition and response"
+      }
+    ],
+    "icon": {
+      "contents": "data:image/svg+xml,%3Csvg id='icon' xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='0 0 32 32'%3E%3Cdefs%3E%3Cstyle%3E .cls-1 %7B fill: none; %7D %3C/style%3E%3C/defs%3E%3Cpath d='M24,26a3,3,0,1,0-2.8164-4H13v1a5,5,0,1,1-5-5V16a7,7,0,1,0,6.9287,8h6.2549A2.9914,2.9914,0,0,0,24,26Z'/%3E%3Cpath d='M24,16a7.024,7.024,0,0,0-2.57.4873l-3.1656-5.5395a3.0469,3.0469,0,1,0-1.7326.9985l4.1189,7.2085.8686-.4976a5.0006,5.0006,0,1,1-1.851,6.8418L17.937,26.501A7.0005,7.0005,0,1,0,24,16Z'/%3E%3Cpath d='M8.532,20.0537a3.03,3.03,0,1,0,1.7326.9985C11.74,18.47,13.86,14.7607,13.89,14.708l.4976-.8682-.8677-.497a5,5,0,1,1,6.812-1.8438l1.7315,1.002a7.0008,7.0008,0,1,0-10.3462,2.0356c-.457.7427-1.1021,1.8716-2.0737,3.5728Z'/%3E%3Crect id='_Transparent_Rectangle_' data-name='&lt;Transparent Rectangle&gt;' class='cls-1' width='32' height='32'/%3E%3C/svg%3E"
+    },
+    "engines": {
+      "camunda": "^8.2"
+    }
   }
 ]