@camunda/connectors-element-templates 1.0.6 → 1.0.7

package/src/element-templates/webhook-connector-start-event.json

@@ -531,11 +531,11 @@
   },
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "Webhook connector",
+    "name": "Webhook Start Event Connector",
     "id": "io.camunda.connectors.webhook.WebhookConnector.v1",
-    "version": 6,
     "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"
@@ -558,41 +558,38 @@
         "label": "Authorization"
       },
       {
-        "id": "activation",
-        "label": "Activation"
+        "id": "webhookResponse",
+        "label": "Webhook response"
       },
       {
-        "id": "variable-mapping",
-        "label": "Variable mapping"
+        "id": "activation",
+        "label": "Activation"
       },
       {
-        "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",
-        "value": "ConfigurableInboundWebhook",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.subtype"
-        }
+          "name": "inbound.type",
+          "type": "zeebe:property"
+        },
+        "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": [
           {
@@ -600,46 +597,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",
+        "optional": false,
         "value": "disabled",
+        "group": "authentication",
+        "binding": {
+          "name": "inbound.shouldValidateHmac",
+          "type": "zeebe:property"
+        },
         "type": "Dropdown",
         "choices": [
           {
@@ -650,47 +654,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": [
           {
@@ -705,245 +722,266 @@
             "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",
         "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"
-        }
-      },
-      {
-        "label": "Username",
-        "description": "Username for basic authentication",
-        "type": "String",
+          "property": "inbound.auth.type",
+          "equals": "APIKEY",
+          "type": "simple"
+        },
+        "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/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": {
+          "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/out-of-the-box-connectors/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": "Condition",
-        "type": "String",
-        "group": "activation",
-        "feel": "required",
+        "id": "inbound.responseBodyExpression",
+        "label": "Response body expression",
+        "description": "Specify condition and response",
         "optional": true,
+        "feel": "required",
+        "group": "webhookResponse",
         "binding": {
-          "type": "zeebe:property",
-          "name": "activationCondition"
+          "name": "inbound.responseBodyExpression",
+          "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>"
+        "type": "Text"
       },
       {
-        "label": "Result variable",
-        "type": "String",
-        "group": "variable-mapping",
+        "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": "resultVariable"
+          "name": "inbound.verificationExpression",
+          "type": "zeebe:property"
         },
-        "description": "Name of variable to store the result of the connector in"
+        "type": "Text"
       },
       {
-        "label": "Result expression",
-        "type": "String",
-        "group": "variable-mapping",
-        "feel": "required",
+        "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": "resultExpression"
+          "name": "activationCondition",
+          "type": "zeebe:property"
         },
-        "description": "Expression to map the inbound payload to process variables"
+        "type": "String"
       },
       {
-        "label": "Response body expression",
-        "type": "Text",
-        "group": "webhookResponse",
+        "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.2"
+      "camunda": "^8.5"
     }
   },
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
     "name": "Webhook Start Event Connector",
     "id": "io.camunda.connectors.webhook.WebhookConnector.v1",
-    "version": 9,
     "description": "Configure webhook to receive callbacks",
-    "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
+    "metadata": {
+      "keywords": []
+    },
+    "documentationRef": "https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/",
+    "version": 12,
     "category": {
       "id": "connectors",
       "name": "Connectors"
@@ -966,41 +1004,38 @@
         "label": "Authorization"
       },
       {
-        "id": "activation",
-        "label": "Activation"
+        "id": "webhookResponse",
+        "label": "Webhook response"
       },
       {
-        "id": "variable-mapping",
-        "label": "Variable mapping"
+        "id": "activation",
+        "label": "Activation"
       },
       {
-        "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",
-        "value": "ConfigurableInboundWebhook",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.subtype"
-        }
+          "name": "inbound.type",
+          "type": "zeebe:property"
+        },
+        "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": [
           {
@@ -1008,50 +1043,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": [
           {
@@ -1062,47 +1100,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": [
           {
@@ -1117,257 +1168,275 @@
             "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": "Condition",
-        "type": "String",
-        "group": "activation",
-        "feel": "required",
+        "id": "inbound.responseExpression",
+        "label": "Response expression",
+        "description": "Expression used to generate the HTTP response",
         "optional": true,
+        "feel": "required",
+        "group": "webhookResponse",
         "binding": {
-          "type": "zeebe:property",
-          "name": "activationCondition"
+          "name": "inbound.responseExpression",
+          "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>"
+        "type": "Text"
       },
       {
-        "label": "Result variable",
-        "type": "String",
-        "group": "variable-mapping",
+        "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": "resultVariable"
+          "name": "inbound.verificationExpression",
+          "type": "zeebe:property"
         },
-        "description": "Name of variable to store the result of the connector in"
+        "type": "Text"
       },
       {
-        "label": "Result expression",
-        "type": "String",
-        "group": "variable-mapping",
-        "feel": "required",
+        "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": "resultExpression"
+          "name": "activationCondition",
+          "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",
-        "feel": "required",
-        "optional": true,
+        "id": "consumeUnmatchedEvents",
+        "label": "Consume unmatched events",
+        "value": true,
+        "group": "activation",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.verificationExpression"
-        }
+          "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"
       },
       {
-        "label": "Response body expression",
-        "type": "Text",
-        "group": "webhookResponse",
+        "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"
-    },
     "engines": {
-      "camunda": "^8.5"
+      "camunda": "^8.3"
+    },
+    "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 Start Event Connector",
+    "name": "Webhook connector",
     "id": "io.camunda.connectors.webhook.WebhookConnector.v1",
+    "version": 6,
     "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"
@@ -1389,39 +1458,42 @@
         "id": "authorization",
         "label": "Authorization"
       },
-      {
-        "id": "webhookResponse",
-        "label": "Webhook response"
-      },
       {
         "id": "activation",
         "label": "Activation"
       },
       {
-        "id": "output",
-        "label": "Output mapping"
+        "id": "variable-mapping",
+        "label": "Variable mapping"
+      },
+      {
+        "id": "webhookResponse",
+        "label": "Webhook response"
       }
     ],
     "properties": [
       {
+        "type": "Hidden",
         "value": "io.camunda:webhook:1",
         "binding": {
-          "name": "inbound.type",
-          "type": "zeebe:property"
-        },
-        "type": "Hidden"
+          "type": "zeebe:property",
+          "name": "inbound.type"
+        }
       },
       {
-        "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": [
           {
@@ -1429,53 +1501,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",
+        "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",
-        "optional": false,
         "value": "disabled",
-        "group": "authentication",
-        "binding": {
-          "name": "inbound.shouldValidateHmac",
-          "type": "zeebe:property"
-        },
         "type": "Dropdown",
         "choices": [
           {
@@ -1486,60 +1551,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": [
           {
@@ -1554,719 +1606,243 @@
             "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>",
-        "optional": true,
         "feel": "required",
-        "group": "authentication",
+        "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/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": {
-          "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/out-of-the-box-connectors/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"
-      },
-      {
-        "id": "inbound.responseBodyExpression",
-        "label": "Response body expression",
-        "description": "Specify condition and response",
-        "optional": true,
-        "feel": "required",
-        "group": "webhookResponse",
-        "binding": {
-          "name": "inbound.responseBodyExpression",
-          "type": "zeebe:property"
+        "constraints": {
+          "notEmpty": true
         },
-        "type": "Text"
+        "value": "=split(request.headers.authorization, \" \")[2]"
       },
       {
-        "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": "Condition",
+        "type": "String",
+        "group": "activation",
         "feel": "required",
-        "group": "webhookResponse",
-        "binding": {
-          "name": "inbound.verificationExpression",
-          "type": "zeebe:property"
-        },
-        "type": "Text"
-      },
-      {
-        "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": {
-          "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": "resultVariable",
         "label": "Result variable",
-        "description": "Name of variable to store the response in",
-        "group": "output",
+        "type": "String",
+        "group": "variable-mapping",
+        "optional": true,
         "binding": {
-          "name": "resultVariable",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "resultVariable"
         },
-        "type": "String"
+        "description": "Name of variable to store the result of the connector in"
       },
       {
-        "id": "resultExpression",
         "label": "Result expression",
-        "description": "Expression to map the response into process variables",
-        "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=="
-    },
-    "engines": {
-      "camunda": "^8.5"
-    }
-  },
-  {
-    "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "Webhook Start Event Connector",
-    "id": "io.camunda.connectors.webhook.WebhookConnector.v1",
-    "description": "Configure webhook to receive callbacks",
-    "metadata": {
-      "keywords": []
-    },
-    "documentationRef": "https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/",
-    "version": 12,
-    "category": {
-      "id": "connectors",
-      "name": "Connectors"
-    },
-    "appliesTo": ["bpmn:StartEvent"],
-    "elementType": {
-      "value": "bpmn:StartEvent"
-    },
-    "groups": [
-      {
-        "id": "endpoint",
-        "label": "Webhook configuration"
-      },
-      {
-        "id": "authentication",
-        "label": "Authentication"
-      },
-      {
-        "id": "authorization",
-        "label": "Authorization"
-      },
-      {
-        "id": "webhookResponse",
-        "label": "Webhook response"
-      },
-      {
-        "id": "activation",
-        "label": "Activation"
-      },
-      {
-        "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": "GET",
-            "value": "get"
-          },
-          {
-            "name": "POST",
-            "value": "post"
-          },
-          {
-            "name": "PUT",
-            "value": "put"
-          },
-          {
-            "name": "DELETE",
-            "value": "delete"
-          }
-        ]
-      },
-      {
-        "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"
-          }
-        },
-        "group": "endpoint",
-        "binding": {
-          "name": "inbound.context",
-          "type": "zeebe:property"
-        },
-        "type": "String"
-      },
-      {
-        "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",
-        "optional": false,
-        "value": "disabled",
-        "group": "authentication",
-        "binding": {
-          "name": "inbound.shouldValidateHmac",
-          "type": "zeebe:property"
-        },
-        "type": "Dropdown",
-        "choices": [
-          {
-            "name": "Enabled",
-            "value": "enabled"
-          },
-          {
-            "name": "Disabled",
-            "value": "disabled"
-          }
-        ]
-      },
-      {
-        "id": "inbound.hmacSecret",
-        "label": "HMAC secret key",
-        "description": "Shared secret key",
-        "optional": true,
-        "feel": "optional",
-        "group": "authentication",
-        "binding": {
-          "name": "inbound.hmacSecret",
-          "type": "zeebe:property"
-        },
-        "condition": {
-          "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",
-        "optional": true,
-        "feel": "optional",
-        "group": "authentication",
-        "binding": {
-          "name": "inbound.hmacHeader",
-          "type": "zeebe:property"
-        },
-        "condition": {
-          "property": "inbound.shouldValidateHmac",
-          "equals": "enabled",
-          "type": "simple"
-        },
-        "type": "String"
-      },
-      {
-        "id": "inbound.hmacAlgorithm",
-        "label": "HMAC algorithm",
-        "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": [
-          {
-            "name": "SHA-1",
-            "value": "sha_1"
-          },
-          {
-            "name": "SHA-256",
-            "value": "sha_256"
-          },
-          {
-            "name": "SHA-512",
-            "value": "sha_512"
-          }
-        ]
-      },
-      {
-        "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",
-        "binding": {
-          "name": "inbound.hmacScopes",
-          "type": "zeebe:property"
-        },
-        "condition": {
-          "property": "inbound.shouldValidateHmac",
-          "equals": "enabled",
-          "type": "simple"
-        },
-        "type": "String"
-      },
-      {
-        "id": "inbound.auth.type",
-        "label": "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": "Basic",
-            "value": "BASIC"
-          },
-          {
-            "name": "API key",
-            "value": "APIKEY"
-          },
-          {
-            "name": "JWT",
-            "value": "JWT"
-          }
-        ]
-      },
-      {
-        "id": "inbound.auth.username",
-        "label": "Username",
-        "description": "Username for basic authentication",
-        "optional": false,
-        "feel": "optional",
-        "group": "authorization",
-        "binding": {
-          "name": "inbound.auth.username",
-          "type": "zeebe:property"
-        },
-        "condition": {
-          "property": "inbound.auth.type",
-          "equals": "BASIC",
-          "type": "simple"
-        },
-        "type": "String"
-      },
-      {
-        "id": "inbound.auth.password",
-        "label": "Password",
-        "description": "Password for basic authentication",
-        "optional": false,
-        "feel": "optional",
-        "group": "authorization",
-        "binding": {
-          "name": "inbound.auth.password",
-          "type": "zeebe:property"
-        },
-        "condition": {
-          "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",
-        "binding": {
-          "name": "inbound.auth.apiKey",
-          "type": "zeebe:property"
-        },
-        "condition": {
-          "property": "inbound.auth.type",
-          "equals": "APIKEY",
-          "type": "simple"
-        },
-        "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",
-        "binding": {
-          "name": "inbound.auth.apiKeyLocator",
-          "type": "zeebe:property"
-        },
-        "condition": {
-          "property": "inbound.auth.type",
-          "equals": "APIKEY",
-          "type": "simple"
-        },
-        "type": "String"
-      },
-      {
-        "id": "inbound.auth.jwt.jwkUrl",
-        "label": "JWK URL",
-        "description": "Well-known URL of JWKs",
-        "optional": false,
-        "feel": "optional",
-        "group": "authorization",
-        "binding": {
-          "name": "inbound.auth.jwt.jwkUrl",
-          "type": "zeebe:property"
-        },
-        "condition": {
-          "property": "inbound.auth.type",
-          "equals": "JWT",
-          "type": "simple"
-        },
-        "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",
-        "binding": {
-          "name": "inbound.auth.jwt.permissionsExpression",
-          "type": "zeebe:property"
-        },
-        "condition": {
-          "property": "inbound.auth.type",
-          "equals": "JWT",
-          "type": "simple"
-        },
-        "type": "String"
-      },
-      {
-        "id": "inbound.auth.jwt.requiredPermissions",
-        "label": "Required roles",
-        "description": "List of roles to test JWT roles against",
-        "optional": false,
-        "feel": "required",
-        "group": "authorization",
-        "binding": {
-          "name": "inbound.auth.jwt.requiredPermissions",
-          "type": "zeebe:property"
-        },
-        "condition": {
-          "property": "inbound.auth.type",
-          "equals": "JWT",
-          "type": "simple"
-        },
-        "type": "String"
-      },
-      {
-        "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"
-        },
-        "type": "Text"
-      },
-      {
-        "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": {
-          "name": "inbound.verificationExpression",
-          "type": "zeebe:property"
-        },
-        "type": "Text"
-      },
-      {
-        "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": {
-          "name": "activationCondition",
-          "type": "zeebe:property"
-        },
-        "type": "String"
-      },
-      {
-        "id": "consumeUnmatchedEvents",
-        "label": "Consume unmatched events",
-        "value": true,
-        "group": "activation",
-        "binding": {
-          "name": "consumeUnmatchedEvents",
-          "type": "zeebe:property"
-        },
-        "tooltip": "Unmatched events are rejected by default, allowing the upstream service to handle the error. Check this box to consume unmatched events and return a success response",
-        "type": "Boolean"
-      },
-      {
-        "id": "resultVariable",
-        "label": "Result variable",
-        "description": "Name of variable to store the response in",
-        "group": "output",
+        "type": "String",
+        "group": "variable-mapping",
+        "feel": "required",
+        "optional": true,
         "binding": {
-          "name": "resultVariable",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "resultExpression"
         },
-        "type": "String"
+        "description": "Expression to map the inbound payload to process variables"
       },
       {
-        "id": "resultExpression",
-        "label": "Result expression",
-        "description": "Expression to map the response into process variables",
+        "label": "Response body expression",
+        "type": "Text",
+        "group": "webhookResponse",
         "feel": "required",
-        "group": "output",
+        "optional": true,
         "binding": {
-          "name": "resultExpression",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.responseBodyExpression"
         },
-        "type": "Text"
+        "description": "Specify condition and response"
       }
     ],
-    "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"
     }
   },
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "Webhook connector",
+    "name": "Webhook Start Event Connector",
     "id": "io.camunda.connectors.webhook.WebhookConnector.v1",
-    "version": 3,
+    "version": 7,
     "description": "Configure webhook to receive callbacks",
     "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
     "category": {
@@ -2282,6 +1858,14 @@
         "id": "endpoint",
         "label": "Webhook configuration"
       },
+      {
+        "id": "authentication",
+        "label": "Authentication"
+      },
+      {
+        "id": "authorization",
+        "label": "Authorization"
+      },
       {
         "id": "activation",
         "label": "Activation"
@@ -2289,6 +1873,10 @@
       {
         "id": "variable-mapping",
         "label": "Variable mapping"
+      },
+      {
+        "id": "webhookResponse",
+        "label": "Webhook response"
       }
     ],
     "properties": [
@@ -2308,6 +1896,40 @@
           "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",
@@ -2324,7 +1946,7 @@
       {
         "id": "shouldValidateHmac",
         "label": "HMAC authentication",
-        "group": "endpoint",
+        "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",
@@ -2347,60 +1969,227 @@
         "label": "HMAC secret key",
         "description": "Shared secret key",
         "type": "String",
-        "group": "endpoint",
+        "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.hmacSecret"
+          "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": "shouldValidateHmac",
-          "equals": "enabled"
+          "property": "authorizationType",
+          "equals": "BASIC"
+        },
+        "constraints": {
+          "notEmpty": true
         }
       },
       {
-        "label": "HMAC header",
-        "description": "Name of header attribute that will contain the HMAC value",
+        "label": "API Key",
+        "description": "Expected API key",
         "type": "String",
-        "group": "endpoint",
-        "optional": true,
+        "group": "authorization",
+        "feel": "optional",
         "binding": {
           "type": "zeebe:property",
-          "name": "inbound.hmacHeader"
+          "name": "inbound.auth.apiKey"
         },
         "condition": {
-          "property": "shouldValidateHmac",
-          "equals": "enabled"
+          "property": "authorizationType",
+          "equals": "APIKEY"
+        },
+        "constraints": {
+          "notEmpty": true
         }
       },
       {
-        "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"
-          }
-        ],
+        "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.hmacAlgorithm"
+          "name": "inbound.auth.apiKeyLocator"
         },
         "condition": {
-          "property": "shouldValidateHmac",
-          "equals": "enabled"
-        }
+          "property": "authorizationType",
+          "equals": "APIKEY"
+        },
+        "constraints": {
+          "notEmpty": true
+        },
+        "value": "=split(request.headers.authorization, \" \")[2]"
       },
       {
         "label": "Condition",
@@ -2436,6 +2225,18 @@
           "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": {
@@ -2447,9 +2248,9 @@
   },
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "Webhook Start Event Connector",
+    "name": "Webhook connector",
     "id": "io.camunda.connectors.webhook.WebhookConnector.v1",
-    "version": 8,
+    "version": 5,
     "description": "Configure webhook to receive callbacks",
     "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
     "category": {
@@ -2480,10 +2281,6 @@
       {
         "id": "variable-mapping",
         "label": "Variable mapping"
-      },
-      {
-        "id": "webhookResponse",
-        "label": "Webhook response"
       }
     ],
     "properties": [
@@ -2780,23 +2577,206 @@
         }
       },
       {
-        "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",
+        "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": "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 Connector",
+    "id": "io.camunda.connectors.webhook.WebhookConnector.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:StartEvent"],
+    "elementType": {
+      "value": "bpmn:StartEvent"
+    },
+    "groups": [
+      {
+        "id": "endpoint",
+        "label": "Webhook Configuration"
+      },
+      {
+        "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",
+        "value": "ConfigurableInboundWebhook",
+        "binding": {
+          "type": "zeebe:property",
+          "name": "inbound.subtype"
+        }
+      },
+      {
+        "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": "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.auth.apiKeyLocator"
+          "name": "inbound.hmacAlgorithm"
         },
         "condition": {
-          "property": "authorizationType",
-          "equals": "APIKEY"
-        },
-        "constraints": {
-          "notEmpty": true
-        },
-        "value": "=split(request.headers.authorization, \" \")[2]"
+          "property": "shouldValidateHmac",
+          "equals": "enabled"
+        }
       },
       {
         "label": "Condition",
@@ -2806,7 +2786,7 @@
         "optional": true,
         "binding": {
           "type": "zeebe:property",
-          "name": "activationCondition"
+          "name": "inbound.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>"
       },
@@ -2819,7 +2799,7 @@
           "type": "zeebe:property",
           "name": "resultVariable"
         },
-        "description": "Name of variable to store the result of the connector in"
+        "description": "Name of variable to store the result of the Connector in"
       },
       {
         "label": "Result expression",
@@ -2832,44 +2812,20 @@
           "name": "resultExpression"
         },
         "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",
-        "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.4"
+      "camunda": "^8.2"
     }
   },
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "Webhook Connector",
+    "name": "Webhook connector",
     "id": "io.camunda.connectors.webhook.WebhookConnector.v1",
-    "version": 1,
+    "version": 3,
     "description": "Configure webhook to receive callbacks",
     "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
     "category": {
@@ -2883,7 +2839,7 @@
     "groups": [
       {
         "id": "endpoint",
-        "label": "Webhook Configuration"
+        "label": "Webhook configuration"
       },
       {
         "id": "activation",
@@ -2891,7 +2847,7 @@
       },
       {
         "id": "variable-mapping",
-        "label": "Variable Mapping"
+        "label": "Variable mapping"
       }
     ],
     "properties": [
@@ -2919,10 +2875,10 @@
           "type": "zeebe:property",
           "name": "inbound.context"
         },
+        "description": "The webhook ID is a part of the URL",
         "constraints": {
           "notEmpty": true
-        },
-        "description": "The webhook ID is a part of the URL"
+        }
       },
       {
         "id": "shouldValidateHmac",
@@ -3013,20 +2969,32 @@
         "optional": true,
         "binding": {
           "type": "zeebe:property",
-          "name": "inbound.activationCondition"
+          "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": "Variables",
+        "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": "inbound.variableMapping"
+          "name": "resultExpression"
         },
-        "description": "Map variables from the webhook payload (request) to start the process with. When blank, entire payload is copied over. <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>"
+        "description": "Expression to map the inbound payload to process variables"
       }
     ],
     "icon": {
@@ -3040,7 +3008,7 @@
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
     "name": "Webhook Start Event Connector",
     "id": "io.camunda.connectors.webhook.WebhookConnector.v1",
-    "version": 7,
+    "version": 9,
     "description": "Configure webhook to receive callbacks",
     "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
     "category": {
@@ -3138,7 +3106,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"
+          }
         }
       },
       {
@@ -3424,6 +3396,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",
@@ -3441,16 +3425,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 connector",
+    "name": "Webhook Start Event Connector",
     "id": "io.camunda.connectors.webhook.WebhookConnector.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"
@@ -3472,38 +3456,39 @@
         "id": "authorization",
         "label": "Authorization"
       },
+      {
+        "id": "webhookResponse",
+        "label": "Webhook response"
+      },
       {
         "id": "activation",
         "label": "Activation"
       },
       {
-        "id": "variable-mapping",
-        "label": "Variable mapping"
+        "id": "output",
+        "label": "Output mapping"
       }
     ],
     "properties": [
       {
-        "type": "Hidden",
         "value": "io.camunda:webhook:1",
         "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.type"
-        }
-      },
-      {
-        "type": "Hidden",
-        "value": "ConfigurableInboundWebhook",
-        "binding": {
-          "type": "zeebe:property",
-          "name": "inbound.subtype"
-        }
+          "name": "inbound.type",
+          "type": "zeebe:property"
+        },
+        "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": [
           {
@@ -3511,46 +3496,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": [
           {
@@ -3561,47 +3553,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": [
           {
@@ -3616,233 +3621,275 @@
             "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"
+          "property": "inbound.auth.type",
+          "equals": "JWT",
+          "type": "simple"
         },
-        "constraints": {
-          "notEmpty": true
+        "type": "String"
+      },
+      {
+        "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"
         },
-        "value": "=split(request.headers.authorization, \" \")[2]"
+        "type": "Text"
       },
       {
-        "label": "Condition",
-        "type": "String",
+        "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": {
+          "name": "inbound.verificationExpression",
+          "type": "zeebe:property"
+        },
+        "type": "Text"
+      },
+      {
+        "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": {
+          "name": "activationCondition",
+          "type": "zeebe:property"
+        },
+        "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"
       },
       {
+        "id": "resultVariable",
         "label": "Result variable",
-        "type": "String",
-        "group": "variable-mapping",
-        "optional": true,
+        "description": "Name of variable to store the response in",
+        "group": "output",
         "binding": {
-          "type": "zeebe:property",
-          "name": "resultVariable"
+          "name": "resultVariable",
+          "type": "zeebe:property"
         },
-        "description": "Name of variable to store the result of the connector in"
+        "type": "String"
       },
       {
+        "id": "resultExpression",
         "label": "Result expression",
-        "type": "String",
-        "group": "variable-mapping",
+        "description": "Expression to map the response into process variables",
         "feel": "required",
-        "optional": true,
+        "group": "output",
         "binding": {
-          "type": "zeebe:property",
-          "name": "resultExpression"
+          "name": "resultExpression",
+          "type": "zeebe:property"
         },
-        "description": "Expression to map the inbound payload to process variables"
+        "type": "Text"
       }
     ],
     "icon": {
-      "contents": "data:image/svg+xml,%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.2"
+      "camunda": "^8.6"
     }
   },
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
     "name": "Webhook Start Event Connector",
     "id": "io.camunda.connectors.webhook.WebhookConnector.v1",
+    "version": 8,
     "description": "Configure webhook to receive callbacks",
-    "documentationRef": "https://docs.camunda.io/docs/components/connectors/protocol/http-webhook/",
-    "version": 11,
+    "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
     "category": {
       "id": "connectors",
       "name": "Connectors"
@@ -3864,39 +3911,42 @@
         "id": "authorization",
         "label": "Authorization"
       },
-      {
-        "id": "webhookResponse",
-        "label": "Webhook response"
-      },
       {
         "id": "activation",
         "label": "Activation"
       },
       {
-        "id": "output",
-        "label": "Output mapping"
+        "id": "variable-mapping",
+        "label": "Variable mapping"
+      },
+      {
+        "id": "webhookResponse",
+        "label": "Webhook response"
       }
     ],
     "properties": [
       {
+        "type": "Hidden",
         "value": "io.camunda:webhook:1",
         "binding": {
-          "name": "inbound.type",
-          "type": "zeebe:property"
-        },
-        "type": "Hidden"
+          "type": "zeebe:property",
+          "name": "inbound.type"
+        }
       },
       {
-        "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": [
           {
@@ -3904,53 +3954,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": [
           {
@@ -3961,60 +4004,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": [
           {
@@ -4029,273 +4059,255 @@
             "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"
           }
-        ]
-      },
-      {
-        "id": "inbound.auth.username",
-        "label": "Username",
-        "description": "Username for basic authentication",
-        "optional": false,
-        "feel": "optional",
-        "group": "authorization",
+        ],
         "binding": {
-          "name": "inbound.auth.username",
-          "type": "zeebe:property"
-        },
-        "condition": {
-          "property": "inbound.auth.type",
-          "equals": "BASIC",
-          "type": "simple"
-        },
-        "type": "String"
+          "type": "zeebe:property",
+          "name": "inbound.auth.type"
+        }
       },
       {
-        "id": "inbound.auth.password",
-        "label": "Password",
-        "description": "Password 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.password",
-          "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.apiKey",
-        "label": "API key",
-        "description": "Expected API key",
-        "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.apiKey",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.auth.jwt.permissionsExpression"
         },
         "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": "Required roles",
+        "description": "List of roles to test JWT roles against",
+        "type": "String",
         "group": "authorization",
+        "feel": "required",
+        "optional": true,
         "binding": {
-          "name": "inbound.auth.apiKeyLocator",
-          "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.jwt.jwkUrl",
-        "label": "JWK URL",
-        "description": "Well-known URL of JWKs",
-        "optional": false,
-        "feel": "optional",
+        "label": "Username",
+        "description": "Username for basic authentication",
+        "type": "String",
         "group": "authorization",
+        "feel": "optional",
         "binding": {
-          "name": "inbound.auth.jwt.jwkUrl",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.auth.username"
         },
         "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": "Password",
+        "description": "Password for basic authentication",
+        "type": "String",
         "group": "authorization",
+        "feel": "optional",
         "binding": {
-          "name": "inbound.auth.jwt.permissionsExpression",
-          "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.requiredPermissions",
-        "label": "Required roles",
-        "description": "List of roles to test JWT roles against",
-        "optional": false,
-        "feel": "required",
+        "label": "API Key",
+        "description": "Expected API key",
+        "type": "String",
         "group": "authorization",
+        "feel": "optional",
         "binding": {
-          "name": "inbound.auth.jwt.requiredPermissions",
-          "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.responseExpression",
-        "label": "Response expression",
-        "description": "Expression used to generate the HTTP response",
-        "optional": 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",
-        "group": "webhookResponse",
         "binding": {
-          "name": "inbound.responseExpression",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.auth.apiKeyLocator"
         },
-        "type": "Text"
+        "condition": {
+          "property": "authorizationType",
+          "equals": "APIKEY"
+        },
+        "constraints": {
+          "notEmpty": true
+        },
+        "value": "=split(request.headers.authorization, \" \")[2]"
       },
       {
-        "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": "Condition",
+        "type": "String",
+        "group": "activation",
         "feel": "required",
-        "group": "webhookResponse",
+        "optional": true,
         "binding": {
-          "name": "inbound.verificationExpression",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "activationCondition"
         },
-        "type": "Text"
+        "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": "activationCondition",
-        "label": "Activation condition",
-        "description": "Condition under which the Connector triggers. Leave empty to catch all events",
+        "label": "Result variable",
+        "type": "String",
+        "group": "variable-mapping",
         "optional": true,
-        "feel": "required",
-        "group": "activation",
         "binding": {
-          "name": "activationCondition",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "resultVariable"
         },
-        "type": "String"
+        "description": "Name of variable to store the result of the connector in"
       },
       {
-        "id": "consumeUnmatchedEvents",
-        "label": "Consume unmatched events",
-        "value": true,
-        "group": "activation",
+        "label": "Result expression",
+        "type": "String",
+        "group": "variable-mapping",
+        "feel": "required",
+        "optional": true,
         "binding": {
-          "name": "consumeUnmatchedEvents",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "resultExpression"
         },
-        "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": "Expression to map the inbound payload to process variables"
       },
       {
-        "id": "resultVariable",
-        "label": "Result variable",
-        "description": "Name of variable to store the response in",
-        "group": "output",
+        "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": {
-          "name": "resultVariable",
-          "type": "zeebe:property"
-        },
-        "type": "String"
+          "type": "zeebe:property",
+          "name": "inbound.verificationExpression"
+        }
       },
       {
-        "id": "resultExpression",
-        "label": "Result expression",
-        "description": "Expression to map the response into process variables",
+        "label": "Response body expression",
+        "type": "Text",
+        "group": "webhookResponse",
         "feel": "required",
-        "group": "output",
+        "optional": true,
         "binding": {
-          "name": "resultExpression",
-          "type": "zeebe:property"
+          "type": "zeebe:property",
+          "name": "inbound.responseBodyExpression"
         },
-        "type": "Text"
+        "description": "Specify condition and response"
       }
     ],
     "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.6"
+      "camunda": "^8.4"
     }
   },
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
     "name": "Webhook Connector",
     "id": "io.camunda.connectors.webhook.WebhookConnector.v1",
-    "version": 2,
+    "version": 1,
     "description": "Configure webhook to receive callbacks",
     "documentationRef": "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
     "category": {
@@ -4345,10 +4357,10 @@
           "type": "zeebe:property",
           "name": "inbound.context"
         },
-        "description": "The webhook ID is a part of the URL",
         "constraints": {
           "notEmpty": true
-        }
+        },
+        "description": "The webhook ID is a part of the URL"
       },
       {
         "id": "shouldValidateHmac",
@@ -4444,27 +4456,15 @@
         "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",
+        "label": "Variables",
         "type": "String",
         "group": "variable-mapping",
         "feel": "required",
-        "optional": true,
         "binding": {
           "type": "zeebe:property",
-          "name": "resultExpression"
+          "name": "inbound.variableMapping"
         },
-        "description": "Expression to map the inbound payload to process variables"
+        "description": "Map variables from the webhook payload (request) to start the process with. When blank, entire payload is copied over. <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>"
       }
     ],
     "icon": {