diff --git a/connectors/automation-anywhere/element-templates/hybrid/automation-anywhere-outbound-connector-hybrid.json b/connectors/automation-anywhere/element-templates/hybrid/automation-anywhere-outbound-connector-hybrid.json
new file mode 100644
index 0000000000..22d6fb1b98
--- /dev/null
+++ b/connectors/automation-anywhere/element-templates/hybrid/automation-anywhere-outbound-connector-hybrid.json
@@ -0,0 +1,377 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid Automation Anywhere Outbound Connector",
+  "id" : "io.camunda.connectors.AutomationAnywhere-hybrid",
+  "description" : "Orchestrate your Automation Anywhere bots with Camunda. You can create new queue items and get the result from it",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/automation-anywhere/",
+  "version" : 2,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:Task" ],
+  "elementType" : {
+    "value" : "bpmn:ServiceTask"
+  },
+  "groups" : [ {
+    "id" : "taskDefinitionType",
+    "label" : "Task definition type"
+  }, {
+    "id" : "operation",
+    "label" : "Operation"
+  }, {
+    "id" : "configuration",
+    "label" : "Configuration"
+  }, {
+    "id" : "authentication",
+    "label" : "Authentication"
+  }, {
+    "id" : "input",
+    "label" : "Input"
+  }, {
+    "id" : "timeout",
+    "label" : "Timeout"
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  }, {
+    "id" : "error",
+    "label" : "Error handling"
+  }, {
+    "id" : "retries",
+    "label" : "Retries"
+  } ],
+  "properties" : [ {
+    "id" : "taskDefinitionType",
+    "value" : "io.camunda:connector-automationanywhere:1",
+    "group" : "taskDefinitionType",
+    "binding" : {
+      "property" : "type",
+      "type" : "zeebe:taskDefinition"
+    },
+    "type" : "String"
+  }, {
+    "id" : "operation.type",
+    "label" : "Type",
+    "group" : "operation",
+    "binding" : {
+      "name" : "operation.type",
+      "type" : "zeebe:input"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Add work item to the queue",
+      "value" : "addWorkItemsToTheQueue"
+    }, {
+      "name" : "Get work item result from queue by ID",
+      "value" : "listWorkItemsInQueue"
+    } ]
+  }, {
+    "id" : "configuration.controlRoomUrl",
+    "label" : "Control room URL",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.controlRoomUrl",
+      "type" : "zeebe:input"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.type",
+    "label" : "Type",
+    "description" : "Choose the authentication type. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/automation-anywhere/\" target=\"_blank\">documentation</a>",
+    "value" : "passwordBasedAuthentication",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.type",
+      "type" : "zeebe:input"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Authenticate (username and password)",
+      "value" : "passwordBasedAuthentication"
+    }, {
+      "name" : "Authenticate (username and API key)",
+      "value" : "apiKeyAuthentication"
+    }, {
+      "name" : "Authentication (refresh) token",
+      "value" : "tokenBasedAuthentication"
+    } ]
+  }, {
+    "id" : "authentication.passwordBassesUsername",
+    "label" : "Username",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.username",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "passwordBasedAuthentication",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.password",
+    "label" : "Password",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.password",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "passwordBasedAuthentication",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.multipleLogin",
+    "label" : "Multiple login",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.multipleLogin",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "passwordBasedAuthentication",
+      "type" : "simple"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "TRUE",
+      "value" : "true"
+    }, {
+      "name" : "FALSE",
+      "value" : "false"
+    } ]
+  }, {
+    "id" : "authentication.apiUsername",
+    "label" : "Username",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.username",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "apiKeyAuthentication",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.apiKey",
+    "label" : "API key",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.apiKey",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "apiKeyAuthentication",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.token",
+    "label" : "Token",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.token",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "tokenBasedAuthentication",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "operation.queueId",
+    "label" : "Work queue ID",
+    "description" : "The queue ID of the item",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "operation.queueId",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "operation.type",
+      "equals" : "addWorkItemsToTheQueue",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "operation.data",
+    "label" : "Work item json data",
+    "description" : "Work item json input data. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/automation-anywhere/\" target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "input",
+    "binding" : {
+      "name" : "operation.data",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "operation.type",
+      "equals" : "addWorkItemsToTheQueue",
+      "type" : "simple"
+    },
+    "type" : "Text"
+  }, {
+    "id" : "operation.workQueueId",
+    "label" : "Work queue ID",
+    "description" : "The queue ID of the item",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "operation.queueId",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "operation.type",
+      "equals" : "listWorkItemsInQueue",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "operation.workItemId",
+    "label" : "Work item ID",
+    "description" : "The queue item identifier to be fetched from queue",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "operation.workItemId",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "operation.type",
+      "equals" : "listWorkItemsInQueue",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "configuration.connectionTimeoutInSeconds",
+    "label" : "Connection timeout in seconds",
+    "description" : "Sets the timeout in seconds to establish a connection or 0 for an infinite timeout",
+    "optional" : true,
+    "value" : "20",
+    "feel" : "optional",
+    "group" : "timeout",
+    "binding" : {
+      "name" : "configuration.connectionTimeoutInSeconds",
+      "type" : "zeebe:input"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "key" : "resultVariable",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "key" : "resultExpression",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "Text"
+  }, {
+    "id" : "errorExpression",
+    "label" : "Error expression",
+    "description" : "Expression to handle errors. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/\" target=\"_blank\">documentation</a>.",
+    "feel" : "required",
+    "group" : "error",
+    "binding" : {
+      "key" : "errorExpression",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "Text"
+  }, {
+    "id" : "retryCount",
+    "label" : "Retries",
+    "description" : "Number of retries",
+    "value" : "3",
+    "feel" : "optional",
+    "group" : "retries",
+    "binding" : {
+      "property" : "retries",
+      "type" : "zeebe:taskDefinition"
+    },
+    "type" : "String"
+  }, {
+    "id" : "retryBackoff",
+    "label" : "Retry backoff",
+    "description" : "ISO-8601 duration to wait between retries",
+    "value" : "PT0S",
+    "feel" : "optional",
+    "group" : "retries",
+    "binding" : {
+      "key" : "retryBackoff",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "String"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,<svg viewBox='0 0 652 652' style='enable-background:new 0 0 652 652;' xmlns='http://www.w3.org/2000/svg'>
    <defs>
        <style type='text/css'>.st0{clip-path:url(#SVGID_2_);fill:url(#SVGID_3_);} .st1{opacity:0.3;}
            .st2{clip-path:url(#SVGID_5_);fill:url(#SVGID_6_);} .st3{fill:#404041;} .st4{fill:#F79837;}
        </style>
    </defs>
    <g style='' transform='matrix(2.838946, 0, 0, 2.807126, -44.534363, -578.343384)'>
        <g>
            <defs>
                <path id='SVGID_1_'
                      d='M199.5,412.7l-0.2-0.5l-0.5-1l-11.7-31.5c11.1,5.1,21.4,11.8,30.7,20.1l0,0c1.2,0.9,2.2,2.2,3,3.7 c0.9,1.7,1.4,3.5,1.4,5.5c0,6.4-5.2,11.6-11.6,11.6C205.5,420.6,201.1,417.4,199.5,412.7 M103.3,229.6c1.5-4.1,4.9-6.9,8.7-7 c0,0,0.1,0,0.1,0c3.8,0.2,7.2,2.9,8.7,7l48.3,132.6c-10.7-2.7-21.7-4.1-32.9-4.1c-23.5,0-46.7,6.2-66.9,18 c-9.8,5.7-18.8,12.7-26.9,20.6L103.3,229.6z M110.9,212c-7.8,0.6-14.7,6-17.6,14L21,424.5c-1,2.8,0.4,5.8,3.2,6.8 c0.6,0.2,1.2,0.3,1.8,0.3c1.7,0,3.3-0.8,4.3-2.2c0.2-0.2,0.3-0.4,0.5-0.7c10.7-18,25.8-33.1,43.9-43.6 c18.6-10.8,39.9-16.6,61.6-16.6c12.9,0,25.6,2,37.6,5.9l15.3,41.1l0.5,0.9c3.2,8.8,11.5,14.7,20.9,14.7c12.3,0,22.2-10,22.2-22.2 c0-3.6-0.9-7.3-2.6-10.5c-0.7-1.2-1.4-2.3-2.2-3.4c-0.3-0.5-0.6-1-1-1.4c-13.1-12.2-28.4-21.5-44.9-27.6l-1.1-2.8l-0.1,0 L130.8,226c-2.9-7.9-9.7-13.3-17.6-14c-0.3,0-0.6-0.1-0.9-0.1c-0.1,0-0.2,0-0.2,0c-0.1,0-0.2,0-0.2,0 C111.5,211.9,111.2,212,110.9,212'/>
            </defs>
            <clipPath id='SVGID_2_'>
                <path d='M199.5,412.7l-0.2-0.5l-0.5-1l-11.7-31.5c11.1,5.1,21.4,11.8,30.7,20.1l0,0c1.2,0.9,2.2,2.2,3,3.7 c0.9,1.7,1.4,3.5,1.4,5.5c0,6.4-5.2,11.6-11.6,11.6C205.5,420.6,201.1,417.4,199.5,412.7 M103.3,229.6c1.5-4.1,4.9-6.9,8.7-7 c0,0,0.1,0,0.1,0c3.8,0.2,7.2,2.9,8.7,7l48.3,132.6c-10.7-2.7-21.7-4.1-32.9-4.1c-23.5,0-46.7,6.2-66.9,18 c-9.8,5.7-18.8,12.7-26.9,20.6L103.3,229.6z M110.9,212c-7.8,0.6-14.7,6-17.6,14L21,424.5c-1,2.8,0.4,5.8,3.2,6.8 c0.6,0.2,1.2,0.3,1.8,0.3c1.7,0,3.3-0.8,4.3-2.2c0.2-0.2,0.3-0.4,0.5-0.7c10.7-18,25.8-33.1,43.9-43.6 c18.6-10.8,39.9-16.6,61.6-16.6c12.9,0,25.6,2,37.6,5.9l15.3,41.1l0.5,0.9c3.2,8.8,11.5,14.7,20.9,14.7c12.3,0,22.2-10,22.2-22.2 c0-3.6-0.9-7.3-2.6-10.5c-0.7-1.2-1.4-2.3-2.2-3.4c-0.3-0.5-0.6-1-1-1.4c-13.1-12.2-28.4-21.5-44.9-27.6l-1.1-2.8l-0.1,0 L130.8,226c-2.9-7.9-9.7-13.3-17.6-14c-0.3,0-0.6-0.1-0.9-0.1c-0.1,0-0.2,0-0.2,0c-0.1,0-0.2,0-0.2,0 C111.5,211.9,111.2,212,110.9,212'
                      transform='matrix(1, 0, 0, 1, 0, 0)' style='overflow: visible;'/>
            </clipPath>
            <linearGradient id='SVGID_3_' gradientUnits='userSpaceOnUse' x1='-4.938' y1='743.0203' x2='1.9792'
                            y2='743.0203' gradientTransform='matrix(30.658 0 0 -30.658 172.0803 23101.3418)'>
                <stop offset='0' style='stop-color:#FFDD15'/>
                <stop offset='0.0343' style='stop-color:#FED217'/>
                <stop offset='0.1663' style='stop-color:#FAAD1C'/>
                <stop offset='0.3049' style='stop-color:#F68F20'/>
                <stop offset='0.45' style='stop-color:#F37824'/>
                <stop offset='0.6045' style='stop-color:#F16726'/>
                <stop offset='0.7747' style='stop-color:#F05D28'/>
                <stop offset='0.991' style='stop-color:#F05A28'/>
                <stop offset='1' style='stop-color:#F05A28'/>
            </linearGradient>
            <rect x='20' y='211.9' class='st0' width='212.8' height='219.7'/>
        </g>
        <g>
            <g class='st1'>
                <g>
                    <g>
                        <defs>
                            <path id='SVGID_4_'
                                  d='M187.3,380.3c11.1,5.1,21.4,11.8,30.7,20l0,0c1.2,1,2.2,2.2,3,3.7c0.9,1.7,1.4,3.5,1.4,5.5H233 c0-3.6-0.9-7.3-2.6-10.5c-0.6-1.2-1.4-2.3-2.2-3.4c-0.3-0.5-0.6-1-1-1.4c-13.1-12.2-28.4-21.5-44.9-27.6L187.3,380.3z M69.5,376.7c-9.8,5.7-18.8,12.7-26.9,20.6l-12.2,32.8c0.2-0.2,0.3-0.4,0.5-0.7c10.7-18,25.9-33.1,43.9-43.6 c18.6-10.8,39.9-16.6,61.6-16.6c12.1,0,25.1,1.9,37.6,5.9l-4.7-12.4c-10.7-2.7-21.7-4.1-32.9-4.1 C112.9,358.7,89.8,364.9,69.5,376.7'/>
                        </defs>
                        <clipPath id='SVGID_5_'>
                            <path d='M187.3,380.3c11.1,5.1,21.4,11.8,30.7,20l0,0c1.2,1,2.2,2.2,3,3.7c0.9,1.7,1.4,3.5,1.4,5.5H233 c0-3.6-0.9-7.3-2.6-10.5c-0.6-1.2-1.4-2.3-2.2-3.4c-0.3-0.5-0.6-1-1-1.4c-13.1-12.2-28.4-21.5-44.9-27.6L187.3,380.3z M69.5,376.7c-9.8,5.7-18.8,12.7-26.9,20.6l-12.2,32.8c0.2-0.2,0.3-0.4,0.5-0.7c10.7-18,25.9-33.1,43.9-43.6 c18.6-10.8,39.9-16.6,61.6-16.6c12.1,0,25.1,1.9,37.6,5.9l-4.7-12.4c-10.7-2.7-21.7-4.1-32.9-4.1 C112.9,358.7,89.8,364.9,69.5,376.7'
                                  transform='matrix(1, 0, 0, 1, 0, 0)' style='overflow: visible;'/>
                        </clipPath>
                        <linearGradient id='SVGID_6_' gradientUnits='userSpaceOnUse' x1='-5.4042' y1='741.473'
                                        x2='1.5131' y2='741.473'
                                        gradientTransform='matrix(29.2748 0 0 -29.2748 188.7152 22100.8477)'>
                            <stop offset='0' style='stop-color:#FFFFFF'/>
                            <stop offset='0.3285' style='stop-color:#FFFFFF'/>
                            <stop offset='0.3745' style='stop-color:#FBFBFB'/>
                            <stop offset='0.4233' style='stop-color:#EEEEEE'/>
                            <stop offset='0.4735' style='stop-color:#D9D9D9'/>
                            <stop offset='0.5246' style='stop-color:#BCBBBB'/>
                            <stop offset='0.5764' style='stop-color:#969595'/>
                            <stop offset='0.6288' style='stop-color:#686666'/>
                            <stop offset='0.6808' style='stop-color:#332F30'/>
                            <stop offset='0.6948' style='stop-color:#231F20'/>
                            <stop offset='0.9301' style='stop-color:#FFFFFF'/>
                            <stop offset='1' style='stop-color:#FFFFFF'/>
                        </linearGradient>
                        <rect x='30.5' y='358.7' class='st2' width='18' height='18'/>
                    </g>
                </g>
            </g>
        </g>
        <g/>
    </g>
</svg>"
+  }
+}
\ No newline at end of file
diff --git a/connectors/automation-anywhere/pom.xml b/connectors/automation-anywhere/pom.xml
index 0a37f435b6..3833eff4bd 100644
--- a/connectors/automation-anywhere/pom.xml
+++ b/connectors/automation-anywhere/pom.xml
@@ -48,6 +48,7 @@
                   <templateFileName>automation-anywhere-outbound-connector.json</templateFileName>
                 </file>
               </files>
+              <generateHybridTemplates>true</generateHybridTemplates>
             </connector>
           </connectors>
         </configuration>
diff --git a/connectors/aws/aws-dynamodb/element-templates/hybrid/aws-dynamodb-outbound-connector-hybrid.json b/connectors/aws/aws-dynamodb/element-templates/hybrid/aws-dynamodb-outbound-connector-hybrid.json
new file mode 100644
index 0000000000..fabf05d261
--- /dev/null
+++ b/connectors/aws/aws-dynamodb/element-templates/hybrid/aws-dynamodb-outbound-connector-hybrid.json
@@ -0,0 +1,1020 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid AWS DynamoDB Outbound Connector",
+  "id" : "io.camunda.connectors.AWSDynamoDB.v1-hybrid",
+  "description" : "Work with tables and items using AWS DynamoDB service",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-dynamodb/",
+  "version" : 7,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:Task" ],
+  "elementType" : {
+    "value" : "bpmn:ServiceTask"
+  },
+  "groups" : [ {
+    "id" : "taskDefinitionType",
+    "label" : "Task definition type"
+  }, {
+    "id" : "operation",
+    "label" : "Operation"
+  }, {
+    "id" : "authentication",
+    "label" : "Authentication"
+  }, {
+    "id" : "configuration",
+    "label" : "Queue properties"
+  }, {
+    "id" : "input",
+    "label" : "Input"
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  }, {
+    "id" : "error",
+    "label" : "Error handling"
+  }, {
+    "id" : "retries",
+    "label" : "Retries"
+  } ],
+  "properties" : [ {
+    "id" : "taskDefinitionType",
+    "value" : "io.camunda:aws-dynamodb:1",
+    "group" : "taskDefinitionType",
+    "binding" : {
+      "property" : "type",
+      "type" : "zeebe:taskDefinition"
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.operationGroup",
+    "label" : "Choose category",
+    "group" : "operation",
+    "binding" : {
+      "name" : "input.operationGroup",
+      "type" : "zeebe:input"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Table",
+      "value" : "tableOperation"
+    }, {
+      "name" : "Item",
+      "value" : "itemOperation"
+    } ]
+  }, {
+    "id" : "input.tableOperation",
+    "label" : "Select action",
+    "group" : "operation",
+    "binding" : {
+      "name" : "input.tableOperation",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "input.operationGroup",
+      "equals" : "tableOperation",
+      "type" : "simple"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Create table",
+      "value" : "createTable"
+    }, {
+      "name" : "Delete table",
+      "value" : "deleteTable"
+    }, {
+      "name" : "Describe table",
+      "value" : "describeTable"
+    }, {
+      "name" : "Scan table",
+      "value" : "scanTable"
+    } ]
+  }, {
+    "id" : "input.itemOperation",
+    "label" : "Select action",
+    "group" : "operation",
+    "binding" : {
+      "name" : "input.itemOperation",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "input.operationGroup",
+      "equals" : "itemOperation",
+      "type" : "simple"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Add item",
+      "value" : "addItem"
+    }, {
+      "name" : "Delete item",
+      "value" : "deleteItem"
+    }, {
+      "name" : "Get item",
+      "value" : "getItem"
+    }, {
+      "name" : "Update item",
+      "value" : "updateItem"
+    } ]
+  }, {
+    "id" : "authentication.type",
+    "label" : "Authentication",
+    "description" : "Specify AWS authentication strategy. Learn more at the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-lambda/#aws-authentication-types\" target=\"_blank\">documentation page</a>",
+    "value" : "credentials",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.type",
+      "type" : "zeebe:input"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Default Credentials Chain (Hybrid/Self-Managed only)",
+      "value" : "defaultCredentialsChain"
+    }, {
+      "name" : "Credentials",
+      "value" : "credentials"
+    } ]
+  }, {
+    "id" : "authentication.accessKey",
+    "label" : "Access key",
+    "description" : "Provide an IAM access key tailored to a user, equipped with the necessary permissions",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.accessKey",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.secretKey",
+    "label" : "Secret key",
+    "description" : "Provide a secret key of a user with permissions to invoke specified AWS Lambda function",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.secretKey",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "configuration.region",
+    "label" : "Region",
+    "description" : "Specify the AWS region",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.region",
+      "type" : "zeebe:input"
+    },
+    "type" : "String"
+  }, {
+    "id" : "configuration.endpoint",
+    "label" : "Endpoint",
+    "description" : "Specify endpoint if need to use custom endpoint",
+    "optional" : true,
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.endpoint",
+      "type" : "zeebe:input"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "input.createTable.tableName",
+    "label" : "Table name",
+    "description" : "Name of DynamoDB table",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.tableName",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.tableOperation",
+        "equals" : "createTable",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "tableOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.partitionKey",
+    "label" : "Partition key",
+    "description" : "Partition key role. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-dynamodb/\" target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.partitionKey",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.tableOperation",
+        "equals" : "createTable",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "tableOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.partitionKeyRole",
+    "label" : "Partition key role",
+    "description" : "The role that this key attribute will assume. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-dynamodb/\" target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "input",
+    "binding" : {
+      "name" : "input.partitionKeyRole",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.tableOperation",
+        "equals" : "createTable",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "tableOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "HASH",
+      "value" : "HASH"
+    }, {
+      "name" : "RANGE",
+      "value" : "RANGE"
+    } ]
+  }, {
+    "id" : "input.partitionKeyType",
+    "label" : "Partition key attribute data type",
+    "description" : "Represents the data for an attribute",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "input",
+    "binding" : {
+      "name" : "input.partitionKeyType",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.tableOperation",
+        "equals" : "createTable",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "tableOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Binary",
+      "value" : "B"
+    }, {
+      "name" : "Number",
+      "value" : "N"
+    }, {
+      "name" : "String",
+      "value" : "S"
+    } ]
+  }, {
+    "id" : "input.sortKey",
+    "label" : "Sort key",
+    "description" : "Sort key. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-dynamodb/\" target=\"_blank\">documentation</a>",
+    "optional" : true,
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.sortKey",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.tableOperation",
+        "equals" : "createTable",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "tableOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.sortKeyRole",
+    "label" : "Sort key role",
+    "description" : "The role that this key attribute will assume",
+    "optional" : true,
+    "group" : "input",
+    "binding" : {
+      "name" : "input.sortKeyRole",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.tableOperation",
+        "equals" : "createTable",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "tableOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "HASH",
+      "value" : "HASH"
+    }, {
+      "name" : "RANGE",
+      "value" : "RANGE"
+    } ]
+  }, {
+    "id" : "input.sortKeyType",
+    "label" : "Sort key attribute data type",
+    "description" : "Represents the data for an attribute",
+    "optional" : true,
+    "group" : "input",
+    "binding" : {
+      "name" : "input.sortKeyType",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.tableOperation",
+        "equals" : "createTable",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "tableOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Binary",
+      "value" : "B"
+    }, {
+      "name" : "Number",
+      "value" : "N"
+    }, {
+      "name" : "String",
+      "value" : "S"
+    } ]
+  }, {
+    "id" : "input.readCapacityUnits",
+    "label" : "Read capacity units",
+    "description" : "Total number of read capacity units. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-dynamodb/\" target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.readCapacityUnits",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.tableOperation",
+        "equals" : "createTable",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "tableOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.writeCapacityUnits",
+    "label" : "Write capacity units",
+    "description" : "Total number of write capacity units. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-dynamodb/\" target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.writeCapacityUnits",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.tableOperation",
+        "equals" : "createTable",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "tableOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.billingModeStr",
+    "label" : "Billing mode",
+    "description" : "Controls how you are charged for read and write throughput. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-dynamodb/\" target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "input",
+    "binding" : {
+      "name" : "input.billingModeStr",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.tableOperation",
+        "equals" : "createTable",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "tableOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "PROVISIONED",
+      "value" : "PROVISIONED"
+    }, {
+      "name" : "PAY_PER_REQUEST",
+      "value" : "PAY_PER_REQUEST"
+    } ]
+  }, {
+    "id" : "input.deletionProtection",
+    "label" : "Deletion protection",
+    "description" : "Prevents accidental table deletion",
+    "optional" : false,
+    "value" : "false",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "input",
+    "binding" : {
+      "name" : "input.deletionProtection",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.tableOperation",
+        "equals" : "createTable",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "tableOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "True",
+      "value" : "true"
+    }, {
+      "name" : "False",
+      "value" : "false"
+    } ]
+  }, {
+    "id" : "input.deleteTable.tableName",
+    "label" : "Table name",
+    "description" : "Name of DynamoDB table",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.tableName",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.tableOperation",
+        "equals" : "deleteTable",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "tableOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.describeTable.tableName",
+    "label" : "Table name",
+    "description" : "Name of DynamoDB table",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.tableName",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.tableOperation",
+        "equals" : "describeTable",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "tableOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.scanTable.tableName",
+    "label" : "Table name",
+    "description" : "Name of DynamoDB table",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.tableName",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.tableOperation",
+        "equals" : "scanTable",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "tableOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.filterExpression",
+    "label" : "Filter expression",
+    "description" : "Filter expressions for scan. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-dynamodb/\" target=\"_blank\">documentation</a>",
+    "optional" : true,
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.filterExpression",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.tableOperation",
+        "equals" : "scanTable",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "tableOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.projectionExpression",
+    "label" : "Projection expression",
+    "description" : "Is a string that identifies the attributes that you want. For multiple attributes, the names must be comma-separated",
+    "optional" : true,
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.projectionExpression",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.tableOperation",
+        "equals" : "scanTable",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "tableOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.expressionAttributeNames",
+    "label" : "Expression attribute names",
+    "description" : "Is a placeholder that you use as an alternative to an actual attribute name. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-dynamodb/\" target=\"_blank\">documentation</a>",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.expressionAttributeNames",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.tableOperation",
+        "equals" : "scanTable",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "tableOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.expressionAttributeValues",
+    "label" : "Expression attribute values",
+    "description" : "Expression attribute values. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-dynamodb/\" target=\"_blank\">documentation</a>",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.expressionAttributeValues",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.tableOperation",
+        "equals" : "scanTable",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "tableOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.addItem.tableName",
+    "label" : "Table name",
+    "description" : "Name of DynamoDB table",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.tableName",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.itemOperation",
+        "equals" : "addItem",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "itemOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.item",
+    "label" : "Item",
+    "description" : "DynamoDB item (group of attributes)",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.item",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.itemOperation",
+        "equals" : "addItem",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "itemOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.deleteItem.tableName",
+    "label" : "Table name",
+    "description" : "Name of DynamoDB table",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.tableName",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.itemOperation",
+        "equals" : "deleteItem",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "itemOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.deleteItem.primaryKeyComponents",
+    "label" : "Primary key components",
+    "description" : "Simple or composite primary key",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.primaryKeyComponents",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.itemOperation",
+        "equals" : "deleteItem",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "itemOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.getItem.tableName",
+    "label" : "Table name",
+    "description" : "Name of DynamoDB table",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.tableName",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.itemOperation",
+        "equals" : "getItem",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "itemOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.getItem.primaryKeyComponents",
+    "label" : "Primary key components",
+    "description" : "Simple or composite primary key",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.primaryKeyComponents",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.itemOperation",
+        "equals" : "getItem",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "itemOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.updateTable.tableName",
+    "label" : "Table name",
+    "description" : "Name of DynamoDB table",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.tableName",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.itemOperation",
+        "equals" : "updateItem",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "itemOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.updateItem.primaryKeyComponents",
+    "label" : "Primary key components",
+    "description" : "Simple or composite primary key",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.primaryKeyComponents",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.itemOperation",
+        "equals" : "updateItem",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "itemOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.keyAttributes",
+    "label" : "Key attributes",
+    "description" : "DynamoDB key attributes. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-dynamodb/\" target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "input",
+    "binding" : {
+      "name" : "input.keyAttributes",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.itemOperation",
+        "equals" : "updateItem",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "itemOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.attributeAction",
+    "label" : "Attribute action",
+    "description" : "Specifies how to perform the update",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "input",
+    "binding" : {
+      "name" : "input.attributeAction",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "allMatch" : [ {
+        "property" : "input.itemOperation",
+        "equals" : "updateItem",
+        "type" : "simple"
+      }, {
+        "property" : "input.operationGroup",
+        "equals" : "itemOperation",
+        "type" : "simple"
+      } ]
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "PUT",
+      "value" : "put"
+    }, {
+      "name" : "DELETE",
+      "value" : "delete"
+    } ]
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "key" : "resultVariable",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "key" : "resultExpression",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "Text"
+  }, {
+    "id" : "errorExpression",
+    "label" : "Error expression",
+    "description" : "Expression to handle errors. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/\" target=\"_blank\">documentation</a>.",
+    "feel" : "required",
+    "group" : "error",
+    "binding" : {
+      "key" : "errorExpression",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "Text"
+  }, {
+    "id" : "retryCount",
+    "label" : "Retries",
+    "description" : "Number of retries",
+    "value" : "3",
+    "feel" : "optional",
+    "group" : "retries",
+    "binding" : {
+      "property" : "retries",
+      "type" : "zeebe:taskDefinition"
+    },
+    "type" : "String"
+  }, {
+    "id" : "retryBackoff",
+    "label" : "Retry backoff",
+    "description" : "ISO-8601 duration to wait between retries",
+    "value" : "PT0S",
+    "feel" : "optional",
+    "group" : "retries",
+    "binding" : {
+      "key" : "retryBackoff",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "String"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCAyNTYgMjg5JyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHByZXNlcnZlQXNwZWN0UmF0aW89J3hNaWRZTWlkJz4KICAgIDxwYXRoIGQ9J00xNjUuMjU4IDI4OC41MDFoMy41MDhsNTcuMjYxLTI4LjYzNC45NTMtMS4zNDdWMjkuOTY0bC0uOTUzLTEuMzU0TDE2OC43NjYgMGgtMy41NTFsLjA0MyAyODguNTAxJwogICAgICAgICAgZmlsbD0nIzUyOTRDRicvPgogICAgPHBhdGggZD0nTTkwLjc0MSAyODguNTAxaC0zLjU1N2wtNTcuMjEyLTI4LjYzNC0xLjE2MS0xLjk5Ny0uNTg5LTIyNi43NDIgMS43NS0yLjUxOEw4Ny4xODQgMGgzLjYwMWwtLjA0NCAyODguNTAxJwogICAgICAgICAgZmlsbD0nIzFGNUI5OCcvPgogICAgPHBhdGggZD0nTTg3LjI4NSAwaDgxLjQyNnYyODguNTAxSDg3LjI4NVYweicgZmlsbD0nIzJENzJCOCcvPgogICAgPHBhdGggZD0nTTI1NiAxMzcuNzY5bC0xLjkzNS0uNDI5LTI3LjYyOC0yLjU3Ni0uNDEuMjA0LTU3LjMxMi0yLjI5MmgtODEuNDNsLTU3LjMxMyAyLjI5MlY5MS4yNjRsLS4wNi4wMzIuMDYtLjEyOCA1Ny4zMTMtMTMuMjhoODEuNDNsNTcuMzEyIDEzLjI4IDIxLjA2OSAxMS4xOTl2LTcuMmw4LjkwNC0uOTc0LS45MjItMS43OTgtMjguMTkyLTIwLjE1OS0uODU5LjI3OS01Ny4zMTItMTcuNzU5aC04MS40M0wyOS45NzIgNzIuNTE1VjI4LjYxTDAgNjMuNzIzdjMwLjY2NmwuMjMyLS4xNjggOC42NzIuOTQ2djcuMzQ4TDAgMTA3LjI4djMwLjUxM2wuMjMyLS4wMjQgOC42NzIuMTI4djEyLjgwN2wtNy40ODIuMTEyTDAgMTUwLjY4djMwLjUyNWw4LjkwNCA0Ljc4OHY3LjQzM2wtOC41MzEuOTQyLS4zNzMtLjI4djMwLjY2MWwyOS45NzIgMzUuMTE4di00My45MDFsNTcuMzEzIDE3Ljc1OWg4MS40M2w1Ny40ODEtMTcuODExLjc2NC4zMzUgMjcuODIxLTE5Ljg2MiAxLjIxOS0xLjk3OS04LjkwNC0uOTgydi03LjI4NGwtMS4xNjctLjQ2Ni0xOS4wNDMgMTAuMjY1LS42OSAxLjQ0LTU3LjQ4MSAxMy4yMDN2LjAxNmgtODEuNDN2LS4wMTZsLTU3LjMxMy0xMy4yNTl2LTQzLjg2NGw1Ny4zMTMgMi4yODR2LjA1Nmg4MS40M2w1Ny4zMTItMi4zNCAxLjMwNS42IDI2Ljc3OS0yLjMwNiAxLjg4OS0uOTIzLTguOTA0LS4xMjh2LTEyLjgwN2w4LjkwNC0uMTI4JwogICAgICAgICAgZmlsbD0nIzFBNDc2RicvPgogICAgPHBhdGggZD0nTTIyNi4wMjcgMjE1Ljk2NnY0My45MDFMMjU2IDIyNC43NDl2LTMwLjQ2MWwtMjkuOCAyMS42MjYtLjE3My4wNTJNMjI2LjAyNyAxOTcuNDIxbC4xNzMtLjA0IDI5LjgtMTYuMDI4di0zMC42NDlsLTI5Ljk3MyAyLjc1N3Y0My45Nk0yMjYuMiA5MS4yMDhsLS4xNzMtLjA0djQzLjhMMjU2IDEzNy43Njl2LTMwLjYzNGwtMjkuOC0xNS45MjdNMjI2LjIgNzIuNjg3TDI1NiA5NC4xOTNWNjMuNzMxTDIyNi4wMjcgMjguNjF2NDMuOTA1bC4xNzMuMDZ2LjExMicKICAgICAgICAgIGZpbGw9JyMyRDcyQjgnLz4KPC9zdmc+"
+  }
+}
\ No newline at end of file
diff --git a/connectors/aws/aws-dynamodb/pom.xml b/connectors/aws/aws-dynamodb/pom.xml
index 5708a40691..0ad9f24317 100644
--- a/connectors/aws/aws-dynamodb/pom.xml
+++ b/connectors/aws/aws-dynamodb/pom.xml
@@ -55,6 +55,7 @@
                                     <templateFileName>aws-dynamodb-outbound-connector.json</templateFileName>
                                 </file>
                             </files>
+                            <generateHybridTemplates>true</generateHybridTemplates>
                         </connector>
                     </connectors>
                     <includeDependencies>
diff --git a/connectors/aws/aws-eventbridge/element-templates/hybrid/aws-eventbridge-outbound-connector-hybrid.json b/connectors/aws/aws-eventbridge/element-templates/hybrid/aws-eventbridge-outbound-connector-hybrid.json
new file mode 100644
index 0000000000..aedf2acb10
--- /dev/null
+++ b/connectors/aws/aws-eventbridge/element-templates/hybrid/aws-eventbridge-outbound-connector-hybrid.json
@@ -0,0 +1,254 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid Amazon EventBridge Outbound Connector",
+  "id" : "io.camunda.connectors.AWSEventBridge.v1-hybrid",
+  "description" : "Send events to AWS EventBridge",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-eventbridge/?awseventbridge=outbound",
+  "version" : 5,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:Task" ],
+  "elementType" : {
+    "value" : "bpmn:ServiceTask"
+  },
+  "groups" : [ {
+    "id" : "taskDefinitionType",
+    "label" : "Task definition type"
+  }, {
+    "id" : "authentication",
+    "label" : "Authentication"
+  }, {
+    "id" : "configuration",
+    "label" : "Queue properties"
+  }, {
+    "id" : "eventDetails",
+    "label" : "eventDetails"
+  }, {
+    "id" : "eventPayload",
+    "label" : "Event Payload"
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  }, {
+    "id" : "error",
+    "label" : "Error handling"
+  }, {
+    "id" : "retries",
+    "label" : "Retries"
+  } ],
+  "properties" : [ {
+    "id" : "taskDefinitionType",
+    "value" : "io.camunda:aws-eventbridge:1",
+    "group" : "taskDefinitionType",
+    "binding" : {
+      "property" : "type",
+      "type" : "zeebe:taskDefinition"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.type",
+    "label" : "Authentication",
+    "description" : "Specify AWS authentication strategy. Learn more at the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-lambda/#aws-authentication-types\" target=\"_blank\">documentation page</a>",
+    "value" : "credentials",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.type",
+      "type" : "zeebe:input"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Default Credentials Chain (Hybrid/Self-Managed only)",
+      "value" : "defaultCredentialsChain"
+    }, {
+      "name" : "Credentials",
+      "value" : "credentials"
+    } ]
+  }, {
+    "id" : "authentication.accessKey",
+    "label" : "Access key",
+    "description" : "Provide an IAM access key tailored to a user, equipped with the necessary permissions",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.accessKey",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.secretKey",
+    "label" : "Secret key",
+    "description" : "Provide a secret key of a user with permissions to invoke specified AWS Lambda function",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.secretKey",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "configuration.region",
+    "label" : "Region",
+    "description" : "Specify the AWS region",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.region",
+      "type" : "zeebe:input"
+    },
+    "type" : "String"
+  }, {
+    "id" : "configuration.endpoint",
+    "label" : "Endpoint",
+    "description" : "Specify endpoint if need to use custom endpoint",
+    "optional" : true,
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.endpoint",
+      "type" : "zeebe:input"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "input.source",
+    "label" : "Source",
+    "description" : "Enter the event source value. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-eventbridge/?awseventbridge=outbound\" target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "eventDetails",
+    "binding" : {
+      "name" : "input.source",
+      "type" : "zeebe:input"
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.detailType",
+    "label" : "Detail type",
+    "description" : "Enter the event detail type. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-eventbridge/?awseventbridge=outbound\" target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "eventDetails",
+    "binding" : {
+      "name" : "input.detailType",
+      "type" : "zeebe:input"
+    },
+    "type" : "String"
+  }, {
+    "id" : "input.eventBusName",
+    "label" : "Event bus name",
+    "description" : "Enter the event bus name. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-eventbridge/?awseventbridge=outbound\" target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "eventDetails",
+    "binding" : {
+      "name" : "input.eventBusName",
+      "type" : "zeebe:input"
+    },
+    "type" : "Text"
+  }, {
+    "id" : "input.detail",
+    "label" : "Event payload",
+    "description" : "Provide the payload for the event as JSON. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-eventbridge/?awseventbridge=outbound\" target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "eventPayload",
+    "binding" : {
+      "name" : "input.detail",
+      "type" : "zeebe:input"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "key" : "resultVariable",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "key" : "resultExpression",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "Text"
+  }, {
+    "id" : "errorExpression",
+    "label" : "Error expression",
+    "description" : "Expression to handle errors. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/\" target=\"_blank\">documentation</a>.",
+    "feel" : "required",
+    "group" : "error",
+    "binding" : {
+      "key" : "errorExpression",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "Text"
+  }, {
+    "id" : "retryCount",
+    "label" : "Retries",
+    "description" : "Number of retries",
+    "value" : "3",
+    "feel" : "optional",
+    "group" : "retries",
+    "binding" : {
+      "property" : "retries",
+      "type" : "zeebe:taskDefinition"
+    },
+    "type" : "String"
+  }, {
+    "id" : "retryBackoff",
+    "label" : "Retry backoff",
+    "description" : "ISO-8601 duration to wait between retries",
+    "value" : "PT0S",
+    "feel" : "optional",
+    "group" : "retries",
+    "binding" : {
+      "key" : "retryBackoff",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "String"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxOCcgaGVpZ2h0PScxOCcgdmlld0JveD0nMCAwIDI1NiAyNTYnPgogICAgPGRlZnM+CiAgICAgICAgPGxpbmVhckdyYWRpZW50IGlkPSdsb2dvc0F3c0V2ZW50YnJpZGdlMCcgeDE9JzAlJyB4Mj0nMTAwJScgeTE9JzEwMCUnIHkyPScwJSc+CiAgICAgICAgICAgIDxzdG9wIG9mZnNldD0nMCUnIHN0b3AtY29sb3I9JyNCMDA4NEQnLz4KICAgICAgICAgICAgPHN0b3Agb2Zmc2V0PScxMDAlJyBzdG9wLWNvbG9yPScjRkY0RjhCJy8+CiAgICAgICAgPC9saW5lYXJHcmFkaWVudD4KICAgIDwvZGVmcz4KICAgIDxwYXRoIGZpbGw9J3VybCgjbG9nb3NBd3NFdmVudGJyaWRnZTApJyBkPSdNMCAwaDI1NnYyNTZIMHonLz4KICAgIDxwYXRoIGZpbGw9JyNGRkYnCiAgICAgICAgICBkPSdNMTcxLjcwMiAyMTEuMmMtNi44NTggMC0xMi40NC01LjYxLTEyLjQ0LTEyLjUwOXM1LjU4Mi0xMi41MDkgMTIuNDQtMTIuNTA5YzYuODU3IDAgMTIuNDM4IDUuNjEgMTIuNDM4IDEyLjUxYzAgNi44OTgtNS41ODEgMTIuNTA4LTEyLjQzOCAxMi41MDhabS0yNy4yNzgtNTQuNGgtMzMuMDcxTDk0LjgxNSAxMjhsMTYuNTM4LTI4LjhoMzMuMDcxTDE2MC45NiAxMjhsLTE2LjUzNSAyOC44Wk04OC4zODcgNjkuODE4Yy02Ljg1NyAwLTEyLjQzOC01LjYxLTEyLjQzOC0xMi41MWMwLTYuODk4IDUuNTgxLTEyLjUwOCAxMi40MzgtMTIuNTA4YzYuODYxIDAgMTIuNDQzIDUuNjEgMTIuNDQzIDEyLjUwOXMtNS41ODIgMTIuNTA5LTEyLjQ0MyAxMi41MDlabTgzLjMxNSAxMDkuOTY0Yy0yLjM2MiAwLTQuNjE0LjQ1OC02LjY5OSAxLjI2MWwtMTMuNTE0LTIyLjkzMWwtLjcxMy40MjZMMTY3LjM5IDEyOS42YTMuMjI2IDMuMjI2IDAgMCAwIDAtMy4ybC0xOC4zNzQtMzJhMy4xNzcgMy4xNzcgMCAwIDAtMi43NTUtMS42aC0zMy40MzVsLjEzLS4wNzdsLTEyLjM5LTIxLjAzYzQuMDQ3LTMuNDY5IDYuNjI4LTguNjI3IDYuNjI4LTE0LjM4NGMwLTEwLjQyNi04LjQzNi0xOC45MDktMTguODA3LTE4LjkwOWMtMTAuMzY3IDAtMTguODAzIDguNDgzLTE4LjgwMyAxOC45MDljMCAxMC40MjUgOC40MzYgMTguOTA5IDE4LjgwMyAxOC45MDljMi4zNjUgMCA0LjYxOC0uNDU4IDYuNzAyLTEuMjYxbDExLjU2NyAxOS42MjVMODguMzg0IDEyNi40YTMuMjI2IDMuMjI2IDAgMCAwIDAgMy4ybDE4LjM3NyAzMmMuNTcuOTkyIDEuNjIgMS42IDIuNzU2IDEuNmgzNi43NDRjLjI2NCAwIC41MjEtLjA0Mi43Ny0uMTAybDEyLjQ5NiAyMS4yMWMtNC4wNTEgMy40NjgtNi42MjkgOC42MjYtNi42MjkgMTQuMzgzYzAgMTAuNDI2IDguNDMzIDE4LjkwOSAxOC44MDQgMTguOTA5YzEwLjM3IDAgMTguODAzLTguNDgzIDE4LjgwMy0xOC45MDljMC0xMC40MjUtOC40MzMtMTguOTA5LTE4LjgwMy0xOC45MDlabTE4Ljk2OC03Ny4wNWMtNi44NTcgMC0xMi40MzYtNS42MDktMTIuNDM2LTEyLjUwOGMwLTYuOSA1LjU3OS0xMi41MDkgMTIuNDM2LTEyLjUwOWM2Ljg1OCAwIDEyLjQ0IDUuNjEgMTIuNDQgMTIuNTA5YzAgNi45LTUuNTgyIDEyLjUwOS0xMi40NCAxMi41MDlabTIzLjMwMyAyMy42NjhsLTEyLjA4LTIxLjA0YzQuNTkyLTMuNDUzIDcuNTgtOC45NDQgNy41OC0xNS4xMzZjMC0xMC40MjYtOC40MzItMTguOTA5LTE4LjgwMy0xOC45MDljLTIuNjM4IDAtNS4xNTIuNTU0LTcuNDMzIDEuNTQ5bC05Ljg0OS0xNy4xNTVhMy4xOCAzLjE4IDAgMCAwLTIuNzU2LTEuNmgtMzkuNDQ4djYuNGgzNy42MTJsOS4xMSAxNS44NzJjLTMuNzAzIDMuNDU2LTYuMDM2IDguMzc0LTYuMDM2IDEzLjg0M2MwIDEwLjQyNiA4LjQzMyAxOC45MDkgMTguOCAxOC45MDljMS45MzIgMCAzLjgtLjI5OCA1LjU1Ni0uODQ1TDIwNy41NDUgMTI4bC0xNS44OTIgMjcuNjc0bDUuNTEyIDMuMmwxNi44MDgtMjkuMjc0YTMuMjEgMy4yMSAwIDAgMCAwLTMuMlptLTE0Ni4wNCA1MC4zOWMtNi44NiAwLTEyLjQ0Mi01LjYxMi0xMi40NDItMTIuNTA4YzAtNi45IDUuNTgxLTEyLjUxIDEyLjQ0Mi0xMi41MWM2Ljg1NyAwIDEyLjQzOSA1LjYxIDEyLjQzOSAxMi41MWMwIDYuODk2LTUuNTgyIDEyLjUwOC0xMi40NCAxMi41MDhabTEwLjM5MyAzLjIzNmM1LjA2Mi0zLjM5MiA4LjQxLTkuMTgxIDguNDEtMTUuNzQ0YzAtMTAuNDI2LTguNDM2LTE4LjkxLTE4LjgwMy0xOC45MWMtMy4wMDQgMC01LjgzMy43My04LjM1MyAxLjk5NEw0OC40NTggMTI4bDE4LjQyOC0zMi4wOTNsLTUuNTE1LTMuMkw0Mi4wMjcgMTI2LjRhMy4yMSAzLjIxIDAgMCAwIDAgMy4ybDEyLjM4OCAyMS41NjhjLTMuMjY4IDMuNDA1LTUuMjg5IDguMDIyLTUuMjg5IDEzLjExNGMwIDEwLjQyNSA4LjQzNiAxOC45MDggMTguODA3IDE4LjkwOGMxLjU2MiAwIDMuMDc0LS4yMTQgNC41MjgtLjU3OWwxMC4xNSAxNy42OGMuNTcuOTg5IDEuNjIgMS42IDIuNzU3IDEuNmgzOS40NTF2LTYuNEg4Ny4yMDRsLTguODc4LTE1LjQ2NVonLz4KPC9zdmc+Cg=="
+  }
+}
\ No newline at end of file
diff --git a/connectors/aws/aws-eventbridge/pom.xml b/connectors/aws/aws-eventbridge/pom.xml
index 798b214989..d725bdeb1d 100644
--- a/connectors/aws/aws-eventbridge/pom.xml
+++ b/connectors/aws/aws-eventbridge/pom.xml
@@ -58,6 +58,7 @@
                   <templateFileName>aws-eventbridge-outbound-connector.json</templateFileName>
                 </file>
               </files>
+              <generateHybridTemplates>true</generateHybridTemplates>
             </connector>
           </connectors>
           <includeDependencies>
@@ -68,5 +69,4 @@
     </plugins>
   </build>
 
-
 </project>
diff --git a/connectors/aws/aws-lambda/element-templates/hybrid/aws-lambda-outbound-connector-hybrid.json b/connectors/aws/aws-lambda/element-templates/hybrid/aws-lambda-outbound-connector-hybrid.json
new file mode 100644
index 0000000000..4ae7b1f462
--- /dev/null
+++ b/connectors/aws/aws-lambda/element-templates/hybrid/aws-lambda-outbound-connector-hybrid.json
@@ -0,0 +1,239 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid AWS Lambda Outbound Connector",
+  "id" : "io.camunda.connectors.AWSLAMBDA.v2-hybrid",
+  "description" : "Invoke a function",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-lambda/",
+  "version" : 5,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:Task" ],
+  "elementType" : {
+    "value" : "bpmn:ServiceTask"
+  },
+  "groups" : [ {
+    "id" : "taskDefinitionType",
+    "label" : "Task definition type"
+  }, {
+    "id" : "authentication",
+    "label" : "Authentication"
+  }, {
+    "id" : "configuration",
+    "label" : "Configuration"
+  }, {
+    "id" : "operation",
+    "label" : "Select operation"
+  }, {
+    "id" : "operationDetails",
+    "label" : "Operation details"
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  }, {
+    "id" : "error",
+    "label" : "Error handling"
+  }, {
+    "id" : "retries",
+    "label" : "Retries"
+  } ],
+  "properties" : [ {
+    "id" : "taskDefinitionType",
+    "value" : "io.camunda:aws-lambda:1",
+    "group" : "taskDefinitionType",
+    "binding" : {
+      "property" : "type",
+      "type" : "zeebe:taskDefinition"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.type",
+    "label" : "Authentication",
+    "description" : "Specify AWS authentication strategy. Learn more at the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-lambda/#aws-authentication-types\" target=\"_blank\">documentation page</a>",
+    "value" : "credentials",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.type",
+      "type" : "zeebe:input"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Default Credentials Chain (Hybrid/Self-Managed only)",
+      "value" : "defaultCredentialsChain"
+    }, {
+      "name" : "Credentials",
+      "value" : "credentials"
+    } ]
+  }, {
+    "id" : "authentication.accessKey",
+    "label" : "Access key",
+    "description" : "Provide an IAM access key tailored to a user, equipped with the necessary permissions",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.accessKey",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.secretKey",
+    "label" : "Secret key",
+    "description" : "Provide a secret key of a user with permissions to invoke specified AWS Lambda function",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.secretKey",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "configuration.region",
+    "label" : "Region",
+    "description" : "Specify the AWS region",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.region",
+      "type" : "zeebe:input"
+    },
+    "type" : "String"
+  }, {
+    "id" : "configuration.endpoint",
+    "label" : "Endpoint",
+    "description" : "Specify endpoint if need to use custom endpoint",
+    "optional" : true,
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.endpoint",
+      "type" : "zeebe:input"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "awsFunction.operationType",
+    "label" : "Operation type",
+    "optional" : false,
+    "value" : "sync",
+    "group" : "operation",
+    "binding" : {
+      "name" : "awsFunction.operationType",
+      "type" : "zeebe:input"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Invoke function (sync)",
+      "value" : "sync"
+    } ]
+  }, {
+    "id" : "awsFunction.functionName",
+    "label" : "Function name",
+    "description" : "Enter a name, ARN or alias of your function",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "operationDetails",
+    "binding" : {
+      "name" : "awsFunction.functionName",
+      "type" : "zeebe:input"
+    },
+    "type" : "String"
+  }, {
+    "id" : "awsFunction.payload",
+    "label" : "Payload",
+    "description" : "Provide payload for your function as JSON",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "operationDetails",
+    "binding" : {
+      "name" : "awsFunction.payload",
+      "type" : "zeebe:input"
+    },
+    "type" : "Text"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "key" : "resultVariable",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "key" : "resultExpression",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "Text"
+  }, {
+    "id" : "errorExpression",
+    "label" : "Error expression",
+    "description" : "Expression to handle errors. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/\" target=\"_blank\">documentation</a>.",
+    "feel" : "required",
+    "group" : "error",
+    "binding" : {
+      "key" : "errorExpression",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "Text"
+  }, {
+    "id" : "retryCount",
+    "label" : "Retries",
+    "description" : "Number of retries",
+    "value" : "3",
+    "feel" : "optional",
+    "group" : "retries",
+    "binding" : {
+      "property" : "retries",
+      "type" : "zeebe:taskDefinition"
+    },
+    "type" : "String"
+  }, {
+    "id" : "retryBackoff",
+    "label" : "Retry backoff",
+    "description" : "ISO-8601 duration to wait between retries",
+    "value" : "PT0S",
+    "feel" : "optional",
+    "group" : "retries",
+    "binding" : {
+      "key" : "retryBackoff",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "String"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCA0OCA0OCcgdmVyc2lvbj0nMS4xJyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnCiAgICAgeG1sbnM6eGxpbms9J2h0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsnPgogICAgPHRpdGxlPkljb24tUmVzb3VyY2UvQ29tcHV0ZS9SZXNfQW1hem9uLUxhbWJkYV9MYW1iZGEtRnVuY3Rpb25fNDhfTGlnaHQ8L3RpdGxlPgogICAgPGcgaWQ9J0ljb24tUmVzb3VyY2UvQ29tcHV0ZS9SZXNfQW1hem9uLUxhbWJkYV9MYW1iZGEtRnVuY3Rpb25fNDgnIHN0cm9rZT0nbm9uZScgc3Ryb2tlLXdpZHRoPScxJyBmaWxsPSdub25lJwogICAgICAgZmlsbC1ydWxlPSdldmVub2RkJz4KICAgICAgICA8cGF0aCBkPSdNMjQsNDQgQzEyLjk3Miw0NCA0LDM1LjAyOCA0LDI0IEM0LDEyLjk3MiAxMi45NzIsNCAyNCw0IEMzNS4wMjgsNCA0NCwxMi45NzIgNDQsMjQgQzQ0LDM1LjAyOCAzNS4wMjgsNDQgMjQsNDQgTDI0LDQ0IFogTTI0LDIgQzExLjg2OSwyIDIsMTEuODY5IDIsMjQgQzIsMzYuMTMxIDExLjg2OSw0NiAyNCw0NiBDMzYuMTMxLDQ2IDQ2LDM2LjEzMSA0NiwyNCBDNDYsMTEuODY5IDM2LjEzMSwyIDI0LDIgTDI0LDIgWiBNMTcuMjMxLDM1LjI1IEwxMS44NzYsMzUuMjUgTDE4LjIyMSwyMS45NTkgTDIwLjkwMiwyNy40OTIgTDE3LjIzMSwzNS4yNSBaIE0xOS4xMTQsMTkuMjE1IEMxOC45NDYsMTguODcgMTguNTk3LDE4LjY1MSAxOC4yMTQsMTguNjUxIEwxOC4yMTEsMTguNjUxIEMxNy44MjYsMTguNjUyIDE3LjQ3NywxOC44NzQgMTcuMzEyLDE5LjIyMSBMOS4zODksMzUuODE5IEM5LjI0LDM2LjEyOSA5LjI2MiwzNi40OTMgOS40NDUsMzYuNzgzIEM5LjYyOCwzNy4wNzQgOS45NDcsMzcuMjUgMTAuMjkxLDM3LjI1IEwxNy44NjQsMzcuMjUgQzE4LjI1MSwzNy4yNSAxOC42MDMsMzcuMDI3IDE4Ljc2OSwzNi42NzggTDIyLjkxNSwyNy45MTUgQzIzLjA0NCwyNy42NDIgMjMuMDQzLDI3LjMyMyAyMi45MTEsMjcuMDUxIEwxOS4xMTQsMTkuMjE1IFogTTM2LjEyNSwzNS4yNSBMMzAuNjczLDM1LjI1IEwyMC43NjEsMTMuOTUzIEMyMC41OTcsMTMuNjAxIDIwLjI0MywxMy4zNzUgMTkuODU0LDEzLjM3NSBMMTYuMjUxLDEzLjM3NSBMMTYuMjU1LDkuMjUgTDIzLjQ3NSw5LjI1IEwzMy4zMzksMzAuNTQ1IEMzMy41MDMsMzAuODk4IDMzLjg1NiwzMS4xMjUgMzQuMjQ2LDMxLjEyNSBMMzYuMTI1LDMxLjEyNSBMMzYuMTI1LDM1LjI1IFogTTM3LjEyNSwyOS4xMjUgTDM0Ljg4NSwyOS4xMjUgTDI1LjAyMSw3LjgzIEMyNC44NTYsNy40NzcgMjQuNTAzLDcuMjUgMjQuMTEzLDcuMjUgTDE1LjI1Niw3LjI1IEMxNC43MDQsNy4yNSAxNC4yNTcsNy42OTcgMTQuMjU2LDguMjQ5IEwxNC4yNSwxNC4zNzQgQzE0LjI1LDE0LjY0IDE0LjM1NSwxNC44OTQgMTQuNTQzLDE1LjA4MiBDMTQuNzMsMTUuMjcgMTQuOTg0LDE1LjM3NSAxNS4yNSwxNS4zNzUgTDE5LjIxNywxNS4zNzUgTDI5LjEyOSwzNi42NzIgQzI5LjI5MywzNy4wMjQgMjkuNjQ2LDM3LjI1IDMwLjAzNSwzNy4yNSBMMzcuMTI1LDM3LjI1IEMzNy42NzgsMzcuMjUgMzguMTI1LDM2LjgwMyAzOC4xMjUsMzYuMjUgTDM4LjEyNSwzMC4xMjUgQzM4LjEyNSwyOS41NzIgMzcuNjc4LDI5LjEyNSAzNy4xMjUsMjkuMTI1IEwzNy4xMjUsMjkuMTI1IFonCiAgICAgICAgICAgICAgaWQ9J0FtYXpvbi1MYW1iZGEtTGFtYmRhLUZ1bmN0aW9uX1Jlc291cmNlLUljb25fbGlnaHQtYmcnIGZpbGw9JyNENDVCMDcnPjwvcGF0aD4KICAgIDwvZz4KPC9zdmc+"
+  }
+}
\ No newline at end of file
diff --git a/connectors/aws/aws-lambda/pom.xml b/connectors/aws/aws-lambda/pom.xml
index 819e1e7f72..5dc88518e0 100644
--- a/connectors/aws/aws-lambda/pom.xml
+++ b/connectors/aws/aws-lambda/pom.xml
@@ -56,7 +56,7 @@
                   <templateFileName>aws-lambda-outbound-connector.json</templateFileName>
                 </file>
               </files>
-
+              <generateHybridTemplates>true</generateHybridTemplates>
             </connector>
           </connectors>
           <includeDependencies>
diff --git a/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-boundary-hybrid.json b/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-boundary-hybrid.json
new file mode 100644
index 0000000000..16beefd4b6
--- /dev/null
+++ b/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-boundary-hybrid.json
@@ -0,0 +1,180 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid SNS HTTPS Boundary Event Connector",
+  "id" : "io.camunda.connectors.inbound.AWSSNS.Boundary.v1-hybrid",
+  "description" : "Receive events from AWS SNS",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sns/?amazonsns=inbound",
+  "version" : 4,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:BoundaryEvent" ],
+  "elementType" : {
+    "value" : "bpmn:BoundaryEvent",
+    "eventDefinition" : "bpmn:MessageEventDefinition"
+  },
+  "groups" : [ {
+    "id" : "connectorType",
+    "label" : "Connector type"
+  }, {
+    "id" : "subscription",
+    "label" : "Subscription Configuration"
+  }, {
+    "id" : "activation",
+    "label" : "Activation"
+  }, {
+    "id" : "correlation",
+    "label" : "Correlation"
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  } ],
+  "properties" : [ {
+    "id" : "connectorType",
+    "value" : "io.camunda:aws-sns-webhook:1",
+    "group" : "connectorType",
+    "binding" : {
+      "name" : "inbound.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "inbound.context",
+    "label" : "Subscription ID",
+    "description" : "The subscription ID is a part of the URL endpoint",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "subscription",
+    "binding" : {
+      "name" : "inbound.context",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "inbound.securitySubscriptionAllowedFor",
+    "label" : "Allow to receive messages from topic(s)",
+    "description" : "Control which topic(s) is allowed to start a process",
+    "optional" : false,
+    "value" : "any",
+    "group" : "subscription",
+    "binding" : {
+      "name" : "inbound.securitySubscriptionAllowedFor",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Any",
+      "value" : "any"
+    }, {
+      "name" : "Specific topic(s)",
+      "value" : "specific"
+    } ]
+  }, {
+    "id" : "inbound.topicsAllowList",
+    "label" : "Topic ARN(s)",
+    "description" : "Topics that allow to publish messages",
+    "optional" : true,
+    "feel" : "optional",
+    "group" : "subscription",
+    "binding" : {
+      "name" : "inbound.topicsAllowList",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "inbound.securitySubscriptionAllowedFor",
+      "equals" : "specific",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "activationCondition",
+    "label" : "Activation condition",
+    "description" : "Condition under which the Connector triggers. Leave empty to catch all events",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "activation",
+    "binding" : {
+      "name" : "activationCondition",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "correlationKeyProcess",
+    "label" : "Correlation key (process)",
+    "description" : "Sets up the correlation key from process variables",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKey",
+      "type" : "bpmn:Message#zeebe:subscription#property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "correlationKeyPayload",
+    "label" : "Correlation key (payload)",
+    "description" : "Extracts the correlation key from the incoming message payload",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKeyExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageIdExpression",
+    "label" : "Message ID expression",
+    "description" : "Expression to extract unique identifier of a message",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "messageIdExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageNameUuid",
+    "generatedValue" : {
+      "type" : "uuid"
+    },
+    "group" : "correlation",
+    "binding" : {
+      "name" : "name",
+      "type" : "bpmn:Message#property"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultVariable",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "Text"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCA4MCA4MCcgdmVyc2lvbj0nMS4xJyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnCiAgICAgeG1sbnM6eGxpbms9J2h0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsnPjwhLS0gR2VuZXJhdG9yOiBTa2V0Y2ggNjQgKDkzNTM3KSAtIGh0dHBzOi8vc2tldGNoLmNvbSAtLT4KICAgIDx0aXRsZT5JY29uLUFyY2hpdGVjdHVyZS82NC9BcmNoX0FXUy1TaW1wbGUtTm90aWZpY2F0aW9uLVNlcnZpY2VfNjQ8L3RpdGxlPgogICAgPGRlc2M+Q3JlYXRlZCB3aXRoIFNrZXRjaC48L2Rlc2M+CiAgICA8ZGVmcz4KICAgICAgICA8bGluZWFyR3JhZGllbnQgeDE9JzAlJyB5MT0nMTAwJScgeDI9JzEwMCUnIHkyPScwJScgaWQ9J2xpbmVhckdyYWRpZW50LTEnPgogICAgICAgICAgICA8c3RvcCBzdG9wLWNvbG9yPScjQjAwODREJyBvZmZzZXQ9JzAlJz48L3N0b3A+CiAgICAgICAgICAgIDxzdG9wIHN0b3AtY29sb3I9JyNGRjRGOEInIG9mZnNldD0nMTAwJSc+PC9zdG9wPgogICAgICAgIDwvbGluZWFyR3JhZGllbnQ+CiAgICA8L2RlZnM+CiAgICA8ZyBpZD0nSWNvbi1BcmNoaXRlY3R1cmUvNjQvQXJjaF9BV1MtU2ltcGxlLU5vdGlmaWNhdGlvbi1TZXJ2aWNlXzY0JyBzdHJva2U9J25vbmUnIHN0cm9rZS13aWR0aD0nMScgZmlsbD0nbm9uZScKICAgICAgIGZpbGwtcnVsZT0nZXZlbm9kZCc+CiAgICAgICAgPGcgaWQ9J0ljb24tQXJjaGl0ZWN0dXJlLUJHLzY0L0FwcGxpY2F0aW9uLUludGVncmF0aW9uJyBmaWxsPSd1cmwoI2xpbmVhckdyYWRpZW50LTEpJz4KICAgICAgICAgICAgPHJlY3QgaWQ9J1JlY3RhbmdsZScgeD0nMCcgeT0nMCcgd2lkdGg9JzgwJyBoZWlnaHQ9JzgwJz48L3JlY3Q+CiAgICAgICAgPC9nPgogICAgICAgIDxwYXRoIGQ9J00xNywzOCBDMTguMTAzLDM4IDE5LDM4Ljg5NyAxOSw0MCBDMTksNDEuMTAzIDE4LjEwMyw0MiAxNyw0MiBDMTUuODk3LDQyIDE1LDQxLjEwMyAxNSw0MCBDMTUsMzguODk3IDE1Ljg5NywzOCAxNywzOCBMMTcsMzggWiBNNDEsNjQgQzI5LjMxNCw2NCAxOS4yODksNTUuNDY2IDE3LjE5NCw0My45OCBDMTguOTY1LDQzLjg5NCAyMC40MjcsNDIuNjU5IDIwLjg1Nyw0MSBMMjcsNDEgTDI3LDM5IEwyMC44NTcsMzkgQzIwLjQyNywzNy4zNDIgMTguOTY2LDM2LjEwNyAxNy4xOTUsMzYuMDIgQzE5LjI4NSwyNC43MSAyOS41MTEsMTYgNDEsMTYgQzQ1LjMxMywxNiA0OS44MzIsMTcuNjIyIDU0LjQyOSwyMC44MjEgTDU1LjU3MSwxOS4xNzkgQzUwLjYzMywxNS43NDMgNDUuNzMsMTQgNDEsMTQgQzI4LjI3LDE0IDE2Ljk0OSwyMy44NjUgMTUuMDYzLDM2LjUyMSBDMTMuODM5LDM3LjIwNyAxMywzOC41IDEzLDQwIEMxMyw0MS41IDEzLjgzOSw0Mi43OTMgMTUuMDYzLDQzLjQ3OCBDMTYuOTcsNTYuMzQxIDI4LjA1Niw2NiA0MSw2NiBDNDYuNDA3LDY2IDUxLjk0Miw2NC4xNTcgNTYuNTg1LDYwLjgxMSBMNTUuNDE1LDU5LjE4OSBDNTEuMTEsNjIuMjkyIDQ1Ljk5MSw2NCA0MSw2NCBMNDEsNjQgWiBNMzAuMTAxLDM2LjQ0MiBDMzEuOTU1LDM2Ljg5NSAzNC4yNzUsMzcgMzYsMzcgQzM3LjY0MiwzNyAzOS44MjMsMzYuOTA1IDQxLjYyOSwzNi41MDYgTDM3LjEwNSw0NS41NTMgQzM3LjAzNiw0NS42OTEgMzcsNDUuODQ1IDM3LDQ2IEwzNyw1MC40NTMgQzM2LjE5OSw1MC45NjQgMzQuODMzLDUxLjgxMiAzNCw1MS45ODYgTDM0LDQ2IEMzNCw0NS44NjggMzMuOTc0LDQ1LjczNyAzMy45MjMsNDUuNjE1IEwzMC4xMDEsMzYuNDQyIFogTTM2LDMzIEM0MC4wMjUsMzMgNDIuMTc0LDMzLjYwNCA0Mi44NDEsMzQgQzQyLjE3NCwzNC4zOTYgNDAuMDI1LDM1IDM2LDM1IEMzMS45NzUsMzUgMjkuODI2LDM0LjM5NiAyOS4xNTksMzQgQzI5LjgyNiwzMy42MDQgMzEuOTc1LDMzIDM2LDMzIEwzNiwzMyBaIE0zMyw1NCBMMzQsNTQgQzM0LjA0Myw1NCAzNC4wODYsNTMuOTk3IDM0LjEyOCw1My45OTIgQzM1LjM1Miw1My44MzMgMzYuOTA5LDUyLjg4NyAzOC4yNzIsNTIuMDEzIEwzOC41MzUsNTEuODQ1IEMzOC44MjQsNTEuNjYxIDM5LDUxLjM0MiAzOSw1MSBMMzksNDYuMjM2IEw0NC41NTksMzUuMTIgQzQ0LjgzMywzNC44MDEgNDUsMzQuNDM0IDQ1LDM0IEM0NSwzMS4zOSAzOS4zNjEsMzEgMzYsMzEgQzMyLjYzOSwzMSAyNywzMS4zOSAyNywzNCBDMjcsMzQuMzY2IDI3LjEyLDM0LjY4NCAyNy4zMiwzNC45NjcgTDMyLDQ2LjIgTDMyLDUzIEMzMiw1My41NTIgMzIuNDQ3LDU0IDMzLDU0IEwzMyw1NCBaIE02Miw1MyBDNjMuMTAzLDUzIDY0LDUzLjg5NyA2NCw1NSBDNjQsNTYuMTAzIDYzLjEwMyw1NyA2Miw1NyBDNjAuODk3LDU3IDYwLDU2LjEwMyA2MCw1NSBDNjAsNTMuODk3IDYwLjg5Nyw1MyA2Miw1MyBMNjIsNTMgWiBNNjIsMjMgQzYzLjEwMywyMyA2NCwyMy44OTcgNjQsMjUgQzY0LDI2LjEwMyA2My4xMDMsMjcgNjIsMjcgQzYwLjg5NywyNyA2MCwyNi4xMDMgNjAsMjUgQzYwLDIzLjg5NyA2MC44OTcsMjMgNjIsMjMgTDYyLDIzIFogTTY0LDM4IEM2NS4xMDMsMzggNjYsMzguODk3IDY2LDQwIEM2Niw0MS4xMDMgNjUuMTAzLDQyIDY0LDQyIEM2Mi44OTcsNDIgNjIsNDEuMTAzIDYyLDQwIEM2MiwzOC44OTcgNjIuODk3LDM4IDY0LDM4IEw2NCwzOCBaIE01NCw0MSBMNjAuMTQzLDQxIEM2MC41ODksNDIuNzIgNjIuMTQyLDQ0IDY0LDQ0IEM2Ni4yMDYsNDQgNjgsNDIuMjA2IDY4LDQwIEM2OCwzNy43OTQgNjYuMjA2LDM2IDY0LDM2IEM2Mi4xNDIsMzYgNjAuNTg5LDM3LjI4IDYwLjE0MywzOSBMNTQsMzkgTDU0LDI2IEw1OC4xNDMsMjYgQzU4LjU4OSwyNy43MiA2MC4xNDIsMjkgNjIsMjkgQzY0LjIwNiwyOSA2NiwyNy4yMDYgNjYsMjUgQzY2LDIyLjc5NCA2NC4yMDYsMjEgNjIsMjEgQzYwLjE0MiwyMSA1OC41ODksMjIuMjggNTguMTQzLDI0IEw1MywyNCBDNTIuNDQ3LDI0IDUyLDI0LjQ0OCA1MiwyNSBMNTIsMzkgTDQ1LDM5IEw0NSw0MSBMNTIsNDEgTDUyLDU1IEM1Miw1NS41NTIgNTIuNDQ3LDU2IDUzLDU2IEw1OC4xNDMsNTYgQzU4LjU4OSw1Ny43MiA2MC4xNDIsNTkgNjIsNTkgQzY0LjIwNiw1OSA2Niw1Ny4yMDYgNjYsNTUgQzY2LDUyLjc5NCA2NC4yMDYsNTEgNjIsNTEgQzYwLjE0Miw1MSA1OC41ODksNTIuMjggNTguMTQzLDU0IEw1NCw1NCBMNTQsNDEgWicKICAgICAgICAgICAgICBpZD0nQVdTLVNpbXBsZS1Ob3RpZmljYXRpb24tU2VydmljZV9JY29uXzY0X1NxdWlkJyBmaWxsPScjRkZGRkZGJz48L3BhdGg+CiAgICA8L2c+Cjwvc3ZnPg=="
+  }
+}
\ No newline at end of file
diff --git a/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-intermediate-hybrid.json b/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-intermediate-hybrid.json
new file mode 100644
index 0000000000..7d41f3d1f2
--- /dev/null
+++ b/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-intermediate-hybrid.json
@@ -0,0 +1,180 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid SNS HTTPS Intermediate Catch Event Connector",
+  "id" : "io.camunda.connectors.inbound.AWSSNS.IntermediateCatchEvent.v1-hybrid",
+  "description" : "Receive events from AWS SNS",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sns/?amazonsns=inbound",
+  "version" : 4,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:IntermediateCatchEvent", "bpmn:IntermediateThrowEvent" ],
+  "elementType" : {
+    "value" : "bpmn:IntermediateCatchEvent",
+    "eventDefinition" : "bpmn:MessageEventDefinition"
+  },
+  "groups" : [ {
+    "id" : "connectorType",
+    "label" : "Connector type"
+  }, {
+    "id" : "subscription",
+    "label" : "Subscription Configuration"
+  }, {
+    "id" : "activation",
+    "label" : "Activation"
+  }, {
+    "id" : "correlation",
+    "label" : "Correlation"
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  } ],
+  "properties" : [ {
+    "id" : "connectorType",
+    "value" : "io.camunda:aws-sns-webhook:1",
+    "group" : "connectorType",
+    "binding" : {
+      "name" : "inbound.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "inbound.context",
+    "label" : "Subscription ID",
+    "description" : "The subscription ID is a part of the URL endpoint",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "subscription",
+    "binding" : {
+      "name" : "inbound.context",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "inbound.securitySubscriptionAllowedFor",
+    "label" : "Allow to receive messages from topic(s)",
+    "description" : "Control which topic(s) is allowed to start a process",
+    "optional" : false,
+    "value" : "any",
+    "group" : "subscription",
+    "binding" : {
+      "name" : "inbound.securitySubscriptionAllowedFor",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Any",
+      "value" : "any"
+    }, {
+      "name" : "Specific topic(s)",
+      "value" : "specific"
+    } ]
+  }, {
+    "id" : "inbound.topicsAllowList",
+    "label" : "Topic ARN(s)",
+    "description" : "Topics that allow to publish messages",
+    "optional" : true,
+    "feel" : "optional",
+    "group" : "subscription",
+    "binding" : {
+      "name" : "inbound.topicsAllowList",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "inbound.securitySubscriptionAllowedFor",
+      "equals" : "specific",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "activationCondition",
+    "label" : "Activation condition",
+    "description" : "Condition under which the Connector triggers. Leave empty to catch all events",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "activation",
+    "binding" : {
+      "name" : "activationCondition",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "correlationKeyProcess",
+    "label" : "Correlation key (process)",
+    "description" : "Sets up the correlation key from process variables",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKey",
+      "type" : "bpmn:Message#zeebe:subscription#property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "correlationKeyPayload",
+    "label" : "Correlation key (payload)",
+    "description" : "Extracts the correlation key from the incoming message payload",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKeyExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageIdExpression",
+    "label" : "Message ID expression",
+    "description" : "Expression to extract unique identifier of a message",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "messageIdExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageNameUuid",
+    "generatedValue" : {
+      "type" : "uuid"
+    },
+    "group" : "correlation",
+    "binding" : {
+      "name" : "name",
+      "type" : "bpmn:Message#property"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultVariable",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "Text"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCA4MCA4MCcgdmVyc2lvbj0nMS4xJyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnCiAgICAgeG1sbnM6eGxpbms9J2h0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsnPjwhLS0gR2VuZXJhdG9yOiBTa2V0Y2ggNjQgKDkzNTM3KSAtIGh0dHBzOi8vc2tldGNoLmNvbSAtLT4KICAgIDx0aXRsZT5JY29uLUFyY2hpdGVjdHVyZS82NC9BcmNoX0FXUy1TaW1wbGUtTm90aWZpY2F0aW9uLVNlcnZpY2VfNjQ8L3RpdGxlPgogICAgPGRlc2M+Q3JlYXRlZCB3aXRoIFNrZXRjaC48L2Rlc2M+CiAgICA8ZGVmcz4KICAgICAgICA8bGluZWFyR3JhZGllbnQgeDE9JzAlJyB5MT0nMTAwJScgeDI9JzEwMCUnIHkyPScwJScgaWQ9J2xpbmVhckdyYWRpZW50LTEnPgogICAgICAgICAgICA8c3RvcCBzdG9wLWNvbG9yPScjQjAwODREJyBvZmZzZXQ9JzAlJz48L3N0b3A+CiAgICAgICAgICAgIDxzdG9wIHN0b3AtY29sb3I9JyNGRjRGOEInIG9mZnNldD0nMTAwJSc+PC9zdG9wPgogICAgICAgIDwvbGluZWFyR3JhZGllbnQ+CiAgICA8L2RlZnM+CiAgICA8ZyBpZD0nSWNvbi1BcmNoaXRlY3R1cmUvNjQvQXJjaF9BV1MtU2ltcGxlLU5vdGlmaWNhdGlvbi1TZXJ2aWNlXzY0JyBzdHJva2U9J25vbmUnIHN0cm9rZS13aWR0aD0nMScgZmlsbD0nbm9uZScKICAgICAgIGZpbGwtcnVsZT0nZXZlbm9kZCc+CiAgICAgICAgPGcgaWQ9J0ljb24tQXJjaGl0ZWN0dXJlLUJHLzY0L0FwcGxpY2F0aW9uLUludGVncmF0aW9uJyBmaWxsPSd1cmwoI2xpbmVhckdyYWRpZW50LTEpJz4KICAgICAgICAgICAgPHJlY3QgaWQ9J1JlY3RhbmdsZScgeD0nMCcgeT0nMCcgd2lkdGg9JzgwJyBoZWlnaHQ9JzgwJz48L3JlY3Q+CiAgICAgICAgPC9nPgogICAgICAgIDxwYXRoIGQ9J00xNywzOCBDMTguMTAzLDM4IDE5LDM4Ljg5NyAxOSw0MCBDMTksNDEuMTAzIDE4LjEwMyw0MiAxNyw0MiBDMTUuODk3LDQyIDE1LDQxLjEwMyAxNSw0MCBDMTUsMzguODk3IDE1Ljg5NywzOCAxNywzOCBMMTcsMzggWiBNNDEsNjQgQzI5LjMxNCw2NCAxOS4yODksNTUuNDY2IDE3LjE5NCw0My45OCBDMTguOTY1LDQzLjg5NCAyMC40MjcsNDIuNjU5IDIwLjg1Nyw0MSBMMjcsNDEgTDI3LDM5IEwyMC44NTcsMzkgQzIwLjQyNywzNy4zNDIgMTguOTY2LDM2LjEwNyAxNy4xOTUsMzYuMDIgQzE5LjI4NSwyNC43MSAyOS41MTEsMTYgNDEsMTYgQzQ1LjMxMywxNiA0OS44MzIsMTcuNjIyIDU0LjQyOSwyMC44MjEgTDU1LjU3MSwxOS4xNzkgQzUwLjYzMywxNS43NDMgNDUuNzMsMTQgNDEsMTQgQzI4LjI3LDE0IDE2Ljk0OSwyMy44NjUgMTUuMDYzLDM2LjUyMSBDMTMuODM5LDM3LjIwNyAxMywzOC41IDEzLDQwIEMxMyw0MS41IDEzLjgzOSw0Mi43OTMgMTUuMDYzLDQzLjQ3OCBDMTYuOTcsNTYuMzQxIDI4LjA1Niw2NiA0MSw2NiBDNDYuNDA3LDY2IDUxLjk0Miw2NC4xNTcgNTYuNTg1LDYwLjgxMSBMNTUuNDE1LDU5LjE4OSBDNTEuMTEsNjIuMjkyIDQ1Ljk5MSw2NCA0MSw2NCBMNDEsNjQgWiBNMzAuMTAxLDM2LjQ0MiBDMzEuOTU1LDM2Ljg5NSAzNC4yNzUsMzcgMzYsMzcgQzM3LjY0MiwzNyAzOS44MjMsMzYuOTA1IDQxLjYyOSwzNi41MDYgTDM3LjEwNSw0NS41NTMgQzM3LjAzNiw0NS42OTEgMzcsNDUuODQ1IDM3LDQ2IEwzNyw1MC40NTMgQzM2LjE5OSw1MC45NjQgMzQuODMzLDUxLjgxMiAzNCw1MS45ODYgTDM0LDQ2IEMzNCw0NS44NjggMzMuOTc0LDQ1LjczNyAzMy45MjMsNDUuNjE1IEwzMC4xMDEsMzYuNDQyIFogTTM2LDMzIEM0MC4wMjUsMzMgNDIuMTc0LDMzLjYwNCA0Mi44NDEsMzQgQzQyLjE3NCwzNC4zOTYgNDAuMDI1LDM1IDM2LDM1IEMzMS45NzUsMzUgMjkuODI2LDM0LjM5NiAyOS4xNTksMzQgQzI5LjgyNiwzMy42MDQgMzEuOTc1LDMzIDM2LDMzIEwzNiwzMyBaIE0zMyw1NCBMMzQsNTQgQzM0LjA0Myw1NCAzNC4wODYsNTMuOTk3IDM0LjEyOCw1My45OTIgQzM1LjM1Miw1My44MzMgMzYuOTA5LDUyLjg4NyAzOC4yNzIsNTIuMDEzIEwzOC41MzUsNTEuODQ1IEMzOC44MjQsNTEuNjYxIDM5LDUxLjM0MiAzOSw1MSBMMzksNDYuMjM2IEw0NC41NTksMzUuMTIgQzQ0LjgzMywzNC44MDEgNDUsMzQuNDM0IDQ1LDM0IEM0NSwzMS4zOSAzOS4zNjEsMzEgMzYsMzEgQzMyLjYzOSwzMSAyNywzMS4zOSAyNywzNCBDMjcsMzQuMzY2IDI3LjEyLDM0LjY4NCAyNy4zMiwzNC45NjcgTDMyLDQ2LjIgTDMyLDUzIEMzMiw1My41NTIgMzIuNDQ3LDU0IDMzLDU0IEwzMyw1NCBaIE02Miw1MyBDNjMuMTAzLDUzIDY0LDUzLjg5NyA2NCw1NSBDNjQsNTYuMTAzIDYzLjEwMyw1NyA2Miw1NyBDNjAuODk3LDU3IDYwLDU2LjEwMyA2MCw1NSBDNjAsNTMuODk3IDYwLjg5Nyw1MyA2Miw1MyBMNjIsNTMgWiBNNjIsMjMgQzYzLjEwMywyMyA2NCwyMy44OTcgNjQsMjUgQzY0LDI2LjEwMyA2My4xMDMsMjcgNjIsMjcgQzYwLjg5NywyNyA2MCwyNi4xMDMgNjAsMjUgQzYwLDIzLjg5NyA2MC44OTcsMjMgNjIsMjMgTDYyLDIzIFogTTY0LDM4IEM2NS4xMDMsMzggNjYsMzguODk3IDY2LDQwIEM2Niw0MS4xMDMgNjUuMTAzLDQyIDY0LDQyIEM2Mi44OTcsNDIgNjIsNDEuMTAzIDYyLDQwIEM2MiwzOC44OTcgNjIuODk3LDM4IDY0LDM4IEw2NCwzOCBaIE01NCw0MSBMNjAuMTQzLDQxIEM2MC41ODksNDIuNzIgNjIuMTQyLDQ0IDY0LDQ0IEM2Ni4yMDYsNDQgNjgsNDIuMjA2IDY4LDQwIEM2OCwzNy43OTQgNjYuMjA2LDM2IDY0LDM2IEM2Mi4xNDIsMzYgNjAuNTg5LDM3LjI4IDYwLjE0MywzOSBMNTQsMzkgTDU0LDI2IEw1OC4xNDMsMjYgQzU4LjU4OSwyNy43MiA2MC4xNDIsMjkgNjIsMjkgQzY0LjIwNiwyOSA2NiwyNy4yMDYgNjYsMjUgQzY2LDIyLjc5NCA2NC4yMDYsMjEgNjIsMjEgQzYwLjE0MiwyMSA1OC41ODksMjIuMjggNTguMTQzLDI0IEw1MywyNCBDNTIuNDQ3LDI0IDUyLDI0LjQ0OCA1MiwyNSBMNTIsMzkgTDQ1LDM5IEw0NSw0MSBMNTIsNDEgTDUyLDU1IEM1Miw1NS41NTIgNTIuNDQ3LDU2IDUzLDU2IEw1OC4xNDMsNTYgQzU4LjU4OSw1Ny43MiA2MC4xNDIsNTkgNjIsNTkgQzY0LjIwNiw1OSA2Niw1Ny4yMDYgNjYsNTUgQzY2LDUyLjc5NCA2NC4yMDYsNTEgNjIsNTEgQzYwLjE0Miw1MSA1OC41ODksNTIuMjggNTguMTQzLDU0IEw1NCw1NCBMNTQsNDEgWicKICAgICAgICAgICAgICBpZD0nQVdTLVNpbXBsZS1Ob3RpZmljYXRpb24tU2VydmljZV9JY29uXzY0X1NxdWlkJyBmaWxsPScjRkZGRkZGJz48L3BhdGg+CiAgICA8L2c+Cjwvc3ZnPg=="
+  }
+}
\ No newline at end of file
diff --git a/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-message-start-hybrid.json b/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-message-start-hybrid.json
new file mode 100644
index 0000000000..a56d7c6328
--- /dev/null
+++ b/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-message-start-hybrid.json
@@ -0,0 +1,208 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid SNS HTTPS Message Start Event Connector Subscription",
+  "id" : "io.camunda.connectors.inbound.AWSSNS.MessageStartEvent.v1-hybrid",
+  "description" : "Receive events from AWS SNS",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sns/?amazonsns=inbound",
+  "version" : 4,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:StartEvent" ],
+  "elementType" : {
+    "value" : "bpmn:StartEvent",
+    "eventDefinition" : "bpmn:MessageEventDefinition"
+  },
+  "groups" : [ {
+    "id" : "connectorType",
+    "label" : "Connector type"
+  }, {
+    "id" : "subscription",
+    "label" : "Subscription Configuration"
+  }, {
+    "id" : "activation",
+    "label" : "Activation"
+  }, {
+    "id" : "correlation",
+    "label" : "Correlation"
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  } ],
+  "properties" : [ {
+    "id" : "connectorType",
+    "value" : "io.camunda:aws-sns-webhook:1",
+    "group" : "connectorType",
+    "binding" : {
+      "name" : "inbound.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "inbound.context",
+    "label" : "Subscription ID",
+    "description" : "The subscription ID is a part of the URL endpoint",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "subscription",
+    "binding" : {
+      "name" : "inbound.context",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "inbound.securitySubscriptionAllowedFor",
+    "label" : "Allow to receive messages from topic(s)",
+    "description" : "Control which topic(s) is allowed to start a process",
+    "optional" : false,
+    "value" : "any",
+    "group" : "subscription",
+    "binding" : {
+      "name" : "inbound.securitySubscriptionAllowedFor",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Any",
+      "value" : "any"
+    }, {
+      "name" : "Specific topic(s)",
+      "value" : "specific"
+    } ]
+  }, {
+    "id" : "inbound.topicsAllowList",
+    "label" : "Topic ARN(s)",
+    "description" : "Topics that allow to publish messages",
+    "optional" : true,
+    "feel" : "optional",
+    "group" : "subscription",
+    "binding" : {
+      "name" : "inbound.topicsAllowList",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "inbound.securitySubscriptionAllowedFor",
+      "equals" : "specific",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "activationCondition",
+    "label" : "Activation condition",
+    "description" : "Condition under which the Connector triggers. Leave empty to catch all events",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "activation",
+    "binding" : {
+      "name" : "activationCondition",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "correlationRequired",
+    "label" : "Subprocess correlation required",
+    "description" : "Indicates whether correlation is required. This is needed for event-based subprocess message start events",
+    "value" : "notRequired",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationRequired",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Correlation not required",
+      "value" : "notRequired"
+    }, {
+      "name" : "Correlation required",
+      "value" : "required"
+    } ]
+  }, {
+    "id" : "correlationKeyProcess",
+    "label" : "Correlation key (process)",
+    "description" : "Sets up the correlation key from process variables",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKey",
+      "type" : "bpmn:Message#zeebe:subscription#property"
+    },
+    "condition" : {
+      "property" : "correlationRequired",
+      "equals" : "required",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "correlationKeyPayload",
+    "label" : "Correlation key (payload)",
+    "description" : "Extracts the correlation key from the incoming message payload",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKeyExpression",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "correlationRequired",
+      "equals" : "required",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageIdExpression",
+    "label" : "Message ID expression",
+    "description" : "Expression to extract unique identifier of a message",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "messageIdExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageNameUuid",
+    "generatedValue" : {
+      "type" : "uuid"
+    },
+    "group" : "correlation",
+    "binding" : {
+      "name" : "name",
+      "type" : "bpmn:Message#property"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultVariable",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "Text"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCA4MCA4MCcgdmVyc2lvbj0nMS4xJyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnCiAgICAgeG1sbnM6eGxpbms9J2h0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsnPjwhLS0gR2VuZXJhdG9yOiBTa2V0Y2ggNjQgKDkzNTM3KSAtIGh0dHBzOi8vc2tldGNoLmNvbSAtLT4KICAgIDx0aXRsZT5JY29uLUFyY2hpdGVjdHVyZS82NC9BcmNoX0FXUy1TaW1wbGUtTm90aWZpY2F0aW9uLVNlcnZpY2VfNjQ8L3RpdGxlPgogICAgPGRlc2M+Q3JlYXRlZCB3aXRoIFNrZXRjaC48L2Rlc2M+CiAgICA8ZGVmcz4KICAgICAgICA8bGluZWFyR3JhZGllbnQgeDE9JzAlJyB5MT0nMTAwJScgeDI9JzEwMCUnIHkyPScwJScgaWQ9J2xpbmVhckdyYWRpZW50LTEnPgogICAgICAgICAgICA8c3RvcCBzdG9wLWNvbG9yPScjQjAwODREJyBvZmZzZXQ9JzAlJz48L3N0b3A+CiAgICAgICAgICAgIDxzdG9wIHN0b3AtY29sb3I9JyNGRjRGOEInIG9mZnNldD0nMTAwJSc+PC9zdG9wPgogICAgICAgIDwvbGluZWFyR3JhZGllbnQ+CiAgICA8L2RlZnM+CiAgICA8ZyBpZD0nSWNvbi1BcmNoaXRlY3R1cmUvNjQvQXJjaF9BV1MtU2ltcGxlLU5vdGlmaWNhdGlvbi1TZXJ2aWNlXzY0JyBzdHJva2U9J25vbmUnIHN0cm9rZS13aWR0aD0nMScgZmlsbD0nbm9uZScKICAgICAgIGZpbGwtcnVsZT0nZXZlbm9kZCc+CiAgICAgICAgPGcgaWQ9J0ljb24tQXJjaGl0ZWN0dXJlLUJHLzY0L0FwcGxpY2F0aW9uLUludGVncmF0aW9uJyBmaWxsPSd1cmwoI2xpbmVhckdyYWRpZW50LTEpJz4KICAgICAgICAgICAgPHJlY3QgaWQ9J1JlY3RhbmdsZScgeD0nMCcgeT0nMCcgd2lkdGg9JzgwJyBoZWlnaHQ9JzgwJz48L3JlY3Q+CiAgICAgICAgPC9nPgogICAgICAgIDxwYXRoIGQ9J00xNywzOCBDMTguMTAzLDM4IDE5LDM4Ljg5NyAxOSw0MCBDMTksNDEuMTAzIDE4LjEwMyw0MiAxNyw0MiBDMTUuODk3LDQyIDE1LDQxLjEwMyAxNSw0MCBDMTUsMzguODk3IDE1Ljg5NywzOCAxNywzOCBMMTcsMzggWiBNNDEsNjQgQzI5LjMxNCw2NCAxOS4yODksNTUuNDY2IDE3LjE5NCw0My45OCBDMTguOTY1LDQzLjg5NCAyMC40MjcsNDIuNjU5IDIwLjg1Nyw0MSBMMjcsNDEgTDI3LDM5IEwyMC44NTcsMzkgQzIwLjQyNywzNy4zNDIgMTguOTY2LDM2LjEwNyAxNy4xOTUsMzYuMDIgQzE5LjI4NSwyNC43MSAyOS41MTEsMTYgNDEsMTYgQzQ1LjMxMywxNiA0OS44MzIsMTcuNjIyIDU0LjQyOSwyMC44MjEgTDU1LjU3MSwxOS4xNzkgQzUwLjYzMywxNS43NDMgNDUuNzMsMTQgNDEsMTQgQzI4LjI3LDE0IDE2Ljk0OSwyMy44NjUgMTUuMDYzLDM2LjUyMSBDMTMuODM5LDM3LjIwNyAxMywzOC41IDEzLDQwIEMxMyw0MS41IDEzLjgzOSw0Mi43OTMgMTUuMDYzLDQzLjQ3OCBDMTYuOTcsNTYuMzQxIDI4LjA1Niw2NiA0MSw2NiBDNDYuNDA3LDY2IDUxLjk0Miw2NC4xNTcgNTYuNTg1LDYwLjgxMSBMNTUuNDE1LDU5LjE4OSBDNTEuMTEsNjIuMjkyIDQ1Ljk5MSw2NCA0MSw2NCBMNDEsNjQgWiBNMzAuMTAxLDM2LjQ0MiBDMzEuOTU1LDM2Ljg5NSAzNC4yNzUsMzcgMzYsMzcgQzM3LjY0MiwzNyAzOS44MjMsMzYuOTA1IDQxLjYyOSwzNi41MDYgTDM3LjEwNSw0NS41NTMgQzM3LjAzNiw0NS42OTEgMzcsNDUuODQ1IDM3LDQ2IEwzNyw1MC40NTMgQzM2LjE5OSw1MC45NjQgMzQuODMzLDUxLjgxMiAzNCw1MS45ODYgTDM0LDQ2IEMzNCw0NS44NjggMzMuOTc0LDQ1LjczNyAzMy45MjMsNDUuNjE1IEwzMC4xMDEsMzYuNDQyIFogTTM2LDMzIEM0MC4wMjUsMzMgNDIuMTc0LDMzLjYwNCA0Mi44NDEsMzQgQzQyLjE3NCwzNC4zOTYgNDAuMDI1LDM1IDM2LDM1IEMzMS45NzUsMzUgMjkuODI2LDM0LjM5NiAyOS4xNTksMzQgQzI5LjgyNiwzMy42MDQgMzEuOTc1LDMzIDM2LDMzIEwzNiwzMyBaIE0zMyw1NCBMMzQsNTQgQzM0LjA0Myw1NCAzNC4wODYsNTMuOTk3IDM0LjEyOCw1My45OTIgQzM1LjM1Miw1My44MzMgMzYuOTA5LDUyLjg4NyAzOC4yNzIsNTIuMDEzIEwzOC41MzUsNTEuODQ1IEMzOC44MjQsNTEuNjYxIDM5LDUxLjM0MiAzOSw1MSBMMzksNDYuMjM2IEw0NC41NTksMzUuMTIgQzQ0LjgzMywzNC44MDEgNDUsMzQuNDM0IDQ1LDM0IEM0NSwzMS4zOSAzOS4zNjEsMzEgMzYsMzEgQzMyLjYzOSwzMSAyNywzMS4zOSAyNywzNCBDMjcsMzQuMzY2IDI3LjEyLDM0LjY4NCAyNy4zMiwzNC45NjcgTDMyLDQ2LjIgTDMyLDUzIEMzMiw1My41NTIgMzIuNDQ3LDU0IDMzLDU0IEwzMyw1NCBaIE02Miw1MyBDNjMuMTAzLDUzIDY0LDUzLjg5NyA2NCw1NSBDNjQsNTYuMTAzIDYzLjEwMyw1NyA2Miw1NyBDNjAuODk3LDU3IDYwLDU2LjEwMyA2MCw1NSBDNjAsNTMuODk3IDYwLjg5Nyw1MyA2Miw1MyBMNjIsNTMgWiBNNjIsMjMgQzYzLjEwMywyMyA2NCwyMy44OTcgNjQsMjUgQzY0LDI2LjEwMyA2My4xMDMsMjcgNjIsMjcgQzYwLjg5NywyNyA2MCwyNi4xMDMgNjAsMjUgQzYwLDIzLjg5NyA2MC44OTcsMjMgNjIsMjMgTDYyLDIzIFogTTY0LDM4IEM2NS4xMDMsMzggNjYsMzguODk3IDY2LDQwIEM2Niw0MS4xMDMgNjUuMTAzLDQyIDY0LDQyIEM2Mi44OTcsNDIgNjIsNDEuMTAzIDYyLDQwIEM2MiwzOC44OTcgNjIuODk3LDM4IDY0LDM4IEw2NCwzOCBaIE01NCw0MSBMNjAuMTQzLDQxIEM2MC41ODksNDIuNzIgNjIuMTQyLDQ0IDY0LDQ0IEM2Ni4yMDYsNDQgNjgsNDIuMjA2IDY4LDQwIEM2OCwzNy43OTQgNjYuMjA2LDM2IDY0LDM2IEM2Mi4xNDIsMzYgNjAuNTg5LDM3LjI4IDYwLjE0MywzOSBMNTQsMzkgTDU0LDI2IEw1OC4xNDMsMjYgQzU4LjU4OSwyNy43MiA2MC4xNDIsMjkgNjIsMjkgQzY0LjIwNiwyOSA2NiwyNy4yMDYgNjYsMjUgQzY2LDIyLjc5NCA2NC4yMDYsMjEgNjIsMjEgQzYwLjE0MiwyMSA1OC41ODksMjIuMjggNTguMTQzLDI0IEw1MywyNCBDNTIuNDQ3LDI0IDUyLDI0LjQ0OCA1MiwyNSBMNTIsMzkgTDQ1LDM5IEw0NSw0MSBMNTIsNDEgTDUyLDU1IEM1Miw1NS41NTIgNTIuNDQ3LDU2IDUzLDU2IEw1OC4xNDMsNTYgQzU4LjU4OSw1Ny43MiA2MC4xNDIsNTkgNjIsNTkgQzY0LjIwNiw1OSA2Niw1Ny4yMDYgNjYsNTUgQzY2LDUyLjc5NCA2NC4yMDYsNTEgNjIsNTEgQzYwLjE0Miw1MSA1OC41ODksNTIuMjggNTguMTQzLDU0IEw1NCw1NCBMNTQsNDEgWicKICAgICAgICAgICAgICBpZD0nQVdTLVNpbXBsZS1Ob3RpZmljYXRpb24tU2VydmljZV9JY29uXzY0X1NxdWlkJyBmaWxsPScjRkZGRkZGJz48L3BhdGg+CiAgICA8L2c+Cjwvc3ZnPg=="
+  }
+}
\ No newline at end of file
diff --git a/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-start-event-hybrid.json b/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-start-event-hybrid.json
new file mode 100644
index 0000000000..9658e3b5bd
--- /dev/null
+++ b/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-inbound-start-event-hybrid.json
@@ -0,0 +1,125 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid SNS HTTPS Start Event Connector",
+  "id" : "io.camunda.connectors.inbound.AWSSNS.StartEvent.v1-hybrid",
+  "description" : "Receive events from AWS SNS",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sns/?amazonsns=inbound",
+  "version" : 4,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:StartEvent" ],
+  "elementType" : {
+    "value" : "bpmn:StartEvent"
+  },
+  "groups" : [ {
+    "id" : "connectorType",
+    "label" : "Connector type"
+  }, {
+    "id" : "subscription",
+    "label" : "Subscription Configuration"
+  }, {
+    "id" : "activation",
+    "label" : "Activation"
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  } ],
+  "properties" : [ {
+    "id" : "connectorType",
+    "value" : "io.camunda:aws-sns-webhook:1",
+    "group" : "connectorType",
+    "binding" : {
+      "name" : "inbound.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "inbound.context",
+    "label" : "Subscription ID",
+    "description" : "The subscription ID is a part of the URL endpoint",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "subscription",
+    "binding" : {
+      "name" : "inbound.context",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "inbound.securitySubscriptionAllowedFor",
+    "label" : "Allow to receive messages from topic(s)",
+    "description" : "Control which topic(s) is allowed to start a process",
+    "optional" : false,
+    "value" : "any",
+    "group" : "subscription",
+    "binding" : {
+      "name" : "inbound.securitySubscriptionAllowedFor",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Any",
+      "value" : "any"
+    }, {
+      "name" : "Specific topic(s)",
+      "value" : "specific"
+    } ]
+  }, {
+    "id" : "inbound.topicsAllowList",
+    "label" : "Topic ARN(s)",
+    "description" : "Topics that allow to publish messages",
+    "optional" : true,
+    "feel" : "optional",
+    "group" : "subscription",
+    "binding" : {
+      "name" : "inbound.topicsAllowList",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "inbound.securitySubscriptionAllowedFor",
+      "equals" : "specific",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "activationCondition",
+    "label" : "Activation condition",
+    "description" : "Condition under which the Connector triggers. Leave empty to catch all events",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "activation",
+    "binding" : {
+      "name" : "activationCondition",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultVariable",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "Text"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCA4MCA4MCcgdmVyc2lvbj0nMS4xJyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnCiAgICAgeG1sbnM6eGxpbms9J2h0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsnPjwhLS0gR2VuZXJhdG9yOiBTa2V0Y2ggNjQgKDkzNTM3KSAtIGh0dHBzOi8vc2tldGNoLmNvbSAtLT4KICAgIDx0aXRsZT5JY29uLUFyY2hpdGVjdHVyZS82NC9BcmNoX0FXUy1TaW1wbGUtTm90aWZpY2F0aW9uLVNlcnZpY2VfNjQ8L3RpdGxlPgogICAgPGRlc2M+Q3JlYXRlZCB3aXRoIFNrZXRjaC48L2Rlc2M+CiAgICA8ZGVmcz4KICAgICAgICA8bGluZWFyR3JhZGllbnQgeDE9JzAlJyB5MT0nMTAwJScgeDI9JzEwMCUnIHkyPScwJScgaWQ9J2xpbmVhckdyYWRpZW50LTEnPgogICAgICAgICAgICA8c3RvcCBzdG9wLWNvbG9yPScjQjAwODREJyBvZmZzZXQ9JzAlJz48L3N0b3A+CiAgICAgICAgICAgIDxzdG9wIHN0b3AtY29sb3I9JyNGRjRGOEInIG9mZnNldD0nMTAwJSc+PC9zdG9wPgogICAgICAgIDwvbGluZWFyR3JhZGllbnQ+CiAgICA8L2RlZnM+CiAgICA8ZyBpZD0nSWNvbi1BcmNoaXRlY3R1cmUvNjQvQXJjaF9BV1MtU2ltcGxlLU5vdGlmaWNhdGlvbi1TZXJ2aWNlXzY0JyBzdHJva2U9J25vbmUnIHN0cm9rZS13aWR0aD0nMScgZmlsbD0nbm9uZScKICAgICAgIGZpbGwtcnVsZT0nZXZlbm9kZCc+CiAgICAgICAgPGcgaWQ9J0ljb24tQXJjaGl0ZWN0dXJlLUJHLzY0L0FwcGxpY2F0aW9uLUludGVncmF0aW9uJyBmaWxsPSd1cmwoI2xpbmVhckdyYWRpZW50LTEpJz4KICAgICAgICAgICAgPHJlY3QgaWQ9J1JlY3RhbmdsZScgeD0nMCcgeT0nMCcgd2lkdGg9JzgwJyBoZWlnaHQ9JzgwJz48L3JlY3Q+CiAgICAgICAgPC9nPgogICAgICAgIDxwYXRoIGQ9J00xNywzOCBDMTguMTAzLDM4IDE5LDM4Ljg5NyAxOSw0MCBDMTksNDEuMTAzIDE4LjEwMyw0MiAxNyw0MiBDMTUuODk3LDQyIDE1LDQxLjEwMyAxNSw0MCBDMTUsMzguODk3IDE1Ljg5NywzOCAxNywzOCBMMTcsMzggWiBNNDEsNjQgQzI5LjMxNCw2NCAxOS4yODksNTUuNDY2IDE3LjE5NCw0My45OCBDMTguOTY1LDQzLjg5NCAyMC40MjcsNDIuNjU5IDIwLjg1Nyw0MSBMMjcsNDEgTDI3LDM5IEwyMC44NTcsMzkgQzIwLjQyNywzNy4zNDIgMTguOTY2LDM2LjEwNyAxNy4xOTUsMzYuMDIgQzE5LjI4NSwyNC43MSAyOS41MTEsMTYgNDEsMTYgQzQ1LjMxMywxNiA0OS44MzIsMTcuNjIyIDU0LjQyOSwyMC44MjEgTDU1LjU3MSwxOS4xNzkgQzUwLjYzMywxNS43NDMgNDUuNzMsMTQgNDEsMTQgQzI4LjI3LDE0IDE2Ljk0OSwyMy44NjUgMTUuMDYzLDM2LjUyMSBDMTMuODM5LDM3LjIwNyAxMywzOC41IDEzLDQwIEMxMyw0MS41IDEzLjgzOSw0Mi43OTMgMTUuMDYzLDQzLjQ3OCBDMTYuOTcsNTYuMzQxIDI4LjA1Niw2NiA0MSw2NiBDNDYuNDA3LDY2IDUxLjk0Miw2NC4xNTcgNTYuNTg1LDYwLjgxMSBMNTUuNDE1LDU5LjE4OSBDNTEuMTEsNjIuMjkyIDQ1Ljk5MSw2NCA0MSw2NCBMNDEsNjQgWiBNMzAuMTAxLDM2LjQ0MiBDMzEuOTU1LDM2Ljg5NSAzNC4yNzUsMzcgMzYsMzcgQzM3LjY0MiwzNyAzOS44MjMsMzYuOTA1IDQxLjYyOSwzNi41MDYgTDM3LjEwNSw0NS41NTMgQzM3LjAzNiw0NS42OTEgMzcsNDUuODQ1IDM3LDQ2IEwzNyw1MC40NTMgQzM2LjE5OSw1MC45NjQgMzQuODMzLDUxLjgxMiAzNCw1MS45ODYgTDM0LDQ2IEMzNCw0NS44NjggMzMuOTc0LDQ1LjczNyAzMy45MjMsNDUuNjE1IEwzMC4xMDEsMzYuNDQyIFogTTM2LDMzIEM0MC4wMjUsMzMgNDIuMTc0LDMzLjYwNCA0Mi44NDEsMzQgQzQyLjE3NCwzNC4zOTYgNDAuMDI1LDM1IDM2LDM1IEMzMS45NzUsMzUgMjkuODI2LDM0LjM5NiAyOS4xNTksMzQgQzI5LjgyNiwzMy42MDQgMzEuOTc1LDMzIDM2LDMzIEwzNiwzMyBaIE0zMyw1NCBMMzQsNTQgQzM0LjA0Myw1NCAzNC4wODYsNTMuOTk3IDM0LjEyOCw1My45OTIgQzM1LjM1Miw1My44MzMgMzYuOTA5LDUyLjg4NyAzOC4yNzIsNTIuMDEzIEwzOC41MzUsNTEuODQ1IEMzOC44MjQsNTEuNjYxIDM5LDUxLjM0MiAzOSw1MSBMMzksNDYuMjM2IEw0NC41NTksMzUuMTIgQzQ0LjgzMywzNC44MDEgNDUsMzQuNDM0IDQ1LDM0IEM0NSwzMS4zOSAzOS4zNjEsMzEgMzYsMzEgQzMyLjYzOSwzMSAyNywzMS4zOSAyNywzNCBDMjcsMzQuMzY2IDI3LjEyLDM0LjY4NCAyNy4zMiwzNC45NjcgTDMyLDQ2LjIgTDMyLDUzIEMzMiw1My41NTIgMzIuNDQ3LDU0IDMzLDU0IEwzMyw1NCBaIE02Miw1MyBDNjMuMTAzLDUzIDY0LDUzLjg5NyA2NCw1NSBDNjQsNTYuMTAzIDYzLjEwMyw1NyA2Miw1NyBDNjAuODk3LDU3IDYwLDU2LjEwMyA2MCw1NSBDNjAsNTMuODk3IDYwLjg5Nyw1MyA2Miw1MyBMNjIsNTMgWiBNNjIsMjMgQzYzLjEwMywyMyA2NCwyMy44OTcgNjQsMjUgQzY0LDI2LjEwMyA2My4xMDMsMjcgNjIsMjcgQzYwLjg5NywyNyA2MCwyNi4xMDMgNjAsMjUgQzYwLDIzLjg5NyA2MC44OTcsMjMgNjIsMjMgTDYyLDIzIFogTTY0LDM4IEM2NS4xMDMsMzggNjYsMzguODk3IDY2LDQwIEM2Niw0MS4xMDMgNjUuMTAzLDQyIDY0LDQyIEM2Mi44OTcsNDIgNjIsNDEuMTAzIDYyLDQwIEM2MiwzOC44OTcgNjIuODk3LDM4IDY0LDM4IEw2NCwzOCBaIE01NCw0MSBMNjAuMTQzLDQxIEM2MC41ODksNDIuNzIgNjIuMTQyLDQ0IDY0LDQ0IEM2Ni4yMDYsNDQgNjgsNDIuMjA2IDY4LDQwIEM2OCwzNy43OTQgNjYuMjA2LDM2IDY0LDM2IEM2Mi4xNDIsMzYgNjAuNTg5LDM3LjI4IDYwLjE0MywzOSBMNTQsMzkgTDU0LDI2IEw1OC4xNDMsMjYgQzU4LjU4OSwyNy43MiA2MC4xNDIsMjkgNjIsMjkgQzY0LjIwNiwyOSA2NiwyNy4yMDYgNjYsMjUgQzY2LDIyLjc5NCA2NC4yMDYsMjEgNjIsMjEgQzYwLjE0MiwyMSA1OC41ODksMjIuMjggNTguMTQzLDI0IEw1MywyNCBDNTIuNDQ3LDI0IDUyLDI0LjQ0OCA1MiwyNSBMNTIsMzkgTDQ1LDM5IEw0NSw0MSBMNTIsNDEgTDUyLDU1IEM1Miw1NS41NTIgNTIuNDQ3LDU2IDUzLDU2IEw1OC4xNDMsNTYgQzU4LjU4OSw1Ny43MiA2MC4xNDIsNTkgNjIsNTkgQzY0LjIwNiw1OSA2Niw1Ny4yMDYgNjYsNTUgQzY2LDUyLjc5NCA2NC4yMDYsNTEgNjIsNTEgQzYwLjE0Miw1MSA1OC41ODksNTIuMjggNTguMTQzLDU0IEw1NCw1NCBMNTQsNDEgWicKICAgICAgICAgICAgICBpZD0nQVdTLVNpbXBsZS1Ob3RpZmljYXRpb24tU2VydmljZV9JY29uXzY0X1NxdWlkJyBmaWxsPScjRkZGRkZGJz48L3BhdGg+CiAgICA8L2c+Cjwvc3ZnPg=="
+  }
+}
\ No newline at end of file
diff --git a/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-outbound-connector-hybrid.json b/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-outbound-connector-hybrid.json
new file mode 100644
index 0000000000..642ace28ca
--- /dev/null
+++ b/connectors/aws/aws-sns/element-templates/hybrid/aws-sns-outbound-connector-hybrid.json
@@ -0,0 +1,301 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid Amazon SNS Outbound connector",
+  "id" : "io.camunda.connectors.AWSSNS.v1-hybrid",
+  "description" : "Send message to topic",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sns/?amazonsns=outbound",
+  "version" : 7,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:Task" ],
+  "elementType" : {
+    "value" : "bpmn:ServiceTask"
+  },
+  "groups" : [ {
+    "id" : "taskDefinitionType",
+    "label" : "Task definition type"
+  }, {
+    "id" : "authentication",
+    "label" : "Authentication"
+  }, {
+    "id" : "configuration",
+    "label" : "Topic properties"
+  }, {
+    "id" : "input",
+    "label" : "Input message data"
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  }, {
+    "id" : "error",
+    "label" : "Error handling"
+  }, {
+    "id" : "retries",
+    "label" : "Retries"
+  } ],
+  "properties" : [ {
+    "id" : "taskDefinitionType",
+    "value" : "io.camunda:aws-sns:1",
+    "group" : "taskDefinitionType",
+    "binding" : {
+      "property" : "type",
+      "type" : "zeebe:taskDefinition"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.type",
+    "label" : "Authentication",
+    "description" : "Specify AWS authentication strategy. Learn more at the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-lambda/#aws-authentication-types\" target=\"_blank\">documentation page</a>",
+    "value" : "credentials",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.type",
+      "type" : "zeebe:input"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Default Credentials Chain (Hybrid/Self-Managed only)",
+      "value" : "defaultCredentialsChain"
+    }, {
+      "name" : "Credentials",
+      "value" : "credentials"
+    } ]
+  }, {
+    "id" : "authentication.accessKey",
+    "label" : "Access key",
+    "description" : "Provide an IAM access key tailored to a user, equipped with the necessary permissions",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.accessKey",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.secretKey",
+    "label" : "Secret key",
+    "description" : "Provide a secret key of a user with permissions to invoke specified AWS Lambda function",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.secretKey",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "topic.topicArn",
+    "label" : "Topic ARN",
+    "description" : "Specify the topic you want to publish to",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "configuration",
+    "binding" : {
+      "name" : "topic.topicArn",
+      "type" : "zeebe:input"
+    },
+    "type" : "String"
+  }, {
+    "id" : "topic.type",
+    "label" : "Topic type",
+    "description" : "Select SNS topic type. Details at <a href=\"https://aws.amazon.com/sns/features/\">AWS SNS Features</a>",
+    "optional" : false,
+    "value" : "standard",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "configuration",
+    "binding" : {
+      "name" : "topic.type",
+      "type" : "zeebe:input"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Standard",
+      "value" : "standard"
+    }, {
+      "name" : "FIFO",
+      "value" : "fifo"
+    } ]
+  }, {
+    "id" : "configuration.region",
+    "label" : "Region",
+    "description" : "Specify the AWS region",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.region",
+      "type" : "zeebe:input"
+    },
+    "type" : "String"
+  }, {
+    "id" : "configuration.endpoint",
+    "label" : "Endpoint",
+    "description" : "Specify endpoint if need to use custom endpoint",
+    "optional" : true,
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.endpoint",
+      "type" : "zeebe:input"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "topic.messageGroupId",
+    "label" : "Message group ID",
+    "description" : "Message group ID (FIFO only). See also <a href=\"https://docs.aws.amazon.com/sns/latest/dg/fifo-message-grouping.html\">message grouping for FIFO topics</a> in the Amazon SNS developer guide",
+    "optional" : false,
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "topic.messageGroupId",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "topic.type",
+      "equals" : "fifo",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "topic.messageDeduplicationId",
+    "label" : "Message deduplication ID",
+    "description" : "Message deduplication ID. See also <a href=\"https://docs.aws.amazon.com/sns/latest/dg/fifo-message-dedup.html\">Message deduplication for FIFO topics</a> in the Amazon SNS developer guide",
+    "optional" : true,
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "topic.messageDeduplicationId",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "topic.type",
+      "equals" : "fifo",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "topic.subject",
+    "label" : "Subject",
+    "description" : "Specify the subject of the message you want to publish in the SNS topic",
+    "optional" : true,
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "topic.subject",
+      "type" : "zeebe:input"
+    },
+    "type" : "String"
+  }, {
+    "id" : "topic.message",
+    "label" : "Message",
+    "description" : "Data to publish in the SNS topic",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "topic.message",
+      "type" : "zeebe:input"
+    },
+    "type" : "Text"
+  }, {
+    "id" : "topic.messageAttributes",
+    "label" : "messageAttributes",
+    "description" : "Message attributes metadata",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "input",
+    "binding" : {
+      "name" : "topic.messageAttributes",
+      "type" : "zeebe:input"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "key" : "resultVariable",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "key" : "resultExpression",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "Text"
+  }, {
+    "id" : "errorExpression",
+    "label" : "Error expression",
+    "description" : "Expression to handle errors. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/\" target=\"_blank\">documentation</a>.",
+    "feel" : "required",
+    "group" : "error",
+    "binding" : {
+      "key" : "errorExpression",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "Text"
+  }, {
+    "id" : "retryCount",
+    "label" : "Retries",
+    "description" : "Number of retries",
+    "value" : "3",
+    "feel" : "optional",
+    "group" : "retries",
+    "binding" : {
+      "property" : "retries",
+      "type" : "zeebe:taskDefinition"
+    },
+    "type" : "String"
+  }, {
+    "id" : "retryBackoff",
+    "label" : "Retry backoff",
+    "description" : "ISO-8601 duration to wait between retries",
+    "value" : "PT0S",
+    "feel" : "optional",
+    "group" : "retries",
+    "binding" : {
+      "key" : "retryBackoff",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "String"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCA4MCA4MCcgdmVyc2lvbj0nMS4xJyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnCiAgICAgeG1sbnM6eGxpbms9J2h0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsnPjwhLS0gR2VuZXJhdG9yOiBTa2V0Y2ggNjQgKDkzNTM3KSAtIGh0dHBzOi8vc2tldGNoLmNvbSAtLT4KICAgIDx0aXRsZT5JY29uLUFyY2hpdGVjdHVyZS82NC9BcmNoX0FXUy1TaW1wbGUtTm90aWZpY2F0aW9uLVNlcnZpY2VfNjQ8L3RpdGxlPgogICAgPGRlc2M+Q3JlYXRlZCB3aXRoIFNrZXRjaC48L2Rlc2M+CiAgICA8ZGVmcz4KICAgICAgICA8bGluZWFyR3JhZGllbnQgeDE9JzAlJyB5MT0nMTAwJScgeDI9JzEwMCUnIHkyPScwJScgaWQ9J2xpbmVhckdyYWRpZW50LTEnPgogICAgICAgICAgICA8c3RvcCBzdG9wLWNvbG9yPScjQjAwODREJyBvZmZzZXQ9JzAlJz48L3N0b3A+CiAgICAgICAgICAgIDxzdG9wIHN0b3AtY29sb3I9JyNGRjRGOEInIG9mZnNldD0nMTAwJSc+PC9zdG9wPgogICAgICAgIDwvbGluZWFyR3JhZGllbnQ+CiAgICA8L2RlZnM+CiAgICA8ZyBpZD0nSWNvbi1BcmNoaXRlY3R1cmUvNjQvQXJjaF9BV1MtU2ltcGxlLU5vdGlmaWNhdGlvbi1TZXJ2aWNlXzY0JyBzdHJva2U9J25vbmUnIHN0cm9rZS13aWR0aD0nMScgZmlsbD0nbm9uZScKICAgICAgIGZpbGwtcnVsZT0nZXZlbm9kZCc+CiAgICAgICAgPGcgaWQ9J0ljb24tQXJjaGl0ZWN0dXJlLUJHLzY0L0FwcGxpY2F0aW9uLUludGVncmF0aW9uJyBmaWxsPSd1cmwoI2xpbmVhckdyYWRpZW50LTEpJz4KICAgICAgICAgICAgPHJlY3QgaWQ9J1JlY3RhbmdsZScgeD0nMCcgeT0nMCcgd2lkdGg9JzgwJyBoZWlnaHQ9JzgwJz48L3JlY3Q+CiAgICAgICAgPC9nPgogICAgICAgIDxwYXRoIGQ9J00xNywzOCBDMTguMTAzLDM4IDE5LDM4Ljg5NyAxOSw0MCBDMTksNDEuMTAzIDE4LjEwMyw0MiAxNyw0MiBDMTUuODk3LDQyIDE1LDQxLjEwMyAxNSw0MCBDMTUsMzguODk3IDE1Ljg5NywzOCAxNywzOCBMMTcsMzggWiBNNDEsNjQgQzI5LjMxNCw2NCAxOS4yODksNTUuNDY2IDE3LjE5NCw0My45OCBDMTguOTY1LDQzLjg5NCAyMC40MjcsNDIuNjU5IDIwLjg1Nyw0MSBMMjcsNDEgTDI3LDM5IEwyMC44NTcsMzkgQzIwLjQyNywzNy4zNDIgMTguOTY2LDM2LjEwNyAxNy4xOTUsMzYuMDIgQzE5LjI4NSwyNC43MSAyOS41MTEsMTYgNDEsMTYgQzQ1LjMxMywxNiA0OS44MzIsMTcuNjIyIDU0LjQyOSwyMC44MjEgTDU1LjU3MSwxOS4xNzkgQzUwLjYzMywxNS43NDMgNDUuNzMsMTQgNDEsMTQgQzI4LjI3LDE0IDE2Ljk0OSwyMy44NjUgMTUuMDYzLDM2LjUyMSBDMTMuODM5LDM3LjIwNyAxMywzOC41IDEzLDQwIEMxMyw0MS41IDEzLjgzOSw0Mi43OTMgMTUuMDYzLDQzLjQ3OCBDMTYuOTcsNTYuMzQxIDI4LjA1Niw2NiA0MSw2NiBDNDYuNDA3LDY2IDUxLjk0Miw2NC4xNTcgNTYuNTg1LDYwLjgxMSBMNTUuNDE1LDU5LjE4OSBDNTEuMTEsNjIuMjkyIDQ1Ljk5MSw2NCA0MSw2NCBMNDEsNjQgWiBNMzAuMTAxLDM2LjQ0MiBDMzEuOTU1LDM2Ljg5NSAzNC4yNzUsMzcgMzYsMzcgQzM3LjY0MiwzNyAzOS44MjMsMzYuOTA1IDQxLjYyOSwzNi41MDYgTDM3LjEwNSw0NS41NTMgQzM3LjAzNiw0NS42OTEgMzcsNDUuODQ1IDM3LDQ2IEwzNyw1MC40NTMgQzM2LjE5OSw1MC45NjQgMzQuODMzLDUxLjgxMiAzNCw1MS45ODYgTDM0LDQ2IEMzNCw0NS44NjggMzMuOTc0LDQ1LjczNyAzMy45MjMsNDUuNjE1IEwzMC4xMDEsMzYuNDQyIFogTTM2LDMzIEM0MC4wMjUsMzMgNDIuMTc0LDMzLjYwNCA0Mi44NDEsMzQgQzQyLjE3NCwzNC4zOTYgNDAuMDI1LDM1IDM2LDM1IEMzMS45NzUsMzUgMjkuODI2LDM0LjM5NiAyOS4xNTksMzQgQzI5LjgyNiwzMy42MDQgMzEuOTc1LDMzIDM2LDMzIEwzNiwzMyBaIE0zMyw1NCBMMzQsNTQgQzM0LjA0Myw1NCAzNC4wODYsNTMuOTk3IDM0LjEyOCw1My45OTIgQzM1LjM1Miw1My44MzMgMzYuOTA5LDUyLjg4NyAzOC4yNzIsNTIuMDEzIEwzOC41MzUsNTEuODQ1IEMzOC44MjQsNTEuNjYxIDM5LDUxLjM0MiAzOSw1MSBMMzksNDYuMjM2IEw0NC41NTksMzUuMTIgQzQ0LjgzMywzNC44MDEgNDUsMzQuNDM0IDQ1LDM0IEM0NSwzMS4zOSAzOS4zNjEsMzEgMzYsMzEgQzMyLjYzOSwzMSAyNywzMS4zOSAyNywzNCBDMjcsMzQuMzY2IDI3LjEyLDM0LjY4NCAyNy4zMiwzNC45NjcgTDMyLDQ2LjIgTDMyLDUzIEMzMiw1My41NTIgMzIuNDQ3LDU0IDMzLDU0IEwzMyw1NCBaIE02Miw1MyBDNjMuMTAzLDUzIDY0LDUzLjg5NyA2NCw1NSBDNjQsNTYuMTAzIDYzLjEwMyw1NyA2Miw1NyBDNjAuODk3LDU3IDYwLDU2LjEwMyA2MCw1NSBDNjAsNTMuODk3IDYwLjg5Nyw1MyA2Miw1MyBMNjIsNTMgWiBNNjIsMjMgQzYzLjEwMywyMyA2NCwyMy44OTcgNjQsMjUgQzY0LDI2LjEwMyA2My4xMDMsMjcgNjIsMjcgQzYwLjg5NywyNyA2MCwyNi4xMDMgNjAsMjUgQzYwLDIzLjg5NyA2MC44OTcsMjMgNjIsMjMgTDYyLDIzIFogTTY0LDM4IEM2NS4xMDMsMzggNjYsMzguODk3IDY2LDQwIEM2Niw0MS4xMDMgNjUuMTAzLDQyIDY0LDQyIEM2Mi44OTcsNDIgNjIsNDEuMTAzIDYyLDQwIEM2MiwzOC44OTcgNjIuODk3LDM4IDY0LDM4IEw2NCwzOCBaIE01NCw0MSBMNjAuMTQzLDQxIEM2MC41ODksNDIuNzIgNjIuMTQyLDQ0IDY0LDQ0IEM2Ni4yMDYsNDQgNjgsNDIuMjA2IDY4LDQwIEM2OCwzNy43OTQgNjYuMjA2LDM2IDY0LDM2IEM2Mi4xNDIsMzYgNjAuNTg5LDM3LjI4IDYwLjE0MywzOSBMNTQsMzkgTDU0LDI2IEw1OC4xNDMsMjYgQzU4LjU4OSwyNy43MiA2MC4xNDIsMjkgNjIsMjkgQzY0LjIwNiwyOSA2NiwyNy4yMDYgNjYsMjUgQzY2LDIyLjc5NCA2NC4yMDYsMjEgNjIsMjEgQzYwLjE0MiwyMSA1OC41ODksMjIuMjggNTguMTQzLDI0IEw1MywyNCBDNTIuNDQ3LDI0IDUyLDI0LjQ0OCA1MiwyNSBMNTIsMzkgTDQ1LDM5IEw0NSw0MSBMNTIsNDEgTDUyLDU1IEM1Miw1NS41NTIgNTIuNDQ3LDU2IDUzLDU2IEw1OC4xNDMsNTYgQzU4LjU4OSw1Ny43MiA2MC4xNDIsNTkgNjIsNTkgQzY0LjIwNiw1OSA2Niw1Ny4yMDYgNjYsNTUgQzY2LDUyLjc5NCA2NC4yMDYsNTEgNjIsNTEgQzYwLjE0Miw1MSA1OC41ODksNTIuMjggNTguMTQzLDU0IEw1NCw1NCBMNTQsNDEgWicKICAgICAgICAgICAgICBpZD0nQVdTLVNpbXBsZS1Ob3RpZmljYXRpb24tU2VydmljZV9JY29uXzY0X1NxdWlkJyBmaWxsPScjRkZGRkZGJz48L3BhdGg+CiAgICA8L2c+Cjwvc3ZnPg=="
+  }
+}
\ No newline at end of file
diff --git a/connectors/aws/aws-sns/pom.xml b/connectors/aws/aws-sns/pom.xml
index dbc8011a6e..4a446b4cf4 100644
--- a/connectors/aws/aws-sns/pom.xml
+++ b/connectors/aws/aws-sns/pom.xml
@@ -65,6 +65,7 @@ except in compliance with the proprietary license.</license.inlineheader>
                   <templateFileName>aws-sns-outbound-connector.json</templateFileName>
                 </file>
               </files>
+              <generateHybridTemplates>true</generateHybridTemplates>
             </connector>
             <connector>
               <connectorClass>io.camunda.connector.sns.inbound.SnsWebhookExecutable</connectorClass>
@@ -86,6 +87,7 @@ except in compliance with the proprietary license.</license.inlineheader>
                   <templateFileName>aws-sns-inbound-boundary.json</templateFileName>
                 </file>
               </files>
+              <generateHybridTemplates>true</generateHybridTemplates>
             </connector>
           </connectors>
           <includeDependencies>
diff --git a/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-boundary-connector-hybrid.json b/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-boundary-connector-hybrid.json
new file mode 100644
index 0000000000..dd4e91502d
--- /dev/null
+++ b/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-boundary-connector-hybrid.json
@@ -0,0 +1,279 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid Amazon SQS Boundary Event Connector",
+  "id" : "io.camunda.connectors.AWSSQS.boundary.v1-hybrid",
+  "description" : "Receive message from a queue",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound",
+  "version" : 9,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:BoundaryEvent" ],
+  "elementType" : {
+    "value" : "bpmn:BoundaryEvent",
+    "eventDefinition" : "bpmn:MessageEventDefinition"
+  },
+  "groups" : [ {
+    "id" : "connectorType",
+    "label" : "Connector type"
+  }, {
+    "id" : "authentication",
+    "label" : "Authentication"
+  }, {
+    "id" : "configuration",
+    "label" : "Configuration"
+  }, {
+    "id" : "queueProperties",
+    "label" : "Queue properties"
+  }, {
+    "id" : "messagePollingProperties",
+    "label" : "Message polling properties"
+  }, {
+    "id" : "input",
+    "label" : "Use next attribute names for activation condition"
+  }, {
+    "id" : "activation",
+    "label" : "Activation"
+  }, {
+    "id" : "correlation",
+    "label" : "Correlation"
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  } ],
+  "properties" : [ {
+    "id" : "connectorType",
+    "value" : "io.camunda:aws-sqs-inbound:1",
+    "group" : "connectorType",
+    "binding" : {
+      "name" : "inbound.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.type",
+    "label" : "Authentication",
+    "description" : "Specify AWS authentication strategy. Learn more at the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-lambda/#aws-authentication-types\" target=\"_blank\">documentation page</a>",
+    "value" : "credentials",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Default Credentials Chain (Hybrid/Self-Managed only)",
+      "value" : "defaultCredentialsChain"
+    }, {
+      "name" : "Credentials",
+      "value" : "credentials"
+    } ]
+  }, {
+    "id" : "authentication.accessKey",
+    "label" : "Access key",
+    "description" : "Provide an IAM access key tailored to a user, equipped with the necessary permissions",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.accessKey",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.secretKey",
+    "label" : "Secret key",
+    "description" : "Provide a secret key of a user with permissions to invoke specified AWS Lambda function",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.secretKey",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "configuration.region",
+    "label" : "Region",
+    "description" : "Specify the AWS region",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.region",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "configuration.endpoint",
+    "label" : "Endpoint",
+    "description" : "Specify endpoint if need to use custom endpoint",
+    "optional" : true,
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.endpoint",
+      "type" : "zeebe:property"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "queue.queue.url",
+    "label" : "Queue URL",
+    "description" : "Specify the URL of the SQS queue where you would like to subscribe to",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "queueProperties",
+    "binding" : {
+      "name" : "queue.url",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queue.queue.pollingWaitTime",
+    "label" : "Polling wait time",
+    "description" : "The duration (in seconds) for which the call waits for a message to arrive in the queue before returning. See <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound\" target=\"_blank\">documentation</a> for details",
+    "optional" : false,
+    "value" : "20",
+    "constraints" : {
+      "notEmpty" : true,
+      "pattern" : {
+        "value" : "^([0-9]?|1[0-9]|20|secrets\\..+)$"
+      }
+    },
+    "group" : "messagePollingProperties",
+    "binding" : {
+      "name" : "queue.pollingWaitTime",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queue.queue.attributeNames",
+    "label" : "Attribute names",
+    "description" : "Array of queue attribute names. See <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound\" target=\"_blank\">documentation</a> for details",
+    "optional" : false,
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "queue.attributeNames",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queue.queue.messageAttributeNames",
+    "label" : "Message attribute names",
+    "description" : "Array of message attribute names. See <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound\" target=\"_blank\">documentation</a> for details",
+    "optional" : false,
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "queue.messageAttributeNames",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "activationCondition",
+    "label" : "Activation condition",
+    "description" : "Condition under which the Connector triggers. Leave empty to catch all events",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "activation",
+    "binding" : {
+      "name" : "activationCondition",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "correlationKeyProcess",
+    "label" : "Correlation key (process)",
+    "description" : "Sets up the correlation key from process variables",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKey",
+      "type" : "bpmn:Message#zeebe:subscription#property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "correlationKeyPayload",
+    "label" : "Correlation key (payload)",
+    "description" : "Extracts the correlation key from the incoming message payload",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKeyExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageIdExpression",
+    "label" : "Message ID expression",
+    "description" : "Expression to extract unique identifier of a message",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "messageIdExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageNameUuid",
+    "generatedValue" : {
+      "type" : "uuid"
+    },
+    "group" : "correlation",
+    "binding" : {
+      "name" : "name",
+      "type" : "bpmn:Message#property"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultVariable",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "Text"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,<svg width='18' height='18' viewBox='0 0 40 40' version='1.1' xmlns='http://www.w3.org/2000/svg'
     xmlns:xlink='http://www.w3.org/1999/xlink'><!-- Generator: Sketch 64 (93537) - https://sketch.com -->
    <title>Icon-Architecture/32/Arch_AWS-Simple-Queue-Service_32</title>
    <desc>Created with Sketch.</desc>
    <defs>
        <linearGradient x1='0%' y1='100%' x2='100%' y2='0%' id='linearGradient-1'>
            <stop stop-color='#B0084D' offset='0%'></stop>
            <stop stop-color='#FF4F8B' offset='100%'></stop>
        </linearGradient>
    </defs>
    <g id='Icon-Architecture/32/Arch_AWS-Simple-Queue-Service_32' stroke='none' stroke-width='1' fill='none'
       fill-rule='evenodd'>
        <g id='Icon-Architecture-BG/32/Application-Integration' fill='url(#linearGradient-1)'>
            <rect id='Rectangle' x='0' y='0' width='40' height='40'></rect>
        </g>
        <path d='M14.3422051,22.3493786 L15.8466767,20.9061074 C15.9428347,20.8141539 15.9969235,20.687218 15.9999285,20.5552846 C16.0019317,20.4223517 15.9518495,20.2934168 15.8596981,20.1984648 L14.3552264,18.6432502 L13.6350433,19.3378994 L14.311154,20.037546 L11.9913429,20.037546 L11.9913429,21.0370413 L14.2650783,21.0370413 L13.6480647,21.6287425 L14.3422051,22.3493786 Z M26.3579452,22.3533765 L27.9074909,20.9001104 C28.0066538,20.8081569 28.0627459,20.679222 28.0647492,20.5442901 C28.0667525,20.4093583 28.0136653,20.2784244 27.918509,20.1834724 L26.3689633,18.6372532 L25.6607999,19.3438963 L26.3549403,20.037546 L24.0110896,20.037546 L24.0110896,21.0370413 L26.2988481,21.0370413 L25.671818,21.6247445 L26.3579452,22.3533765 Z M17.5875367,23.3608678 C18.3387708,23.0570212 19.1621235,22.8941035 20.0045074,22.8941035 C20.8468913,22.8941035 21.670244,23.0570212 22.4214781,23.3608678 C21.7523789,21.5897622 21.7523789,19.3898731 22.4214781,17.6187675 C20.9190098,18.2264606 19.090005,18.2264606 17.5875367,17.6187675 C18.2566359,19.3898731 18.2566359,21.5897622 17.5875367,23.3608678 L17.5875367,23.3608678 Z M15.6443443,25.3408679 C15.546183,25.2439168 15.4971024,25.1159814 15.4971024,24.988046 C15.4971024,24.8601106 15.546183,24.7321753 15.6443443,24.6342247 C17.5845317,22.6982024 17.5845317,18.2824324 15.6443443,16.3454106 C15.546183,16.2484595 15.4971024,16.1205241 15.4971024,15.9925912 C15.4971024,15.8646534 15.546183,15.736718 15.6443443,15.6387674 C15.8396652,15.4438659 16.1571868,15.4438659 16.3525077,15.6387674 C17.2740216,16.5583031 18.6052086,17.0860366 20.0045074,17.0860366 C21.4048079,17.0860366 22.7359948,16.5583031 23.6575088,15.6387674 C23.8528296,15.4438659 24.1703513,15.4438659 24.3656722,15.6387674 C24.4628318,15.736718 24.5119124,15.8646534 24.5119124,15.9925912 C24.5119124,16.1205241 24.4628318,16.2484595 24.3656722,16.3454106 C22.4244831,18.2824324 22.4244831,22.6982024 24.3656722,24.6342247 C24.4628318,24.7321753 24.5119124,24.8601106 24.5119124,24.988046 C24.5119124,25.1159814 24.4628318,25.2439168 24.3656722,25.3408679 C24.2675109,25.4388184 24.1393003,25.4877937 24.0110896,25.4877937 C23.882879,25.4877937 23.7546684,25.4388184 23.6575088,25.3408679 C22.7359948,24.4213322 21.4048079,23.8935987 20.0045074,23.8935987 C18.6052086,23.8935987 17.2740216,24.4213322 16.3525077,25.3408679 C16.1571868,25.5357694 15.8396652,25.5357694 15.6443443,25.3408679 L15.6443443,25.3408679 Z M32.5421049,19.4358499 C32.236603,19.1320033 31.8369464,18.9800801 31.4362882,18.9800801 C31.0366316,18.9800801 30.636975,19.1320033 30.3314731,19.4358499 C29.721471,20.0445425 29.721471,21.0340428 30.3314731,21.6417359 C30.9414753,22.2504285 31.9321027,22.2504285 32.5421049,21.6417359 C33.1511054,21.0340428 33.1511054,20.0445425 32.5421049,19.4358499 L32.5421049,19.4358499 Z M33.2502683,22.3493786 C32.7504472,22.8481267 32.0933677,23.0980005 31.4362882,23.0980005 C30.7802103,23.0980005 30.1231309,22.8481267 29.6233097,22.3493786 C28.6236675,21.3508828 28.6236675,19.7277025 29.6233097,18.7292068 C30.622952,17.7317105 32.250626,17.7317105 33.2502683,18.7292068 C34.2499106,19.7277025 34.2499106,21.3508828 33.2502683,22.3493786 L33.2502683,22.3493786 Z M9.66852687,19.4468443 C9.36302497,19.1429978 8.96336839,18.9910745 8.56271017,18.9910745 C8.16305359,18.9910745 7.76339701,19.1429978 7.45789511,19.4468443 C6.84889461,20.055537 6.84889461,21.0450373 7.45789511,21.6527304 C8.06789726,22.261423 9.05852472,22.261423 9.66852687,21.6527304 C10.2775274,21.0450373 10.2775274,20.055537 9.66852687,19.4468443 L9.66852687,19.4468443 Z M10.3766903,22.3593735 C9.87686914,22.8581217 9.21978965,23.1079955 8.56271017,23.1079955 C7.90663232,23.1079955 7.24955284,22.8581217 6.7497317,22.3593735 C5.75008943,21.3618773 5.75008943,19.738697 6.7497317,18.7402012 C7.74937397,17.7427049 9.37704801,17.7427049 10.3766903,18.7402012 C11.3763325,19.738697 11.3763325,21.3618773 10.3766903,22.3593735 L10.3766903,22.3593735 Z M27.4337125,28.9100654 C25.4364313,30.903059 22.7820705,32.0005047 19.9574301,32.0005047 C17.1327896,32.0005047 14.4784288,30.903059 12.4821492,28.9100654 C11.165987,27.5977281 10.4077413,26.469298 9.94498104,25.1359713 L8.99842599,25.4628063 C9.50726193,26.9290658 10.3626672,28.2104187 11.7739858,29.6167086 C13.9585748,31.7986067 16.8663519,33 19.9574301,33 C23.0495099,33 25.9562853,31.7986067 28.1418759,29.6167086 C29.2827502,28.4782835 30.4206196,27.1869356 31.0115905,25.4608073 L30.0640338,25.1379703 C29.5391715,26.6701966 28.4894469,27.8565974 27.4337125,28.9100654 L27.4337125,28.9100654 Z M9.94498104,15.8596559 L8.99842599,15.5318214 C9.51026687,14.0645624 10.3656722,12.7832095 11.7759891,11.3759202 C16.2863991,6.87519304 23.6264578,6.87419354 28.1378694,11.3759202 C29.2186449,12.4533761 30.4035916,13.7897012 31.0115905,15.5318214 L30.0640338,15.8596559 C29.5241468,14.3094387 28.4293482,13.0800596 27.4297059,12.0825633 C25.434428,10.0915688 22.7810689,8.99612197 19.9574301,8.99612197 C17.1337912,8.99612197 14.4804321,10.0915688 12.4851542,12.0825633 C11.1870215,13.3779092 10.4037347,14.5423211 9.94498104,15.8596559 L9.94498104,15.8596559 Z'
              id='AWS-Simple-Queue-Service_Icon_32_Squid' fill='#FFFFFF'></path>
    </g>
</svg>"
+  }
+}
\ No newline at end of file
diff --git a/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-inbound-intermediate-connector-hybrid.json b/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-inbound-intermediate-connector-hybrid.json
new file mode 100644
index 0000000000..90123ead69
--- /dev/null
+++ b/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-inbound-intermediate-connector-hybrid.json
@@ -0,0 +1,279 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid Amazon SQS Intermediate Message Catch Event connector",
+  "id" : "io.camunda.connectors.AWSSQS.intermediate.v1-hybrid",
+  "description" : "Receive message from a queue",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound",
+  "version" : 9,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:IntermediateCatchEvent", "bpmn:IntermediateThrowEvent" ],
+  "elementType" : {
+    "value" : "bpmn:IntermediateCatchEvent",
+    "eventDefinition" : "bpmn:MessageEventDefinition"
+  },
+  "groups" : [ {
+    "id" : "connectorType",
+    "label" : "Connector type"
+  }, {
+    "id" : "authentication",
+    "label" : "Authentication"
+  }, {
+    "id" : "configuration",
+    "label" : "Configuration"
+  }, {
+    "id" : "queueProperties",
+    "label" : "Queue properties"
+  }, {
+    "id" : "messagePollingProperties",
+    "label" : "Message polling properties"
+  }, {
+    "id" : "input",
+    "label" : "Use next attribute names for activation condition"
+  }, {
+    "id" : "activation",
+    "label" : "Activation"
+  }, {
+    "id" : "correlation",
+    "label" : "Correlation"
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  } ],
+  "properties" : [ {
+    "id" : "connectorType",
+    "value" : "io.camunda:aws-sqs-inbound:1",
+    "group" : "connectorType",
+    "binding" : {
+      "name" : "inbound.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.type",
+    "label" : "Authentication",
+    "description" : "Specify AWS authentication strategy. Learn more at the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-lambda/#aws-authentication-types\" target=\"_blank\">documentation page</a>",
+    "value" : "credentials",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Default Credentials Chain (Hybrid/Self-Managed only)",
+      "value" : "defaultCredentialsChain"
+    }, {
+      "name" : "Credentials",
+      "value" : "credentials"
+    } ]
+  }, {
+    "id" : "authentication.accessKey",
+    "label" : "Access key",
+    "description" : "Provide an IAM access key tailored to a user, equipped with the necessary permissions",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.accessKey",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.secretKey",
+    "label" : "Secret key",
+    "description" : "Provide a secret key of a user with permissions to invoke specified AWS Lambda function",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.secretKey",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "configuration.region",
+    "label" : "Region",
+    "description" : "Specify the AWS region",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.region",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "configuration.endpoint",
+    "label" : "Endpoint",
+    "description" : "Specify endpoint if need to use custom endpoint",
+    "optional" : true,
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.endpoint",
+      "type" : "zeebe:property"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "queue.queue.url",
+    "label" : "Queue URL",
+    "description" : "Specify the URL of the SQS queue where you would like to subscribe to",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "queueProperties",
+    "binding" : {
+      "name" : "queue.url",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queue.queue.pollingWaitTime",
+    "label" : "Polling wait time",
+    "description" : "The duration (in seconds) for which the call waits for a message to arrive in the queue before returning. See <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound\" target=\"_blank\">documentation</a> for details",
+    "optional" : false,
+    "value" : "20",
+    "constraints" : {
+      "notEmpty" : true,
+      "pattern" : {
+        "value" : "^([0-9]?|1[0-9]|20|secrets\\..+)$"
+      }
+    },
+    "group" : "messagePollingProperties",
+    "binding" : {
+      "name" : "queue.pollingWaitTime",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queue.queue.attributeNames",
+    "label" : "Attribute names",
+    "description" : "Array of queue attribute names. See <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound\" target=\"_blank\">documentation</a> for details",
+    "optional" : false,
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "queue.attributeNames",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queue.queue.messageAttributeNames",
+    "label" : "Message attribute names",
+    "description" : "Array of message attribute names. See <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound\" target=\"_blank\">documentation</a> for details",
+    "optional" : false,
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "queue.messageAttributeNames",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "activationCondition",
+    "label" : "Activation condition",
+    "description" : "Condition under which the Connector triggers. Leave empty to catch all events",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "activation",
+    "binding" : {
+      "name" : "activationCondition",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "correlationKeyProcess",
+    "label" : "Correlation key (process)",
+    "description" : "Sets up the correlation key from process variables",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKey",
+      "type" : "bpmn:Message#zeebe:subscription#property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "correlationKeyPayload",
+    "label" : "Correlation key (payload)",
+    "description" : "Extracts the correlation key from the incoming message payload",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKeyExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageIdExpression",
+    "label" : "Message ID expression",
+    "description" : "Expression to extract unique identifier of a message",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "messageIdExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageNameUuid",
+    "generatedValue" : {
+      "type" : "uuid"
+    },
+    "group" : "correlation",
+    "binding" : {
+      "name" : "name",
+      "type" : "bpmn:Message#property"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultVariable",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "Text"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,<svg width='18' height='18' viewBox='0 0 40 40' version='1.1' xmlns='http://www.w3.org/2000/svg'
     xmlns:xlink='http://www.w3.org/1999/xlink'><!-- Generator: Sketch 64 (93537) - https://sketch.com -->
    <title>Icon-Architecture/32/Arch_AWS-Simple-Queue-Service_32</title>
    <desc>Created with Sketch.</desc>
    <defs>
        <linearGradient x1='0%' y1='100%' x2='100%' y2='0%' id='linearGradient-1'>
            <stop stop-color='#B0084D' offset='0%'></stop>
            <stop stop-color='#FF4F8B' offset='100%'></stop>
        </linearGradient>
    </defs>
    <g id='Icon-Architecture/32/Arch_AWS-Simple-Queue-Service_32' stroke='none' stroke-width='1' fill='none'
       fill-rule='evenodd'>
        <g id='Icon-Architecture-BG/32/Application-Integration' fill='url(#linearGradient-1)'>
            <rect id='Rectangle' x='0' y='0' width='40' height='40'></rect>
        </g>
        <path d='M14.3422051,22.3493786 L15.8466767,20.9061074 C15.9428347,20.8141539 15.9969235,20.687218 15.9999285,20.5552846 C16.0019317,20.4223517 15.9518495,20.2934168 15.8596981,20.1984648 L14.3552264,18.6432502 L13.6350433,19.3378994 L14.311154,20.037546 L11.9913429,20.037546 L11.9913429,21.0370413 L14.2650783,21.0370413 L13.6480647,21.6287425 L14.3422051,22.3493786 Z M26.3579452,22.3533765 L27.9074909,20.9001104 C28.0066538,20.8081569 28.0627459,20.679222 28.0647492,20.5442901 C28.0667525,20.4093583 28.0136653,20.2784244 27.918509,20.1834724 L26.3689633,18.6372532 L25.6607999,19.3438963 L26.3549403,20.037546 L24.0110896,20.037546 L24.0110896,21.0370413 L26.2988481,21.0370413 L25.671818,21.6247445 L26.3579452,22.3533765 Z M17.5875367,23.3608678 C18.3387708,23.0570212 19.1621235,22.8941035 20.0045074,22.8941035 C20.8468913,22.8941035 21.670244,23.0570212 22.4214781,23.3608678 C21.7523789,21.5897622 21.7523789,19.3898731 22.4214781,17.6187675 C20.9190098,18.2264606 19.090005,18.2264606 17.5875367,17.6187675 C18.2566359,19.3898731 18.2566359,21.5897622 17.5875367,23.3608678 L17.5875367,23.3608678 Z M15.6443443,25.3408679 C15.546183,25.2439168 15.4971024,25.1159814 15.4971024,24.988046 C15.4971024,24.8601106 15.546183,24.7321753 15.6443443,24.6342247 C17.5845317,22.6982024 17.5845317,18.2824324 15.6443443,16.3454106 C15.546183,16.2484595 15.4971024,16.1205241 15.4971024,15.9925912 C15.4971024,15.8646534 15.546183,15.736718 15.6443443,15.6387674 C15.8396652,15.4438659 16.1571868,15.4438659 16.3525077,15.6387674 C17.2740216,16.5583031 18.6052086,17.0860366 20.0045074,17.0860366 C21.4048079,17.0860366 22.7359948,16.5583031 23.6575088,15.6387674 C23.8528296,15.4438659 24.1703513,15.4438659 24.3656722,15.6387674 C24.4628318,15.736718 24.5119124,15.8646534 24.5119124,15.9925912 C24.5119124,16.1205241 24.4628318,16.2484595 24.3656722,16.3454106 C22.4244831,18.2824324 22.4244831,22.6982024 24.3656722,24.6342247 C24.4628318,24.7321753 24.5119124,24.8601106 24.5119124,24.988046 C24.5119124,25.1159814 24.4628318,25.2439168 24.3656722,25.3408679 C24.2675109,25.4388184 24.1393003,25.4877937 24.0110896,25.4877937 C23.882879,25.4877937 23.7546684,25.4388184 23.6575088,25.3408679 C22.7359948,24.4213322 21.4048079,23.8935987 20.0045074,23.8935987 C18.6052086,23.8935987 17.2740216,24.4213322 16.3525077,25.3408679 C16.1571868,25.5357694 15.8396652,25.5357694 15.6443443,25.3408679 L15.6443443,25.3408679 Z M32.5421049,19.4358499 C32.236603,19.1320033 31.8369464,18.9800801 31.4362882,18.9800801 C31.0366316,18.9800801 30.636975,19.1320033 30.3314731,19.4358499 C29.721471,20.0445425 29.721471,21.0340428 30.3314731,21.6417359 C30.9414753,22.2504285 31.9321027,22.2504285 32.5421049,21.6417359 C33.1511054,21.0340428 33.1511054,20.0445425 32.5421049,19.4358499 L32.5421049,19.4358499 Z M33.2502683,22.3493786 C32.7504472,22.8481267 32.0933677,23.0980005 31.4362882,23.0980005 C30.7802103,23.0980005 30.1231309,22.8481267 29.6233097,22.3493786 C28.6236675,21.3508828 28.6236675,19.7277025 29.6233097,18.7292068 C30.622952,17.7317105 32.250626,17.7317105 33.2502683,18.7292068 C34.2499106,19.7277025 34.2499106,21.3508828 33.2502683,22.3493786 L33.2502683,22.3493786 Z M9.66852687,19.4468443 C9.36302497,19.1429978 8.96336839,18.9910745 8.56271017,18.9910745 C8.16305359,18.9910745 7.76339701,19.1429978 7.45789511,19.4468443 C6.84889461,20.055537 6.84889461,21.0450373 7.45789511,21.6527304 C8.06789726,22.261423 9.05852472,22.261423 9.66852687,21.6527304 C10.2775274,21.0450373 10.2775274,20.055537 9.66852687,19.4468443 L9.66852687,19.4468443 Z M10.3766903,22.3593735 C9.87686914,22.8581217 9.21978965,23.1079955 8.56271017,23.1079955 C7.90663232,23.1079955 7.24955284,22.8581217 6.7497317,22.3593735 C5.75008943,21.3618773 5.75008943,19.738697 6.7497317,18.7402012 C7.74937397,17.7427049 9.37704801,17.7427049 10.3766903,18.7402012 C11.3763325,19.738697 11.3763325,21.3618773 10.3766903,22.3593735 L10.3766903,22.3593735 Z M27.4337125,28.9100654 C25.4364313,30.903059 22.7820705,32.0005047 19.9574301,32.0005047 C17.1327896,32.0005047 14.4784288,30.903059 12.4821492,28.9100654 C11.165987,27.5977281 10.4077413,26.469298 9.94498104,25.1359713 L8.99842599,25.4628063 C9.50726193,26.9290658 10.3626672,28.2104187 11.7739858,29.6167086 C13.9585748,31.7986067 16.8663519,33 19.9574301,33 C23.0495099,33 25.9562853,31.7986067 28.1418759,29.6167086 C29.2827502,28.4782835 30.4206196,27.1869356 31.0115905,25.4608073 L30.0640338,25.1379703 C29.5391715,26.6701966 28.4894469,27.8565974 27.4337125,28.9100654 L27.4337125,28.9100654 Z M9.94498104,15.8596559 L8.99842599,15.5318214 C9.51026687,14.0645624 10.3656722,12.7832095 11.7759891,11.3759202 C16.2863991,6.87519304 23.6264578,6.87419354 28.1378694,11.3759202 C29.2186449,12.4533761 30.4035916,13.7897012 31.0115905,15.5318214 L30.0640338,15.8596559 C29.5241468,14.3094387 28.4293482,13.0800596 27.4297059,12.0825633 C25.434428,10.0915688 22.7810689,8.99612197 19.9574301,8.99612197 C17.1337912,8.99612197 14.4804321,10.0915688 12.4851542,12.0825633 C11.1870215,13.3779092 10.4037347,14.5423211 9.94498104,15.8596559 L9.94498104,15.8596559 Z'
              id='AWS-Simple-Queue-Service_Icon_32_Squid' fill='#FFFFFF'></path>
    </g>
</svg>"
+  }
+}
\ No newline at end of file
diff --git a/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-outbound-connector-hybrid.json b/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-outbound-connector-hybrid.json
new file mode 100644
index 0000000000..d65f60e4ac
--- /dev/null
+++ b/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-outbound-connector-hybrid.json
@@ -0,0 +1,289 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid Amazon SQS Outbound Connector",
+  "id" : "io.camunda.connectors.AWSSQS.v1-hybrid",
+  "description" : "Send message to queue",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=outbound",
+  "version" : 10,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:Task" ],
+  "elementType" : {
+    "value" : "bpmn:ServiceTask"
+  },
+  "groups" : [ {
+    "id" : "taskDefinitionType",
+    "label" : "Task definition type"
+  }, {
+    "id" : "authentication",
+    "label" : "Authentication"
+  }, {
+    "id" : "configuration",
+    "label" : "Queue properties"
+  }, {
+    "id" : "input",
+    "label" : "Input message data"
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  }, {
+    "id" : "error",
+    "label" : "Error handling"
+  }, {
+    "id" : "retries",
+    "label" : "Retries"
+  } ],
+  "properties" : [ {
+    "id" : "taskDefinitionType",
+    "value" : "io.camunda:aws-sqs:1",
+    "group" : "taskDefinitionType",
+    "binding" : {
+      "property" : "type",
+      "type" : "zeebe:taskDefinition"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.type",
+    "label" : "Authentication",
+    "description" : "Specify AWS authentication strategy. Learn more at the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-lambda/#aws-authentication-types\" target=\"_blank\">documentation page</a>",
+    "value" : "credentials",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.type",
+      "type" : "zeebe:input"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Default Credentials Chain (Hybrid/Self-Managed only)",
+      "value" : "defaultCredentialsChain"
+    }, {
+      "name" : "Credentials",
+      "value" : "credentials"
+    } ]
+  }, {
+    "id" : "authentication.accessKey",
+    "label" : "Access key",
+    "description" : "Provide an IAM access key tailored to a user, equipped with the necessary permissions",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.accessKey",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.secretKey",
+    "label" : "Secret key",
+    "description" : "Provide a secret key of a user with permissions to invoke specified AWS Lambda function",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.secretKey",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queue.url",
+    "label" : "URL",
+    "description" : "Specify the URL of the SQS queue where you would like to send message to",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "configuration",
+    "binding" : {
+      "name" : "queue.url",
+      "type" : "zeebe:input"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queue.type",
+    "label" : "Queue type",
+    "description" : "Specify whether the queue is a <a href=\"https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/standard-queues.html\">standard</a> or <a href=\"https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/FIFO-queues.html\">FIFO</a> queue",
+    "optional" : false,
+    "value" : "standard",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "configuration",
+    "binding" : {
+      "name" : "queue.type",
+      "type" : "zeebe:input"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Standard",
+      "value" : "standard"
+    }, {
+      "name" : "FIFO",
+      "value" : "fifo"
+    } ]
+  }, {
+    "id" : "configuration.region",
+    "label" : "Region",
+    "description" : "Specify the AWS region",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "optional",
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.region",
+      "type" : "zeebe:input"
+    },
+    "type" : "String"
+  }, {
+    "id" : "configuration.endpoint",
+    "label" : "Endpoint",
+    "description" : "Specify endpoint if need to use custom endpoint",
+    "optional" : true,
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.endpoint",
+      "type" : "zeebe:input"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "queue.messageBody",
+    "label" : "Message body",
+    "description" : "Data to send to the SQS queue",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "input",
+    "binding" : {
+      "name" : "queue.messageBody",
+      "type" : "zeebe:input"
+    },
+    "type" : "Text"
+  }, {
+    "id" : "queue.messageAttributes",
+    "label" : "Message attributes",
+    "description" : "Message attributes metadata",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "input",
+    "binding" : {
+      "name" : "queue.messageAttributes",
+      "type" : "zeebe:input"
+    },
+    "type" : "Text"
+  }, {
+    "id" : "queue.messageGroupId",
+    "label" : "Message group ID",
+    "description" : "Message group ID (FIFO only). See also <a href=\"https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/using-messagegroupid-property.html\">using the MessageGroupId Property</a> in the Amazon SQS developer guide",
+    "optional" : false,
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "queue.messageGroupId",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "queue.type",
+      "equals" : "fifo",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queue.messageDeduplicationId",
+    "label" : "Message deduplication ID",
+    "description" : "Message deduplication ID (FIFO only). See also <a href=\"https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/using-messagededuplicationid-property.html\">using the MessageDeduplicationId Property</a> in the Amazon SQS developer guide",
+    "optional" : true,
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "queue.messageDeduplicationId",
+      "type" : "zeebe:input"
+    },
+    "condition" : {
+      "property" : "queue.type",
+      "equals" : "fifo",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "key" : "resultVariable",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "key" : "resultExpression",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "Text"
+  }, {
+    "id" : "errorExpression",
+    "label" : "Error expression",
+    "description" : "Expression to handle errors. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/\" target=\"_blank\">documentation</a>.",
+    "feel" : "required",
+    "group" : "error",
+    "binding" : {
+      "key" : "errorExpression",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "Text"
+  }, {
+    "id" : "retryCount",
+    "label" : "Retries",
+    "description" : "Number of retries",
+    "value" : "3",
+    "feel" : "optional",
+    "group" : "retries",
+    "binding" : {
+      "property" : "retries",
+      "type" : "zeebe:taskDefinition"
+    },
+    "type" : "String"
+  }, {
+    "id" : "retryBackoff",
+    "label" : "Retry backoff",
+    "description" : "ISO-8601 duration to wait between retries",
+    "value" : "PT0S",
+    "feel" : "optional",
+    "group" : "retries",
+    "binding" : {
+      "key" : "retryBackoff",
+      "type" : "zeebe:taskHeader"
+    },
+    "type" : "String"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,<svg width='18' height='18' viewBox='0 0 40 40' version='1.1' xmlns='http://www.w3.org/2000/svg'
     xmlns:xlink='http://www.w3.org/1999/xlink'><!-- Generator: Sketch 64 (93537) - https://sketch.com -->
    <title>Icon-Architecture/32/Arch_AWS-Simple-Queue-Service_32</title>
    <desc>Created with Sketch.</desc>
    <defs>
        <linearGradient x1='0%' y1='100%' x2='100%' y2='0%' id='linearGradient-1'>
            <stop stop-color='#B0084D' offset='0%'></stop>
            <stop stop-color='#FF4F8B' offset='100%'></stop>
        </linearGradient>
    </defs>
    <g id='Icon-Architecture/32/Arch_AWS-Simple-Queue-Service_32' stroke='none' stroke-width='1' fill='none'
       fill-rule='evenodd'>
        <g id='Icon-Architecture-BG/32/Application-Integration' fill='url(#linearGradient-1)'>
            <rect id='Rectangle' x='0' y='0' width='40' height='40'></rect>
        </g>
        <path d='M14.3422051,22.3493786 L15.8466767,20.9061074 C15.9428347,20.8141539 15.9969235,20.687218 15.9999285,20.5552846 C16.0019317,20.4223517 15.9518495,20.2934168 15.8596981,20.1984648 L14.3552264,18.6432502 L13.6350433,19.3378994 L14.311154,20.037546 L11.9913429,20.037546 L11.9913429,21.0370413 L14.2650783,21.0370413 L13.6480647,21.6287425 L14.3422051,22.3493786 Z M26.3579452,22.3533765 L27.9074909,20.9001104 C28.0066538,20.8081569 28.0627459,20.679222 28.0647492,20.5442901 C28.0667525,20.4093583 28.0136653,20.2784244 27.918509,20.1834724 L26.3689633,18.6372532 L25.6607999,19.3438963 L26.3549403,20.037546 L24.0110896,20.037546 L24.0110896,21.0370413 L26.2988481,21.0370413 L25.671818,21.6247445 L26.3579452,22.3533765 Z M17.5875367,23.3608678 C18.3387708,23.0570212 19.1621235,22.8941035 20.0045074,22.8941035 C20.8468913,22.8941035 21.670244,23.0570212 22.4214781,23.3608678 C21.7523789,21.5897622 21.7523789,19.3898731 22.4214781,17.6187675 C20.9190098,18.2264606 19.090005,18.2264606 17.5875367,17.6187675 C18.2566359,19.3898731 18.2566359,21.5897622 17.5875367,23.3608678 L17.5875367,23.3608678 Z M15.6443443,25.3408679 C15.546183,25.2439168 15.4971024,25.1159814 15.4971024,24.988046 C15.4971024,24.8601106 15.546183,24.7321753 15.6443443,24.6342247 C17.5845317,22.6982024 17.5845317,18.2824324 15.6443443,16.3454106 C15.546183,16.2484595 15.4971024,16.1205241 15.4971024,15.9925912 C15.4971024,15.8646534 15.546183,15.736718 15.6443443,15.6387674 C15.8396652,15.4438659 16.1571868,15.4438659 16.3525077,15.6387674 C17.2740216,16.5583031 18.6052086,17.0860366 20.0045074,17.0860366 C21.4048079,17.0860366 22.7359948,16.5583031 23.6575088,15.6387674 C23.8528296,15.4438659 24.1703513,15.4438659 24.3656722,15.6387674 C24.4628318,15.736718 24.5119124,15.8646534 24.5119124,15.9925912 C24.5119124,16.1205241 24.4628318,16.2484595 24.3656722,16.3454106 C22.4244831,18.2824324 22.4244831,22.6982024 24.3656722,24.6342247 C24.4628318,24.7321753 24.5119124,24.8601106 24.5119124,24.988046 C24.5119124,25.1159814 24.4628318,25.2439168 24.3656722,25.3408679 C24.2675109,25.4388184 24.1393003,25.4877937 24.0110896,25.4877937 C23.882879,25.4877937 23.7546684,25.4388184 23.6575088,25.3408679 C22.7359948,24.4213322 21.4048079,23.8935987 20.0045074,23.8935987 C18.6052086,23.8935987 17.2740216,24.4213322 16.3525077,25.3408679 C16.1571868,25.5357694 15.8396652,25.5357694 15.6443443,25.3408679 L15.6443443,25.3408679 Z M32.5421049,19.4358499 C32.236603,19.1320033 31.8369464,18.9800801 31.4362882,18.9800801 C31.0366316,18.9800801 30.636975,19.1320033 30.3314731,19.4358499 C29.721471,20.0445425 29.721471,21.0340428 30.3314731,21.6417359 C30.9414753,22.2504285 31.9321027,22.2504285 32.5421049,21.6417359 C33.1511054,21.0340428 33.1511054,20.0445425 32.5421049,19.4358499 L32.5421049,19.4358499 Z M33.2502683,22.3493786 C32.7504472,22.8481267 32.0933677,23.0980005 31.4362882,23.0980005 C30.7802103,23.0980005 30.1231309,22.8481267 29.6233097,22.3493786 C28.6236675,21.3508828 28.6236675,19.7277025 29.6233097,18.7292068 C30.622952,17.7317105 32.250626,17.7317105 33.2502683,18.7292068 C34.2499106,19.7277025 34.2499106,21.3508828 33.2502683,22.3493786 L33.2502683,22.3493786 Z M9.66852687,19.4468443 C9.36302497,19.1429978 8.96336839,18.9910745 8.56271017,18.9910745 C8.16305359,18.9910745 7.76339701,19.1429978 7.45789511,19.4468443 C6.84889461,20.055537 6.84889461,21.0450373 7.45789511,21.6527304 C8.06789726,22.261423 9.05852472,22.261423 9.66852687,21.6527304 C10.2775274,21.0450373 10.2775274,20.055537 9.66852687,19.4468443 L9.66852687,19.4468443 Z M10.3766903,22.3593735 C9.87686914,22.8581217 9.21978965,23.1079955 8.56271017,23.1079955 C7.90663232,23.1079955 7.24955284,22.8581217 6.7497317,22.3593735 C5.75008943,21.3618773 5.75008943,19.738697 6.7497317,18.7402012 C7.74937397,17.7427049 9.37704801,17.7427049 10.3766903,18.7402012 C11.3763325,19.738697 11.3763325,21.3618773 10.3766903,22.3593735 L10.3766903,22.3593735 Z M27.4337125,28.9100654 C25.4364313,30.903059 22.7820705,32.0005047 19.9574301,32.0005047 C17.1327896,32.0005047 14.4784288,30.903059 12.4821492,28.9100654 C11.165987,27.5977281 10.4077413,26.469298 9.94498104,25.1359713 L8.99842599,25.4628063 C9.50726193,26.9290658 10.3626672,28.2104187 11.7739858,29.6167086 C13.9585748,31.7986067 16.8663519,33 19.9574301,33 C23.0495099,33 25.9562853,31.7986067 28.1418759,29.6167086 C29.2827502,28.4782835 30.4206196,27.1869356 31.0115905,25.4608073 L30.0640338,25.1379703 C29.5391715,26.6701966 28.4894469,27.8565974 27.4337125,28.9100654 L27.4337125,28.9100654 Z M9.94498104,15.8596559 L8.99842599,15.5318214 C9.51026687,14.0645624 10.3656722,12.7832095 11.7759891,11.3759202 C16.2863991,6.87519304 23.6264578,6.87419354 28.1378694,11.3759202 C29.2186449,12.4533761 30.4035916,13.7897012 31.0115905,15.5318214 L30.0640338,15.8596559 C29.5241468,14.3094387 28.4293482,13.0800596 27.4297059,12.0825633 C25.434428,10.0915688 22.7810689,8.99612197 19.9574301,8.99612197 C17.1337912,8.99612197 14.4804321,10.0915688 12.4851542,12.0825633 C11.1870215,13.3779092 10.4037347,14.5423211 9.94498104,15.8596559 L9.94498104,15.8596559 Z'
              id='AWS-Simple-Queue-Service_Icon_32_Squid' fill='#FFFFFF'></path>
    </g>
</svg>"
+  }
+}
\ No newline at end of file
diff --git a/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-start-event-connector-hybrid.json b/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-start-event-connector-hybrid.json
new file mode 100644
index 0000000000..02f671f975
--- /dev/null
+++ b/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-start-event-connector-hybrid.json
@@ -0,0 +1,224 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid Amazon SQS Start Event Connector",
+  "id" : "io.camunda.connectors.AWSSQS.StartEvent.v1-hybrid",
+  "description" : "Receive message from a queue",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound",
+  "version" : 9,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:StartEvent" ],
+  "elementType" : {
+    "value" : "bpmn:StartEvent"
+  },
+  "groups" : [ {
+    "id" : "connectorType",
+    "label" : "Connector type"
+  }, {
+    "id" : "authentication",
+    "label" : "Authentication"
+  }, {
+    "id" : "configuration",
+    "label" : "Configuration"
+  }, {
+    "id" : "queueProperties",
+    "label" : "Queue properties"
+  }, {
+    "id" : "messagePollingProperties",
+    "label" : "Message polling properties"
+  }, {
+    "id" : "input",
+    "label" : "Use next attribute names for activation condition"
+  }, {
+    "id" : "activation",
+    "label" : "Activation"
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  } ],
+  "properties" : [ {
+    "id" : "connectorType",
+    "value" : "io.camunda:aws-sqs-inbound:1",
+    "group" : "connectorType",
+    "binding" : {
+      "name" : "inbound.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.type",
+    "label" : "Authentication",
+    "description" : "Specify AWS authentication strategy. Learn more at the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-lambda/#aws-authentication-types\" target=\"_blank\">documentation page</a>",
+    "value" : "credentials",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Default Credentials Chain (Hybrid/Self-Managed only)",
+      "value" : "defaultCredentialsChain"
+    }, {
+      "name" : "Credentials",
+      "value" : "credentials"
+    } ]
+  }, {
+    "id" : "authentication.accessKey",
+    "label" : "Access key",
+    "description" : "Provide an IAM access key tailored to a user, equipped with the necessary permissions",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.accessKey",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.secretKey",
+    "label" : "Secret key",
+    "description" : "Provide a secret key of a user with permissions to invoke specified AWS Lambda function",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.secretKey",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "configuration.region",
+    "label" : "Region",
+    "description" : "Specify the AWS region",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.region",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "configuration.endpoint",
+    "label" : "Endpoint",
+    "description" : "Specify endpoint if need to use custom endpoint",
+    "optional" : true,
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.endpoint",
+      "type" : "zeebe:property"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "queue.queue.url",
+    "label" : "Queue URL",
+    "description" : "Specify the URL of the SQS queue where you would like to subscribe to",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "queueProperties",
+    "binding" : {
+      "name" : "queue.url",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queue.queue.pollingWaitTime",
+    "label" : "Polling wait time",
+    "description" : "The duration (in seconds) for which the call waits for a message to arrive in the queue before returning. See <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound\" target=\"_blank\">documentation</a> for details",
+    "optional" : false,
+    "value" : "20",
+    "constraints" : {
+      "notEmpty" : true,
+      "pattern" : {
+        "value" : "^([0-9]?|1[0-9]|20|secrets\\..+)$"
+      }
+    },
+    "group" : "messagePollingProperties",
+    "binding" : {
+      "name" : "queue.pollingWaitTime",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queue.queue.attributeNames",
+    "label" : "Attribute names",
+    "description" : "Array of queue attribute names. See <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound\" target=\"_blank\">documentation</a> for details",
+    "optional" : false,
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "queue.attributeNames",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queue.queue.messageAttributeNames",
+    "label" : "Message attribute names",
+    "description" : "Array of message attribute names. See <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound\" target=\"_blank\">documentation</a> for details",
+    "optional" : false,
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "queue.messageAttributeNames",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "activationCondition",
+    "label" : "Activation condition",
+    "description" : "Condition under which the Connector triggers. Leave empty to catch all events",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "activation",
+    "binding" : {
+      "name" : "activationCondition",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultVariable",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "Text"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,<svg width='18' height='18' viewBox='0 0 40 40' version='1.1' xmlns='http://www.w3.org/2000/svg'
     xmlns:xlink='http://www.w3.org/1999/xlink'><!-- Generator: Sketch 64 (93537) - https://sketch.com -->
    <title>Icon-Architecture/32/Arch_AWS-Simple-Queue-Service_32</title>
    <desc>Created with Sketch.</desc>
    <defs>
        <linearGradient x1='0%' y1='100%' x2='100%' y2='0%' id='linearGradient-1'>
            <stop stop-color='#B0084D' offset='0%'></stop>
            <stop stop-color='#FF4F8B' offset='100%'></stop>
        </linearGradient>
    </defs>
    <g id='Icon-Architecture/32/Arch_AWS-Simple-Queue-Service_32' stroke='none' stroke-width='1' fill='none'
       fill-rule='evenodd'>
        <g id='Icon-Architecture-BG/32/Application-Integration' fill='url(#linearGradient-1)'>
            <rect id='Rectangle' x='0' y='0' width='40' height='40'></rect>
        </g>
        <path d='M14.3422051,22.3493786 L15.8466767,20.9061074 C15.9428347,20.8141539 15.9969235,20.687218 15.9999285,20.5552846 C16.0019317,20.4223517 15.9518495,20.2934168 15.8596981,20.1984648 L14.3552264,18.6432502 L13.6350433,19.3378994 L14.311154,20.037546 L11.9913429,20.037546 L11.9913429,21.0370413 L14.2650783,21.0370413 L13.6480647,21.6287425 L14.3422051,22.3493786 Z M26.3579452,22.3533765 L27.9074909,20.9001104 C28.0066538,20.8081569 28.0627459,20.679222 28.0647492,20.5442901 C28.0667525,20.4093583 28.0136653,20.2784244 27.918509,20.1834724 L26.3689633,18.6372532 L25.6607999,19.3438963 L26.3549403,20.037546 L24.0110896,20.037546 L24.0110896,21.0370413 L26.2988481,21.0370413 L25.671818,21.6247445 L26.3579452,22.3533765 Z M17.5875367,23.3608678 C18.3387708,23.0570212 19.1621235,22.8941035 20.0045074,22.8941035 C20.8468913,22.8941035 21.670244,23.0570212 22.4214781,23.3608678 C21.7523789,21.5897622 21.7523789,19.3898731 22.4214781,17.6187675 C20.9190098,18.2264606 19.090005,18.2264606 17.5875367,17.6187675 C18.2566359,19.3898731 18.2566359,21.5897622 17.5875367,23.3608678 L17.5875367,23.3608678 Z M15.6443443,25.3408679 C15.546183,25.2439168 15.4971024,25.1159814 15.4971024,24.988046 C15.4971024,24.8601106 15.546183,24.7321753 15.6443443,24.6342247 C17.5845317,22.6982024 17.5845317,18.2824324 15.6443443,16.3454106 C15.546183,16.2484595 15.4971024,16.1205241 15.4971024,15.9925912 C15.4971024,15.8646534 15.546183,15.736718 15.6443443,15.6387674 C15.8396652,15.4438659 16.1571868,15.4438659 16.3525077,15.6387674 C17.2740216,16.5583031 18.6052086,17.0860366 20.0045074,17.0860366 C21.4048079,17.0860366 22.7359948,16.5583031 23.6575088,15.6387674 C23.8528296,15.4438659 24.1703513,15.4438659 24.3656722,15.6387674 C24.4628318,15.736718 24.5119124,15.8646534 24.5119124,15.9925912 C24.5119124,16.1205241 24.4628318,16.2484595 24.3656722,16.3454106 C22.4244831,18.2824324 22.4244831,22.6982024 24.3656722,24.6342247 C24.4628318,24.7321753 24.5119124,24.8601106 24.5119124,24.988046 C24.5119124,25.1159814 24.4628318,25.2439168 24.3656722,25.3408679 C24.2675109,25.4388184 24.1393003,25.4877937 24.0110896,25.4877937 C23.882879,25.4877937 23.7546684,25.4388184 23.6575088,25.3408679 C22.7359948,24.4213322 21.4048079,23.8935987 20.0045074,23.8935987 C18.6052086,23.8935987 17.2740216,24.4213322 16.3525077,25.3408679 C16.1571868,25.5357694 15.8396652,25.5357694 15.6443443,25.3408679 L15.6443443,25.3408679 Z M32.5421049,19.4358499 C32.236603,19.1320033 31.8369464,18.9800801 31.4362882,18.9800801 C31.0366316,18.9800801 30.636975,19.1320033 30.3314731,19.4358499 C29.721471,20.0445425 29.721471,21.0340428 30.3314731,21.6417359 C30.9414753,22.2504285 31.9321027,22.2504285 32.5421049,21.6417359 C33.1511054,21.0340428 33.1511054,20.0445425 32.5421049,19.4358499 L32.5421049,19.4358499 Z M33.2502683,22.3493786 C32.7504472,22.8481267 32.0933677,23.0980005 31.4362882,23.0980005 C30.7802103,23.0980005 30.1231309,22.8481267 29.6233097,22.3493786 C28.6236675,21.3508828 28.6236675,19.7277025 29.6233097,18.7292068 C30.622952,17.7317105 32.250626,17.7317105 33.2502683,18.7292068 C34.2499106,19.7277025 34.2499106,21.3508828 33.2502683,22.3493786 L33.2502683,22.3493786 Z M9.66852687,19.4468443 C9.36302497,19.1429978 8.96336839,18.9910745 8.56271017,18.9910745 C8.16305359,18.9910745 7.76339701,19.1429978 7.45789511,19.4468443 C6.84889461,20.055537 6.84889461,21.0450373 7.45789511,21.6527304 C8.06789726,22.261423 9.05852472,22.261423 9.66852687,21.6527304 C10.2775274,21.0450373 10.2775274,20.055537 9.66852687,19.4468443 L9.66852687,19.4468443 Z M10.3766903,22.3593735 C9.87686914,22.8581217 9.21978965,23.1079955 8.56271017,23.1079955 C7.90663232,23.1079955 7.24955284,22.8581217 6.7497317,22.3593735 C5.75008943,21.3618773 5.75008943,19.738697 6.7497317,18.7402012 C7.74937397,17.7427049 9.37704801,17.7427049 10.3766903,18.7402012 C11.3763325,19.738697 11.3763325,21.3618773 10.3766903,22.3593735 L10.3766903,22.3593735 Z M27.4337125,28.9100654 C25.4364313,30.903059 22.7820705,32.0005047 19.9574301,32.0005047 C17.1327896,32.0005047 14.4784288,30.903059 12.4821492,28.9100654 C11.165987,27.5977281 10.4077413,26.469298 9.94498104,25.1359713 L8.99842599,25.4628063 C9.50726193,26.9290658 10.3626672,28.2104187 11.7739858,29.6167086 C13.9585748,31.7986067 16.8663519,33 19.9574301,33 C23.0495099,33 25.9562853,31.7986067 28.1418759,29.6167086 C29.2827502,28.4782835 30.4206196,27.1869356 31.0115905,25.4608073 L30.0640338,25.1379703 C29.5391715,26.6701966 28.4894469,27.8565974 27.4337125,28.9100654 L27.4337125,28.9100654 Z M9.94498104,15.8596559 L8.99842599,15.5318214 C9.51026687,14.0645624 10.3656722,12.7832095 11.7759891,11.3759202 C16.2863991,6.87519304 23.6264578,6.87419354 28.1378694,11.3759202 C29.2186449,12.4533761 30.4035916,13.7897012 31.0115905,15.5318214 L30.0640338,15.8596559 C29.5241468,14.3094387 28.4293482,13.0800596 27.4297059,12.0825633 C25.434428,10.0915688 22.7810689,8.99612197 19.9574301,8.99612197 C17.1337912,8.99612197 14.4804321,10.0915688 12.4851542,12.0825633 C11.1870215,13.3779092 10.4037347,14.5423211 9.94498104,15.8596559 L9.94498104,15.8596559 Z'
              id='AWS-Simple-Queue-Service_Icon_32_Squid' fill='#FFFFFF'></path>
    </g>
</svg>"
+  }
+}
\ No newline at end of file
diff --git a/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-start-message-hybrid.json b/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-start-message-hybrid.json
new file mode 100644
index 0000000000..e4181334cb
--- /dev/null
+++ b/connectors/aws/aws-sqs/element-templates/hybrid/aws-sqs-start-message-hybrid.json
@@ -0,0 +1,307 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid Amazon SQS Message Start Event Connector",
+  "id" : "io.camunda.connectors.AWSSQS.startmessage.v1-hybrid",
+  "description" : "Receive message from a queue",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound",
+  "version" : 9,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:StartEvent" ],
+  "elementType" : {
+    "value" : "bpmn:StartEvent",
+    "eventDefinition" : "bpmn:MessageEventDefinition"
+  },
+  "groups" : [ {
+    "id" : "connectorType",
+    "label" : "Connector type"
+  }, {
+    "id" : "authentication",
+    "label" : "Authentication"
+  }, {
+    "id" : "configuration",
+    "label" : "Configuration"
+  }, {
+    "id" : "queueProperties",
+    "label" : "Queue properties"
+  }, {
+    "id" : "messagePollingProperties",
+    "label" : "Message polling properties"
+  }, {
+    "id" : "input",
+    "label" : "Use next attribute names for activation condition"
+  }, {
+    "id" : "activation",
+    "label" : "Activation"
+  }, {
+    "id" : "correlation",
+    "label" : "Correlation"
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  } ],
+  "properties" : [ {
+    "id" : "connectorType",
+    "value" : "io.camunda:aws-sqs-inbound:1",
+    "group" : "connectorType",
+    "binding" : {
+      "name" : "inbound.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.type",
+    "label" : "Authentication",
+    "description" : "Specify AWS authentication strategy. Learn more at the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/aws-lambda/#aws-authentication-types\" target=\"_blank\">documentation page</a>",
+    "value" : "credentials",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Default Credentials Chain (Hybrid/Self-Managed only)",
+      "value" : "defaultCredentialsChain"
+    }, {
+      "name" : "Credentials",
+      "value" : "credentials"
+    } ]
+  }, {
+    "id" : "authentication.accessKey",
+    "label" : "Access key",
+    "description" : "Provide an IAM access key tailored to a user, equipped with the necessary permissions",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.accessKey",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.secretKey",
+    "label" : "Secret key",
+    "description" : "Provide a secret key of a user with permissions to invoke specified AWS Lambda function",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.secretKey",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.type",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "configuration.region",
+    "label" : "Region",
+    "description" : "Specify the AWS region",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.region",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "configuration.endpoint",
+    "label" : "Endpoint",
+    "description" : "Specify endpoint if need to use custom endpoint",
+    "optional" : true,
+    "group" : "configuration",
+    "binding" : {
+      "name" : "configuration.endpoint",
+      "type" : "zeebe:property"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "queue.queue.url",
+    "label" : "Queue URL",
+    "description" : "Specify the URL of the SQS queue where you would like to subscribe to",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "queueProperties",
+    "binding" : {
+      "name" : "queue.url",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queue.queue.pollingWaitTime",
+    "label" : "Polling wait time",
+    "description" : "The duration (in seconds) for which the call waits for a message to arrive in the queue before returning. See <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound\" target=\"_blank\">documentation</a> for details",
+    "optional" : false,
+    "value" : "20",
+    "constraints" : {
+      "notEmpty" : true,
+      "pattern" : {
+        "value" : "^([0-9]?|1[0-9]|20|secrets\\..+)$"
+      }
+    },
+    "group" : "messagePollingProperties",
+    "binding" : {
+      "name" : "queue.pollingWaitTime",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queue.queue.attributeNames",
+    "label" : "Attribute names",
+    "description" : "Array of queue attribute names. See <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound\" target=\"_blank\">documentation</a> for details",
+    "optional" : false,
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "queue.attributeNames",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queue.queue.messageAttributeNames",
+    "label" : "Message attribute names",
+    "description" : "Array of message attribute names. See <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/amazon-sqs/?amazonsqs=inbound\" target=\"_blank\">documentation</a> for details",
+    "optional" : false,
+    "feel" : "optional",
+    "group" : "input",
+    "binding" : {
+      "name" : "queue.messageAttributeNames",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "activationCondition",
+    "label" : "Activation condition",
+    "description" : "Condition under which the Connector triggers. Leave empty to catch all events",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "activation",
+    "binding" : {
+      "name" : "activationCondition",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "correlationRequired",
+    "label" : "Subprocess correlation required",
+    "description" : "Indicates whether correlation is required. This is needed for event-based subprocess message start events",
+    "value" : "notRequired",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationRequired",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Correlation not required",
+      "value" : "notRequired"
+    }, {
+      "name" : "Correlation required",
+      "value" : "required"
+    } ]
+  }, {
+    "id" : "correlationKeyProcess",
+    "label" : "Correlation key (process)",
+    "description" : "Sets up the correlation key from process variables",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKey",
+      "type" : "bpmn:Message#zeebe:subscription#property"
+    },
+    "condition" : {
+      "property" : "correlationRequired",
+      "equals" : "required",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "correlationKeyPayload",
+    "label" : "Correlation key (payload)",
+    "description" : "Extracts the correlation key from the incoming message payload",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKeyExpression",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "correlationRequired",
+      "equals" : "required",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageIdExpression",
+    "label" : "Message ID expression",
+    "description" : "Expression to extract unique identifier of a message",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "messageIdExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageNameUuid",
+    "generatedValue" : {
+      "type" : "uuid"
+    },
+    "group" : "correlation",
+    "binding" : {
+      "name" : "name",
+      "type" : "bpmn:Message#property"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultVariable",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "Text"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,<svg width='18' height='18' viewBox='0 0 40 40' version='1.1' xmlns='http://www.w3.org/2000/svg'
     xmlns:xlink='http://www.w3.org/1999/xlink'><!-- Generator: Sketch 64 (93537) - https://sketch.com -->
    <title>Icon-Architecture/32/Arch_AWS-Simple-Queue-Service_32</title>
    <desc>Created with Sketch.</desc>
    <defs>
        <linearGradient x1='0%' y1='100%' x2='100%' y2='0%' id='linearGradient-1'>
            <stop stop-color='#B0084D' offset='0%'></stop>
            <stop stop-color='#FF4F8B' offset='100%'></stop>
        </linearGradient>
    </defs>
    <g id='Icon-Architecture/32/Arch_AWS-Simple-Queue-Service_32' stroke='none' stroke-width='1' fill='none'
       fill-rule='evenodd'>
        <g id='Icon-Architecture-BG/32/Application-Integration' fill='url(#linearGradient-1)'>
            <rect id='Rectangle' x='0' y='0' width='40' height='40'></rect>
        </g>
        <path d='M14.3422051,22.3493786 L15.8466767,20.9061074 C15.9428347,20.8141539 15.9969235,20.687218 15.9999285,20.5552846 C16.0019317,20.4223517 15.9518495,20.2934168 15.8596981,20.1984648 L14.3552264,18.6432502 L13.6350433,19.3378994 L14.311154,20.037546 L11.9913429,20.037546 L11.9913429,21.0370413 L14.2650783,21.0370413 L13.6480647,21.6287425 L14.3422051,22.3493786 Z M26.3579452,22.3533765 L27.9074909,20.9001104 C28.0066538,20.8081569 28.0627459,20.679222 28.0647492,20.5442901 C28.0667525,20.4093583 28.0136653,20.2784244 27.918509,20.1834724 L26.3689633,18.6372532 L25.6607999,19.3438963 L26.3549403,20.037546 L24.0110896,20.037546 L24.0110896,21.0370413 L26.2988481,21.0370413 L25.671818,21.6247445 L26.3579452,22.3533765 Z M17.5875367,23.3608678 C18.3387708,23.0570212 19.1621235,22.8941035 20.0045074,22.8941035 C20.8468913,22.8941035 21.670244,23.0570212 22.4214781,23.3608678 C21.7523789,21.5897622 21.7523789,19.3898731 22.4214781,17.6187675 C20.9190098,18.2264606 19.090005,18.2264606 17.5875367,17.6187675 C18.2566359,19.3898731 18.2566359,21.5897622 17.5875367,23.3608678 L17.5875367,23.3608678 Z M15.6443443,25.3408679 C15.546183,25.2439168 15.4971024,25.1159814 15.4971024,24.988046 C15.4971024,24.8601106 15.546183,24.7321753 15.6443443,24.6342247 C17.5845317,22.6982024 17.5845317,18.2824324 15.6443443,16.3454106 C15.546183,16.2484595 15.4971024,16.1205241 15.4971024,15.9925912 C15.4971024,15.8646534 15.546183,15.736718 15.6443443,15.6387674 C15.8396652,15.4438659 16.1571868,15.4438659 16.3525077,15.6387674 C17.2740216,16.5583031 18.6052086,17.0860366 20.0045074,17.0860366 C21.4048079,17.0860366 22.7359948,16.5583031 23.6575088,15.6387674 C23.8528296,15.4438659 24.1703513,15.4438659 24.3656722,15.6387674 C24.4628318,15.736718 24.5119124,15.8646534 24.5119124,15.9925912 C24.5119124,16.1205241 24.4628318,16.2484595 24.3656722,16.3454106 C22.4244831,18.2824324 22.4244831,22.6982024 24.3656722,24.6342247 C24.4628318,24.7321753 24.5119124,24.8601106 24.5119124,24.988046 C24.5119124,25.1159814 24.4628318,25.2439168 24.3656722,25.3408679 C24.2675109,25.4388184 24.1393003,25.4877937 24.0110896,25.4877937 C23.882879,25.4877937 23.7546684,25.4388184 23.6575088,25.3408679 C22.7359948,24.4213322 21.4048079,23.8935987 20.0045074,23.8935987 C18.6052086,23.8935987 17.2740216,24.4213322 16.3525077,25.3408679 C16.1571868,25.5357694 15.8396652,25.5357694 15.6443443,25.3408679 L15.6443443,25.3408679 Z M32.5421049,19.4358499 C32.236603,19.1320033 31.8369464,18.9800801 31.4362882,18.9800801 C31.0366316,18.9800801 30.636975,19.1320033 30.3314731,19.4358499 C29.721471,20.0445425 29.721471,21.0340428 30.3314731,21.6417359 C30.9414753,22.2504285 31.9321027,22.2504285 32.5421049,21.6417359 C33.1511054,21.0340428 33.1511054,20.0445425 32.5421049,19.4358499 L32.5421049,19.4358499 Z M33.2502683,22.3493786 C32.7504472,22.8481267 32.0933677,23.0980005 31.4362882,23.0980005 C30.7802103,23.0980005 30.1231309,22.8481267 29.6233097,22.3493786 C28.6236675,21.3508828 28.6236675,19.7277025 29.6233097,18.7292068 C30.622952,17.7317105 32.250626,17.7317105 33.2502683,18.7292068 C34.2499106,19.7277025 34.2499106,21.3508828 33.2502683,22.3493786 L33.2502683,22.3493786 Z M9.66852687,19.4468443 C9.36302497,19.1429978 8.96336839,18.9910745 8.56271017,18.9910745 C8.16305359,18.9910745 7.76339701,19.1429978 7.45789511,19.4468443 C6.84889461,20.055537 6.84889461,21.0450373 7.45789511,21.6527304 C8.06789726,22.261423 9.05852472,22.261423 9.66852687,21.6527304 C10.2775274,21.0450373 10.2775274,20.055537 9.66852687,19.4468443 L9.66852687,19.4468443 Z M10.3766903,22.3593735 C9.87686914,22.8581217 9.21978965,23.1079955 8.56271017,23.1079955 C7.90663232,23.1079955 7.24955284,22.8581217 6.7497317,22.3593735 C5.75008943,21.3618773 5.75008943,19.738697 6.7497317,18.7402012 C7.74937397,17.7427049 9.37704801,17.7427049 10.3766903,18.7402012 C11.3763325,19.738697 11.3763325,21.3618773 10.3766903,22.3593735 L10.3766903,22.3593735 Z M27.4337125,28.9100654 C25.4364313,30.903059 22.7820705,32.0005047 19.9574301,32.0005047 C17.1327896,32.0005047 14.4784288,30.903059 12.4821492,28.9100654 C11.165987,27.5977281 10.4077413,26.469298 9.94498104,25.1359713 L8.99842599,25.4628063 C9.50726193,26.9290658 10.3626672,28.2104187 11.7739858,29.6167086 C13.9585748,31.7986067 16.8663519,33 19.9574301,33 C23.0495099,33 25.9562853,31.7986067 28.1418759,29.6167086 C29.2827502,28.4782835 30.4206196,27.1869356 31.0115905,25.4608073 L30.0640338,25.1379703 C29.5391715,26.6701966 28.4894469,27.8565974 27.4337125,28.9100654 L27.4337125,28.9100654 Z M9.94498104,15.8596559 L8.99842599,15.5318214 C9.51026687,14.0645624 10.3656722,12.7832095 11.7759891,11.3759202 C16.2863991,6.87519304 23.6264578,6.87419354 28.1378694,11.3759202 C29.2186449,12.4533761 30.4035916,13.7897012 31.0115905,15.5318214 L30.0640338,15.8596559 C29.5241468,14.3094387 28.4293482,13.0800596 27.4297059,12.0825633 C25.434428,10.0915688 22.7810689,8.99612197 19.9574301,8.99612197 C17.1337912,8.99612197 14.4804321,10.0915688 12.4851542,12.0825633 C11.1870215,13.3779092 10.4037347,14.5423211 9.94498104,15.8596559 L9.94498104,15.8596559 Z'
              id='AWS-Simple-Queue-Service_Icon_32_Squid' fill='#FFFFFF'></path>
    </g>
</svg>"
+  }
+}
\ No newline at end of file
diff --git a/connectors/aws/aws-sqs/pom.xml b/connectors/aws/aws-sqs/pom.xml
index a4170297d2..0ba4cd8bbc 100644
--- a/connectors/aws/aws-sqs/pom.xml
+++ b/connectors/aws/aws-sqs/pom.xml
@@ -54,6 +54,7 @@
                   <templateFileName>aws-sqs-outbound-connector.json</templateFileName>
                 </file>
               </files>
+              <generateHybridTemplates>true</generateHybridTemplates>
             </connector>
             <connector>
               <connectorClass>io.camunda.connector.inbound.SqsExecutable</connectorClass>
diff --git a/connectors/google/google-drive/element-templates/hybrid/google-drive-outbound-connector-hybrid.json b/connectors/google/google-drive/element-templates/hybrid/google-drive-outbound-connector-hybrid.json
index 498f1d32ca..87ed5e93a7 100644
--- a/connectors/google/google-drive/element-templates/hybrid/google-drive-outbound-connector-hybrid.json
+++ b/connectors/google/google-drive/element-templates/hybrid/google-drive-outbound-connector-hybrid.json
@@ -1,7 +1,7 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "Google Drive Outbound Connector",
-  "id" : "io.camunda.connectors.GoogleDrive.v1",
+  "name" : "Hybrid Google Drive Outbound Connector",
+  "id" : "io.camunda.connectors.GoogleDrive.v1-hybrid",
   "description" : "Create folder or a file from template",
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/googledrive/",
   "version" : 3,
diff --git a/connectors/google/google-sheets/element-templates/hybrid/google-sheets-outbound-connector-hybrid.json b/connectors/google/google-sheets/element-templates/hybrid/google-sheets-outbound-connector-hybrid.json
index 85576443f7..805f3fe0d8 100644
--- a/connectors/google/google-sheets/element-templates/hybrid/google-sheets-outbound-connector-hybrid.json
+++ b/connectors/google/google-sheets/element-templates/hybrid/google-sheets-outbound-connector-hybrid.json
@@ -1,7 +1,7 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "Google Sheets Outbound Connector",
-  "id" : "io.camunda.connectors.GoogleSheets.v1",
+  "name" : "Hybrid Google Sheets Outbound Connector",
+  "id" : "io.camunda.connectors.GoogleSheets.v1-hybrid",
   "description" : "Work with spreadsheets",
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/google-sheets/",
   "version" : 3,
diff --git a/connectors/http/graphql/element-templates/graphql-outbound-connector-hybrid.json b/connectors/http/graphql/element-templates/hybrid/graphql-outbound-connector-hybrid.json
similarity index 97%
rename from connectors/http/graphql/element-templates/graphql-outbound-connector-hybrid.json
rename to connectors/http/graphql/element-templates/hybrid/graphql-outbound-connector-hybrid.json
index 9185f86d62..cec97f4251 100644
--- a/connectors/http/graphql/element-templates/graphql-outbound-connector-hybrid.json
+++ b/connectors/http/graphql/element-templates/hybrid/graphql-outbound-connector-hybrid.json
@@ -1,10 +1,10 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "GraphQL Outbound Connector",
-  "id" : "io.camunda.connectors.GraphQL.v1",
+  "name" : "Hybrid GraphQL Outbound Connector",
+  "id" : "io.camunda.connectors.GraphQL.v1-hybrid",
   "description" : "Execute GraphQL query",
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/protocol/graphql/",
-  "version" : 5,
+  "version" : 6,
   "category" : {
     "id" : "connectors",
     "name" : "Connectors"
@@ -198,11 +198,15 @@
     "type" : "String"
   }, {
     "id" : "authentication.oauthTokenEndpoint",
-    "label" : "Oauth token endpoint",
+    "label" : "OAuth 2.0 token endpoint",
     "description" : "The OAuth token endpoint",
     "optional" : false,
     "constraints" : {
-      "notEmpty" : true
+      "notEmpty" : true,
+      "pattern" : {
+        "value" : "^(=|http://|https://|secrets|\\{\\{).*$",
+        "message" : "Must be a http(s) URL"
+      }
     },
     "feel" : "optional",
     "group" : "authentication",
@@ -218,7 +222,7 @@
     "type" : "String"
   }, {
     "id" : "authentication.clientId",
-    "label" : "Client id",
+    "label" : "Client ID",
     "description" : "Your application's client ID from the OAuth client",
     "optional" : false,
     "constraints" : {
@@ -331,11 +335,11 @@
     },
     "type" : "Dropdown",
     "choices" : [ {
-      "name" : "POST",
-      "value" : "post"
-    }, {
       "name" : "GET",
       "value" : "get"
+    }, {
+      "name" : "POST",
+      "value" : "post"
     } ]
   }, {
     "id" : "graphql.url",
diff --git a/connectors/http/graphql/pom.xml b/connectors/http/graphql/pom.xml
index b76b725e43..e8f2c05ac8 100644
--- a/connectors/http/graphql/pom.xml
+++ b/connectors/http/graphql/pom.xml
@@ -80,6 +80,7 @@
                   <templateFileName>graphql-outbound-connector.json</templateFileName>
                 </file>
               </files>
+              <generateHybridTemplates>true</generateHybridTemplates>
             </connector>
           </connectors>
           <includeDependencies>
diff --git a/connectors/http/polling/element-templates/http-polling-connector-boundary.json b/connectors/http/polling/element-templates/http-polling-connector-boundary.json
index 91f8250626..f641f88c65 100644
--- a/connectors/http/polling/element-templates/http-polling-connector-boundary.json
+++ b/connectors/http/polling/element-templates/http-polling-connector-boundary.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
   "name": "HTTP Polling Boundary Catch Event Connector",
-  "id": "io.camunda.connectors.http.Polling",
+  "id": "io.camunda.connectors.http.Polling.Boundary",
   "version": 1,
   "description": "Polls endpoint at regular intervals",
   "icon": {
diff --git a/connectors/http/rest/element-templates/hybrid/http-json-connector-hybrid.json b/connectors/http/rest/element-templates/hybrid/http-json-connector-hybrid.json
index 2b56e0470c..75a0b94d3c 100644
--- a/connectors/http/rest/element-templates/hybrid/http-json-connector-hybrid.json
+++ b/connectors/http/rest/element-templates/hybrid/http-json-connector-hybrid.json
@@ -1,7 +1,7 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "REST Outbound Connector",
-  "id" : "io.camunda.connectors.HttpJson.v2",
+  "name" : "Hybrid REST Outbound Connector",
+  "id" : "io.camunda.connectors.HttpJson.v2-hybrid",
   "description" : "Invoke REST API",
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/protocol/rest/",
   "version" : 7,
diff --git a/connectors/jdbc/element-templates/hybrid/jdbc-outbound-connector-hybrid.json b/connectors/jdbc/element-templates/hybrid/jdbc-outbound-connector-hybrid.json
index 6afe0e5607..384485c84d 100644
--- a/connectors/jdbc/element-templates/hybrid/jdbc-outbound-connector-hybrid.json
+++ b/connectors/jdbc/element-templates/hybrid/jdbc-outbound-connector-hybrid.json
@@ -1,7 +1,7 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "SQL Database Connector",
-  "id" : "io.camunda.connectors.Jdbc.v1",
+  "name" : "Hybrid SQL Database Connector",
+  "id" : "io.camunda.connectors.Jdbc.v1-hybrid",
   "description" : "Read and write data from a Camunda process directly to a SQL database(Microsoft SQL Server, MySQL, PostgreSQL)",
   "documentationRef" : "https://docs.camunda.io/docs/next/components/connectors/out-of-the-box-connectors/sql",
   "version" : 1,
diff --git a/connectors/kafka/element-templates/hybrid/kafka-boundary-event-connector-hybrid.json b/connectors/kafka/element-templates/hybrid/kafka-boundary-event-connector-hybrid.json
deleted file mode 100644
index bed6b8d818..0000000000
--- a/connectors/kafka/element-templates/hybrid/kafka-boundary-event-connector-hybrid.json
+++ /dev/null
@@ -1,307 +0,0 @@
-{
-  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "Kafka Boundary Event Connector",
-  "id" : "io.camunda.connectors.inbound.KafkaBoundary.v1",
-  "description" : "Consume Kafka messages",
-  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/kafka/?kafka=inbound",
-  "version" : 5,
-  "category" : {
-    "id" : "connectors",
-    "name" : "Connectors"
-  },
-  "appliesTo" : [ "bpmn:BoundaryEvent" ],
-  "elementType" : {
-    "value" : "bpmn:BoundaryEvent",
-    "eventDefinition" : "bpmn:MessageEventDefinition"
-  },
-  "groups" : [ {
-    "id" : "connectorType",
-    "label" : "Connector type"
-  }, {
-    "id" : "authentication",
-    "label" : "Authentication"
-  }, {
-    "id" : "kafka",
-    "label" : "Kafka"
-  }, {
-    "id" : "message",
-    "label" : "Message deserialization"
-  }, {
-    "id" : "activation",
-    "label" : "Activation"
-  }, {
-    "id" : "correlation",
-    "label" : "Correlation"
-  }, {
-    "id" : "output",
-    "label" : "Output mapping"
-  } ],
-  "properties" : [ {
-    "id" : "connectorType",
-    "value" : "io.camunda:connector-kafka-inbound:1",
-    "group" : "connectorType",
-    "binding" : {
-      "name" : "inbound.type",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "authenticationType",
-    "label" : "Authentication type",
-    "description" : "Username/password or custom",
-    "optional" : false,
-    "value" : "credentials",
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "group" : "authentication",
-    "binding" : {
-      "name" : "authenticationType",
-      "type" : "zeebe:property"
-    },
-    "type" : "Dropdown",
-    "choices" : [ {
-      "name" : "Credentials",
-      "value" : "credentials"
-    }, {
-      "name" : "Custom",
-      "value" : "custom"
-    } ]
-  }, {
-    "id" : "authentication.username",
-    "label" : "Username",
-    "description" : "Provide the username (must have permissions to produce message to the topic)",
-    "optional" : true,
-    "group" : "authentication",
-    "binding" : {
-      "name" : "authentication.username",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "authentication.password",
-    "label" : "Password",
-    "description" : "Provide a password for the user",
-    "optional" : true,
-    "group" : "authentication",
-    "binding" : {
-      "name" : "authentication.password",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "serializationType",
-    "label" : "Deserialization type",
-    "description" : "Select the deserialization type. For details, visit the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/kafka/?kafka=inbound\" target=\"_blank\">documentation</a>",
-    "optional" : false,
-    "value" : "json",
-    "group" : "kafka",
-    "binding" : {
-      "name" : "serializationType",
-      "type" : "zeebe:property"
-    },
-    "type" : "Dropdown",
-    "choices" : [ {
-      "name" : "Default (JSON)",
-      "value" : "json"
-    }, {
-      "name" : "AVRO (experimental)",
-      "value" : "avro"
-    } ]
-  }, {
-    "id" : "topic.bootstrapServers",
-    "label" : "Bootstrap servers",
-    "description" : "Provide bootstrap server(s), comma-delimited if there are multiple",
-    "optional" : false,
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "group" : "kafka",
-    "binding" : {
-      "name" : "topic.bootstrapServers",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "topic.topicName",
-    "label" : "Topic",
-    "description" : "Provide topic name",
-    "optional" : false,
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "group" : "kafka",
-    "binding" : {
-      "name" : "topic.topicName",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "groupId",
-    "label" : "Consumer Group ID",
-    "description" : "Provide the consumer group ID used by the connector. Leave empty for an automatically generated one",
-    "optional" : false,
-    "group" : "kafka",
-    "binding" : {
-      "name" : "groupId",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "additionalProperties",
-    "label" : "Additional properties",
-    "description" : "Provide additional Kafka consumer properties in JSON",
-    "optional" : true,
-    "feel" : "required",
-    "group" : "kafka",
-    "binding" : {
-      "name" : "additionalProperties",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "offsets",
-    "label" : "Offsets",
-    "description" : "List of offsets, e.g. '10' or '=[10, 23]'. If specified, it has to have the same number of values as the number of partitions",
-    "optional" : false,
-    "feel" : "optional",
-    "group" : "kafka",
-    "binding" : {
-      "name" : "offsets",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "autoOffsetReset",
-    "label" : "Auto offset reset",
-    "description" : "What to do when there is no initial offset in Kafka or if the current offset does not exist any more on the server. You should only select none if you specified the offsets",
-    "optional" : false,
-    "value" : "latest",
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "group" : "kafka",
-    "binding" : {
-      "name" : "autoOffsetReset",
-      "type" : "zeebe:property"
-    },
-    "type" : "Dropdown",
-    "choices" : [ {
-      "name" : "None",
-      "value" : "none"
-    }, {
-      "name" : "Latest",
-      "value" : "latest"
-    }, {
-      "name" : "Earliest",
-      "value" : "earliest"
-    } ]
-  }, {
-    "id" : "avro.schema",
-    "label" : "Avro schema",
-    "description" : "Avro schema for the message value",
-    "optional" : false,
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "feel" : "required",
-    "group" : "message",
-    "binding" : {
-      "name" : "avro.schema",
-      "type" : "zeebe:property"
-    },
-    "condition" : {
-      "property" : "serializationType",
-      "equals" : "avro",
-      "type" : "simple"
-    },
-    "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" : "correlationKeyProcess",
-    "label" : "Correlation key (process)",
-    "description" : "Sets up the correlation key from process variables",
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "feel" : "required",
-    "group" : "correlation",
-    "binding" : {
-      "name" : "correlationKey",
-      "type" : "bpmn:Message#zeebe:subscription#property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "correlationKeyPayload",
-    "label" : "Correlation key (payload)",
-    "description" : "Extracts the correlation key from the incoming message payload",
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "feel" : "required",
-    "group" : "correlation",
-    "binding" : {
-      "name" : "correlationKeyExpression",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "messageIdExpression",
-    "label" : "Message ID expression",
-    "description" : "Expression to extract unique identifier of a message",
-    "optional" : true,
-    "feel" : "required",
-    "group" : "correlation",
-    "binding" : {
-      "name" : "messageIdExpression",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "messageNameUuid",
-    "generatedValue" : {
-      "type" : "uuid"
-    },
-    "group" : "correlation",
-    "binding" : {
-      "name" : "name",
-      "type" : "bpmn:Message#property"
-    },
-    "type" : "Hidden"
-  }, {
-    "id" : "resultVariable",
-    "label" : "Result variable",
-    "description" : "Name of variable to store the response in",
-    "group" : "output",
-    "binding" : {
-      "name" : "resultVariable",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "resultExpression",
-    "label" : "Result expression",
-    "description" : "Expression to map the response into process variables",
-    "feel" : "required",
-    "group" : "output",
-    "binding" : {
-      "name" : "resultExpression",
-      "type" : "zeebe:property"
-    },
-    "type" : "Text"
-  } ],
-  "icon" : {
-    "contents" : "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCAyNTYgNDE2JyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHByZXNlcnZlQXNwZWN0UmF0aW89J3hNaWRZTWlkJz4KICAgIDxwYXRoIGQ9J00yMDEuODE2IDIzMC4yMTZjLTE2LjE4NiAwLTMwLjY5NyA3LjE3MS00MC42MzQgMTguNDYxbC0yNS40NjMtMTguMDI2YzIuNzAzLTcuNDQyIDQuMjU1LTE1LjQzMyA0LjI1NS0yMy43OTcgMC04LjIxOS0xLjQ5OC0xNi4wNzYtNC4xMTItMjMuNDA4bDI1LjQwNi0xNy44MzVjOS45MzYgMTEuMjMzIDI0LjQwOSAxOC4zNjUgNDAuNTQ4IDE4LjM2NSAyOS44NzUgMCA1NC4xODQtMjQuMzA1IDU0LjE4NC01NC4xODQgMC0yOS44NzktMjQuMzA5LTU0LjE4NC01NC4xODQtNTQuMTg0LTI5Ljg3NSAwLTU0LjE4NCAyNC4zMDUtNTQuMTg0IDU0LjE4NCAwIDUuMzQ4LjgwOCAxMC41MDUgMi4yNTggMTUuMzg5bC0yNS40MjMgMTcuODQ0Yy0xMC42Mi0xMy4xNzUtMjUuOTExLTIyLjM3NC00My4zMzMtMjUuMTgydi0zMC42NGMyNC41NDQtNS4xNTUgNDMuMDM3LTI2Ljk2MiA0My4wMzctNTMuMDE5QzEyNC4xNzEgMjQuMzA1IDk5Ljg2MiAwIDY5Ljk4NyAwIDQwLjExMiAwIDE1LjgwMyAyNC4zMDUgMTUuODAzIDU0LjE4NGMwIDI1LjcwOCAxOC4wMTQgNDcuMjQ2IDQyLjA2NyA1Mi43Njl2MzEuMDM4QzI1LjA0NCAxNDMuNzUzIDAgMTcyLjQwMSAwIDIwNi44NTRjMCAzNC42MjEgMjUuMjkyIDYzLjM3NCA1OC4zNTUgNjguOTR2MzIuNzc0Yy0yNC4yOTkgNS4zNDEtNDIuNTUyIDI3LjAxMS00Mi41NTIgNTIuODk0IDAgMjkuODc5IDI0LjMwOSA1NC4xODQgNTQuMTg0IDU0LjE4NCAyOS44NzUgMCA1NC4xODQtMjQuMzA1IDU0LjE4NC01NC4xODQgMC0yNS44ODMtMTguMjUzLTQ3LjU1My00Mi41NTItNTIuODk0di0zMi43NzVhNjkuOTY1IDY5Ljk2NSAwIDAgMCA0Mi42LTI0Ljc3NmwyNS42MzMgMTguMTQzYy0xLjQyMyA0Ljg0LTIuMjIgOS45NDYtMi4yMiAxNS4yNCAwIDI5Ljg3OSAyNC4zMDkgNTQuMTg0IDU0LjE4NCA1NC4xODQgMjkuODc1IDAgNTQuMTg0LTI0LjMwNSA1NC4xODQtNTQuMTg0IDAtMjkuODc5LTI0LjMwOS01NC4xODQtNTQuMTg0LTU0LjE4NHptMC0xMjYuNjk1YzE0LjQ4NyAwIDI2LjI3IDExLjc4OCAyNi4yNyAyNi4yNzFzLTExLjc4MyAyNi4yNy0yNi4yNyAyNi4yNy0yNi4yNy0xMS43ODctMjYuMjctMjYuMjdjMC0xNC40ODMgMTEuNzgzLTI2LjI3MSAyNi4yNy0yNi4yNzF6bS0xNTguMS00OS4zMzdjMC0xNC40ODMgMTEuNzg0LTI2LjI3IDI2LjI3MS0yNi4yN3MyNi4yNyAxMS43ODcgMjYuMjcgMjYuMjdjMCAxNC40ODMtMTEuNzgzIDI2LjI3LTI2LjI3IDI2LjI3cy0yNi4yNzEtMTEuNzg3LTI2LjI3MS0yNi4yN3ptNTIuNTQxIDMwNy4yNzhjMCAxNC40ODMtMTEuNzgzIDI2LjI3LTI2LjI3IDI2LjI3cy0yNi4yNzEtMTEuNzg3LTI2LjI3MS0yNi4yN2MwLTE0LjQ4MyAxMS43ODQtMjYuMjcgMjYuMjcxLTI2LjI3czI2LjI3IDExLjc4NyAyNi4yNyAyNi4yN3ptLTI2LjI3Mi0xMTcuOTdjLTIwLjIwNSAwLTM2LjY0Mi0xNi40MzQtMzYuNjQyLTM2LjYzOCAwLTIwLjIwNSAxNi40MzctMzYuNjQyIDM2LjY0Mi0zNi42NDIgMjAuMjA0IDAgMzYuNjQxIDE2LjQzNyAzNi42NDEgMzYuNjQyIDAgMjAuMjA0LTE2LjQzNyAzNi42MzgtMzYuNjQxIDM2LjYzOHptMTMxLjgzMSA2Ny4xNzljLTE0LjQ4NyAwLTI2LjI3LTExLjc4OC0yNi4yNy0yNi4yNzFzMTEuNzgzLTI2LjI3IDI2LjI3LTI2LjI3IDI2LjI3IDExLjc4NyAyNi4yNyAyNi4yN2MwIDE0LjQ4My0xMS43ODMgMjYuMjcxLTI2LjI3IDI2LjI3MXonCiAgICAgICAgICBzdHlsZT0nZmlsbDojMjMxZjIwJy8+Cjwvc3ZnPg=="
-  }
-}
\ No newline at end of file
diff --git a/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-boundary-hybrid.json b/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-boundary-hybrid.json
index 066aaa856d..90567e14ca 100644
--- a/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-boundary-hybrid.json
+++ b/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-boundary-hybrid.json
@@ -1,7 +1,7 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "Kafka Boundary Event Connector",
-  "id" : "io.camunda.connectors.inbound.KafkaBoundary.v1",
+  "name" : "Hybrid Kafka Boundary Event Connector",
+  "id" : "io.camunda.connectors.inbound.KafkaBoundary.v1-hybrid",
   "description" : "Consume Kafka messages",
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/kafka/?kafka=inbound",
   "version" : 5,
@@ -142,7 +142,7 @@
     "type" : "String"
   }, {
     "id" : "groupId",
-    "label" : "Consumer Group ID",
+    "label" : "Consumer group ID",
     "description" : "Provide the consumer group ID used by the connector. Leave empty for an automatically generated one",
     "optional" : false,
     "group" : "kafka",
diff --git a/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-intermediate-hybrid.json b/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-intermediate-hybrid.json
index 98cb917f45..6d891efe82 100644
--- a/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-intermediate-hybrid.json
+++ b/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-intermediate-hybrid.json
@@ -1,7 +1,7 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "Kafka Intermediate Catch Event Connector",
-  "id" : "io.camunda.connectors.inbound.KafkaIntermediate.v1",
+  "name" : "Hybrid Kafka Intermediate Catch Event Connector",
+  "id" : "io.camunda.connectors.inbound.KafkaIntermediate.v1-hybrid",
   "description" : "Consume Kafka messages",
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/kafka/?kafka=inbound",
   "version" : 5,
@@ -142,7 +142,7 @@
     "type" : "String"
   }, {
     "id" : "groupId",
-    "label" : "Consumer Group ID",
+    "label" : "Consumer group ID",
     "description" : "Provide the consumer group ID used by the connector. Leave empty for an automatically generated one",
     "optional" : false,
     "group" : "kafka",
diff --git a/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-start-event-hybrid.json b/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-start-event-hybrid.json
index 5e05261dbf..3999e54a49 100644
--- a/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-start-event-hybrid.json
+++ b/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-start-event-hybrid.json
@@ -1,7 +1,7 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "Kafka Start Event Connector",
-  "id" : "io.camunda.connectors.inbound.KAFKA.v1",
+  "name" : "Hybrid Kafka Start Event Connector",
+  "id" : "io.camunda.connectors.inbound.KAFKA.v1-hybrid",
   "description" : "Consume Kafka messages",
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/kafka/?kafka=inbound",
   "version" : 5,
@@ -138,7 +138,7 @@
     "type" : "String"
   }, {
     "id" : "groupId",
-    "label" : "Consumer Group ID",
+    "label" : "Consumer group ID",
     "description" : "Provide the consumer group ID used by the connector. Leave empty for an automatically generated one",
     "optional" : false,
     "group" : "kafka",
diff --git a/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-start-message-hybrid.json b/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-start-message-hybrid.json
index 596a838d04..0eb16cccf1 100644
--- a/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-start-message-hybrid.json
+++ b/connectors/kafka/element-templates/hybrid/kafka-inbound-connector-start-message-hybrid.json
@@ -1,7 +1,7 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "Kafka Message Start Event Connector",
-  "id" : "io.camunda.connectors.inbound.KafkaMessageStart.v1",
+  "name" : "Hybrid Kafka Message Start Event Connector",
+  "id" : "io.camunda.connectors.inbound.KafkaMessageStart.v1-hybrid",
   "description" : "Consume Kafka messages",
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/kafka/?kafka=inbound",
   "version" : 5,
@@ -142,7 +142,7 @@
     "type" : "String"
   }, {
     "id" : "groupId",
-    "label" : "Consumer Group ID",
+    "label" : "Consumer group ID",
     "description" : "Provide the consumer group ID used by the connector. Leave empty for an automatically generated one",
     "optional" : false,
     "group" : "kafka",
diff --git a/connectors/kafka/element-templates/hybrid/kafka-outbound-connector-hybrid.json b/connectors/kafka/element-templates/hybrid/kafka-outbound-connector-hybrid.json
index 31bf603df5..d838d11edc 100644
--- a/connectors/kafka/element-templates/hybrid/kafka-outbound-connector-hybrid.json
+++ b/connectors/kafka/element-templates/hybrid/kafka-outbound-connector-hybrid.json
@@ -1,7 +1,7 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "Kafka Outbound Connector",
-  "id" : "io.camunda.connectors.KAFKA.v1",
+  "name" : "Hybrid Kafka Outbound Connector",
+  "id" : "io.camunda.connectors.KAFKA.v1-hybrid",
   "description" : "Produce Kafka message",
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/kafka/?kafka=outbound",
   "version" : 4,
diff --git a/connectors/kafka/element-templates/kafka-boundary-event-connector.json b/connectors/kafka/element-templates/kafka-boundary-event-connector.json
deleted file mode 100644
index a0d53a5f48..0000000000
--- a/connectors/kafka/element-templates/kafka-boundary-event-connector.json
+++ /dev/null
@@ -1,302 +0,0 @@
-{
-  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "Kafka Boundary Event Connector",
-  "id" : "io.camunda.connectors.inbound.KafkaBoundary.v1",
-  "description" : "Consume Kafka messages",
-  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/kafka/?kafka=inbound",
-  "version" : 5,
-  "category" : {
-    "id" : "connectors",
-    "name" : "Connectors"
-  },
-  "appliesTo" : [ "bpmn:BoundaryEvent" ],
-  "elementType" : {
-    "value" : "bpmn:BoundaryEvent",
-    "eventDefinition" : "bpmn:MessageEventDefinition"
-  },
-  "groups" : [ {
-    "id" : "authentication",
-    "label" : "Authentication"
-  }, {
-    "id" : "kafka",
-    "label" : "Kafka"
-  }, {
-    "id" : "message",
-    "label" : "Message deserialization"
-  }, {
-    "id" : "activation",
-    "label" : "Activation"
-  }, {
-    "id" : "correlation",
-    "label" : "Correlation"
-  }, {
-    "id" : "output",
-    "label" : "Output mapping"
-  } ],
-  "properties" : [ {
-    "value" : "io.camunda:connector-kafka-inbound:1",
-    "binding" : {
-      "name" : "inbound.type",
-      "type" : "zeebe:property"
-    },
-    "type" : "Hidden"
-  }, {
-    "id" : "authenticationType",
-    "label" : "Authentication type",
-    "description" : "Username/password or custom",
-    "optional" : false,
-    "value" : "credentials",
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "group" : "authentication",
-    "binding" : {
-      "name" : "authenticationType",
-      "type" : "zeebe:property"
-    },
-    "type" : "Dropdown",
-    "choices" : [ {
-      "name" : "Credentials",
-      "value" : "credentials"
-    }, {
-      "name" : "Custom",
-      "value" : "custom"
-    } ]
-  }, {
-    "id" : "authentication.username",
-    "label" : "Username",
-    "description" : "Provide the username (must have permissions to produce message to the topic)",
-    "optional" : true,
-    "group" : "authentication",
-    "binding" : {
-      "name" : "authentication.username",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "authentication.password",
-    "label" : "Password",
-    "description" : "Provide a password for the user",
-    "optional" : true,
-    "group" : "authentication",
-    "binding" : {
-      "name" : "authentication.password",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "serializationType",
-    "label" : "Deserialization type",
-    "description" : "Select the deserialization type. For details, visit the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/kafka/?kafka=inbound\" target=\"_blank\">documentation</a>",
-    "optional" : false,
-    "value" : "json",
-    "group" : "kafka",
-    "binding" : {
-      "name" : "serializationType",
-      "type" : "zeebe:property"
-    },
-    "type" : "Dropdown",
-    "choices" : [ {
-      "name" : "Default (JSON)",
-      "value" : "json"
-    }, {
-      "name" : "AVRO (experimental)",
-      "value" : "avro"
-    } ]
-  }, {
-    "id" : "topic.bootstrapServers",
-    "label" : "Bootstrap servers",
-    "description" : "Provide bootstrap server(s), comma-delimited if there are multiple",
-    "optional" : false,
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "group" : "kafka",
-    "binding" : {
-      "name" : "topic.bootstrapServers",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "topic.topicName",
-    "label" : "Topic",
-    "description" : "Provide topic name",
-    "optional" : false,
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "group" : "kafka",
-    "binding" : {
-      "name" : "topic.topicName",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "groupId",
-    "label" : "Consumer Group ID",
-    "description" : "Provide the consumer group ID used by the connector. Leave empty for an automatically generated one",
-    "optional" : false,
-    "group" : "kafka",
-    "binding" : {
-      "name" : "groupId",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "additionalProperties",
-    "label" : "Additional properties",
-    "description" : "Provide additional Kafka consumer properties in JSON",
-    "optional" : true,
-    "feel" : "required",
-    "group" : "kafka",
-    "binding" : {
-      "name" : "additionalProperties",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "offsets",
-    "label" : "Offsets",
-    "description" : "List of offsets, e.g. '10' or '=[10, 23]'. If specified, it has to have the same number of values as the number of partitions",
-    "optional" : false,
-    "feel" : "optional",
-    "group" : "kafka",
-    "binding" : {
-      "name" : "offsets",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "autoOffsetReset",
-    "label" : "Auto offset reset",
-    "description" : "What to do when there is no initial offset in Kafka or if the current offset does not exist any more on the server. You should only select none if you specified the offsets",
-    "optional" : false,
-    "value" : "latest",
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "group" : "kafka",
-    "binding" : {
-      "name" : "autoOffsetReset",
-      "type" : "zeebe:property"
-    },
-    "type" : "Dropdown",
-    "choices" : [ {
-      "name" : "None",
-      "value" : "none"
-    }, {
-      "name" : "Latest",
-      "value" : "latest"
-    }, {
-      "name" : "Earliest",
-      "value" : "earliest"
-    } ]
-  }, {
-    "id" : "avro.schema",
-    "label" : "Avro schema",
-    "description" : "Avro schema for the message value",
-    "optional" : false,
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "feel" : "required",
-    "group" : "message",
-    "binding" : {
-      "name" : "avro.schema",
-      "type" : "zeebe:property"
-    },
-    "condition" : {
-      "property" : "serializationType",
-      "equals" : "avro",
-      "type" : "simple"
-    },
-    "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" : "correlationKeyProcess",
-    "label" : "Correlation key (process)",
-    "description" : "Sets up the correlation key from process variables",
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "feel" : "required",
-    "group" : "correlation",
-    "binding" : {
-      "name" : "correlationKey",
-      "type" : "bpmn:Message#zeebe:subscription#property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "correlationKeyPayload",
-    "label" : "Correlation key (payload)",
-    "description" : "Extracts the correlation key from the incoming message payload",
-    "constraints" : {
-      "notEmpty" : true
-    },
-    "feel" : "required",
-    "group" : "correlation",
-    "binding" : {
-      "name" : "correlationKeyExpression",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "messageIdExpression",
-    "label" : "Message ID expression",
-    "description" : "Expression to extract unique identifier of a message",
-    "optional" : true,
-    "feel" : "required",
-    "group" : "correlation",
-    "binding" : {
-      "name" : "messageIdExpression",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "messageNameUuid",
-    "generatedValue" : {
-      "type" : "uuid"
-    },
-    "group" : "correlation",
-    "binding" : {
-      "name" : "name",
-      "type" : "bpmn:Message#property"
-    },
-    "type" : "Hidden"
-  }, {
-    "id" : "resultVariable",
-    "label" : "Result variable",
-    "description" : "Name of variable to store the response in",
-    "group" : "output",
-    "binding" : {
-      "name" : "resultVariable",
-      "type" : "zeebe:property"
-    },
-    "type" : "String"
-  }, {
-    "id" : "resultExpression",
-    "label" : "Result expression",
-    "description" : "Expression to map the response into process variables",
-    "feel" : "required",
-    "group" : "output",
-    "binding" : {
-      "name" : "resultExpression",
-      "type" : "zeebe:property"
-    },
-    "type" : "Text"
-  } ],
-  "icon" : {
-    "contents" : "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCAyNTYgNDE2JyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHByZXNlcnZlQXNwZWN0UmF0aW89J3hNaWRZTWlkJz4KICAgIDxwYXRoIGQ9J00yMDEuODE2IDIzMC4yMTZjLTE2LjE4NiAwLTMwLjY5NyA3LjE3MS00MC42MzQgMTguNDYxbC0yNS40NjMtMTguMDI2YzIuNzAzLTcuNDQyIDQuMjU1LTE1LjQzMyA0LjI1NS0yMy43OTcgMC04LjIxOS0xLjQ5OC0xNi4wNzYtNC4xMTItMjMuNDA4bDI1LjQwNi0xNy44MzVjOS45MzYgMTEuMjMzIDI0LjQwOSAxOC4zNjUgNDAuNTQ4IDE4LjM2NSAyOS44NzUgMCA1NC4xODQtMjQuMzA1IDU0LjE4NC01NC4xODQgMC0yOS44NzktMjQuMzA5LTU0LjE4NC01NC4xODQtNTQuMTg0LTI5Ljg3NSAwLTU0LjE4NCAyNC4zMDUtNTQuMTg0IDU0LjE4NCAwIDUuMzQ4LjgwOCAxMC41MDUgMi4yNTggMTUuMzg5bC0yNS40MjMgMTcuODQ0Yy0xMC42Mi0xMy4xNzUtMjUuOTExLTIyLjM3NC00My4zMzMtMjUuMTgydi0zMC42NGMyNC41NDQtNS4xNTUgNDMuMDM3LTI2Ljk2MiA0My4wMzctNTMuMDE5QzEyNC4xNzEgMjQuMzA1IDk5Ljg2MiAwIDY5Ljk4NyAwIDQwLjExMiAwIDE1LjgwMyAyNC4zMDUgMTUuODAzIDU0LjE4NGMwIDI1LjcwOCAxOC4wMTQgNDcuMjQ2IDQyLjA2NyA1Mi43Njl2MzEuMDM4QzI1LjA0NCAxNDMuNzUzIDAgMTcyLjQwMSAwIDIwNi44NTRjMCAzNC42MjEgMjUuMjkyIDYzLjM3NCA1OC4zNTUgNjguOTR2MzIuNzc0Yy0yNC4yOTkgNS4zNDEtNDIuNTUyIDI3LjAxMS00Mi41NTIgNTIuODk0IDAgMjkuODc5IDI0LjMwOSA1NC4xODQgNTQuMTg0IDU0LjE4NCAyOS44NzUgMCA1NC4xODQtMjQuMzA1IDU0LjE4NC01NC4xODQgMC0yNS44ODMtMTguMjUzLTQ3LjU1My00Mi41NTItNTIuODk0di0zMi43NzVhNjkuOTY1IDY5Ljk2NSAwIDAgMCA0Mi42LTI0Ljc3NmwyNS42MzMgMTguMTQzYy0xLjQyMyA0Ljg0LTIuMjIgOS45NDYtMi4yMiAxNS4yNCAwIDI5Ljg3OSAyNC4zMDkgNTQuMTg0IDU0LjE4NCA1NC4xODQgMjkuODc1IDAgNTQuMTg0LTI0LjMwNSA1NC4xODQtNTQuMTg0IDAtMjkuODc5LTI0LjMwOS01NC4xODQtNTQuMTg0LTU0LjE4NHptMC0xMjYuNjk1YzE0LjQ4NyAwIDI2LjI3IDExLjc4OCAyNi4yNyAyNi4yNzFzLTExLjc4MyAyNi4yNy0yNi4yNyAyNi4yNy0yNi4yNy0xMS43ODctMjYuMjctMjYuMjdjMC0xNC40ODMgMTEuNzgzLTI2LjI3MSAyNi4yNy0yNi4yNzF6bS0xNTguMS00OS4zMzdjMC0xNC40ODMgMTEuNzg0LTI2LjI3IDI2LjI3MS0yNi4yN3MyNi4yNyAxMS43ODcgMjYuMjcgMjYuMjdjMCAxNC40ODMtMTEuNzgzIDI2LjI3LTI2LjI3IDI2LjI3cy0yNi4yNzEtMTEuNzg3LTI2LjI3MS0yNi4yN3ptNTIuNTQxIDMwNy4yNzhjMCAxNC40ODMtMTEuNzgzIDI2LjI3LTI2LjI3IDI2LjI3cy0yNi4yNzEtMTEuNzg3LTI2LjI3MS0yNi4yN2MwLTE0LjQ4MyAxMS43ODQtMjYuMjcgMjYuMjcxLTI2LjI3czI2LjI3IDExLjc4NyAyNi4yNyAyNi4yN3ptLTI2LjI3Mi0xMTcuOTdjLTIwLjIwNSAwLTM2LjY0Mi0xNi40MzQtMzYuNjQyLTM2LjYzOCAwLTIwLjIwNSAxNi40MzctMzYuNjQyIDM2LjY0Mi0zNi42NDIgMjAuMjA0IDAgMzYuNjQxIDE2LjQzNyAzNi42NDEgMzYuNjQyIDAgMjAuMjA0LTE2LjQzNyAzNi42MzgtMzYuNjQxIDM2LjYzOHptMTMxLjgzMSA2Ny4xNzljLTE0LjQ4NyAwLTI2LjI3LTExLjc4OC0yNi4yNy0yNi4yNzFzMTEuNzgzLTI2LjI3IDI2LjI3LTI2LjI3IDI2LjI3IDExLjc4NyAyNi4yNyAyNi4yN2MwIDE0LjQ4My0xMS43ODMgMjYuMjcxLTI2LjI3IDI2LjI3MXonCiAgICAgICAgICBzdHlsZT0nZmlsbDojMjMxZjIwJy8+Cjwvc3ZnPg=="
-  }
-}
\ No newline at end of file
diff --git a/connectors/kafka/element-templates/kafka-inbound-connector-boundary.json b/connectors/kafka/element-templates/kafka-inbound-connector-boundary.json
index 88e7e7810e..ceb0141c3f 100644
--- a/connectors/kafka/element-templates/kafka-inbound-connector-boundary.json
+++ b/connectors/kafka/element-templates/kafka-inbound-connector-boundary.json
@@ -137,7 +137,7 @@
     "type" : "String"
   }, {
     "id" : "groupId",
-    "label" : "Consumer Group ID",
+    "label" : "Consumer group ID",
     "description" : "Provide the consumer group ID used by the connector. Leave empty for an automatically generated one",
     "optional" : false,
     "group" : "kafka",
diff --git a/connectors/kafka/element-templates/kafka-inbound-connector-intermediate.json b/connectors/kafka/element-templates/kafka-inbound-connector-intermediate.json
index dcb62b1628..fcd767ebbb 100644
--- a/connectors/kafka/element-templates/kafka-inbound-connector-intermediate.json
+++ b/connectors/kafka/element-templates/kafka-inbound-connector-intermediate.json
@@ -137,7 +137,7 @@
     "type" : "String"
   }, {
     "id" : "groupId",
-    "label" : "Consumer Group ID",
+    "label" : "Consumer group ID",
     "description" : "Provide the consumer group ID used by the connector. Leave empty for an automatically generated one",
     "optional" : false,
     "group" : "kafka",
diff --git a/connectors/kafka/element-templates/kafka-inbound-connector-start-event.json b/connectors/kafka/element-templates/kafka-inbound-connector-start-event.json
index abc72f469d..ded8013d09 100644
--- a/connectors/kafka/element-templates/kafka-inbound-connector-start-event.json
+++ b/connectors/kafka/element-templates/kafka-inbound-connector-start-event.json
@@ -133,7 +133,7 @@
     "type" : "String"
   }, {
     "id" : "groupId",
-    "label" : "Consumer Group ID",
+    "label" : "Consumer group ID",
     "description" : "Provide the consumer group ID used by the connector. Leave empty for an automatically generated one",
     "optional" : false,
     "group" : "kafka",
diff --git a/connectors/kafka/element-templates/kafka-inbound-connector-start-message.json b/connectors/kafka/element-templates/kafka-inbound-connector-start-message.json
index 6633c2220c..21eb734aee 100644
--- a/connectors/kafka/element-templates/kafka-inbound-connector-start-message.json
+++ b/connectors/kafka/element-templates/kafka-inbound-connector-start-message.json
@@ -137,7 +137,7 @@
     "type" : "String"
   }, {
     "id" : "groupId",
-    "label" : "Consumer Group ID",
+    "label" : "Consumer group ID",
     "description" : "Provide the consumer group ID used by the connector. Leave empty for an automatically generated one",
     "optional" : false,
     "group" : "kafka",
diff --git a/connectors/kafka/src/main/java/io/camunda/connector/kafka/inbound/KafkaConnectorProperties.java b/connectors/kafka/src/main/java/io/camunda/connector/kafka/inbound/KafkaConnectorProperties.java
index 4c075236ca..ec787db639 100644
--- a/connectors/kafka/src/main/java/io/camunda/connector/kafka/inbound/KafkaConnectorProperties.java
+++ b/connectors/kafka/src/main/java/io/camunda/connector/kafka/inbound/KafkaConnectorProperties.java
@@ -53,7 +53,7 @@ public record KafkaConnectorProperties(
     @Valid @NotNull KafkaTopic topic,
     @TemplateProperty(
             group = "kafka",
-            label = "Consumer Group ID",
+            label = "Consumer group ID",
             description =
                 "Provide the consumer group ID used by the connector. Leave empty for an automatically generated one")
         String groupId,
diff --git a/connectors/microsoft-teams/element-templates/hybrid/microsoft-teams-outbound-connector-hybrid.json b/connectors/microsoft-teams/element-templates/hybrid/microsoft-teams-outbound-connector-hybrid.json
index 507fec2ebc..20206a9dbe 100644
--- a/connectors/microsoft-teams/element-templates/hybrid/microsoft-teams-outbound-connector-hybrid.json
+++ b/connectors/microsoft-teams/element-templates/hybrid/microsoft-teams-outbound-connector-hybrid.json
@@ -1,7 +1,7 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "Microsoft Teams Outbound Connector",
-  "id" : "io.camunda.connectors.MSTeams.v1",
+  "name" : "Hybrid Microsoft Teams Outbound Connector",
+  "id" : "io.camunda.connectors.MSTeams.v1-hybrid",
   "description" : "Create, update, and send a message to your Microsoft Teams",
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/microsoft-teams/",
   "version" : 3,
diff --git a/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-boundary-hybrid.json b/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-boundary-hybrid.json
new file mode 100644
index 0000000000..e9d693d993
--- /dev/null
+++ b/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-boundary-hybrid.json
@@ -0,0 +1,388 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid RabbitMQ Boundary Event Connector",
+  "id" : "io.camunda.connectors.inbound.RabbitMQ.Boundary.v1-hybrid",
+  "description" : "Receive a message from RabbitMQ",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound",
+  "version" : 7,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:BoundaryEvent" ],
+  "elementType" : {
+    "value" : "bpmn:BoundaryEvent",
+    "eventDefinition" : "bpmn:MessageEventDefinition"
+  },
+  "groups" : [ {
+    "id" : "connectorType",
+    "label" : "Connector type"
+  }, {
+    "id" : "authentication",
+    "label" : "Authentication"
+  }, {
+    "id" : "routing",
+    "label" : "Routing"
+  }, {
+    "id" : "subscription",
+    "label" : "Subscription"
+  }, {
+    "id" : "activation",
+    "label" : "Activation"
+  }, {
+    "id" : "correlation",
+    "label" : "Correlation"
+  }, {
+    "id" : "deduplication",
+    "label" : "Deduplication",
+    "tooltip" : "Deduplication allows you to configure multiple inbound connector elements to reuse the same backend (consumer/thread/endpoint) by sharing the same deduplication ID."
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  } ],
+  "properties" : [ {
+    "id" : "connectorType",
+    "value" : "io.camunda:connector-rabbitmq-inbound:1",
+    "group" : "connectorType",
+    "binding" : {
+      "name" : "inbound.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.authType",
+    "label" : "Connection type",
+    "value" : "uri",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.authType",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "URI",
+      "value" : "uri"
+    }, {
+      "name" : "Username/Password",
+      "value" : "credentials"
+    } ]
+  }, {
+    "id" : "authentication.uri",
+    "label" : "URI",
+    "description" : "URI should contain username, password, host name, port number, and virtual host",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true,
+      "pattern" : {
+        "value" : "^(=|amqps?://|secrets|\\{\\{).*$",
+        "message" : "Must start with amqp(s):// or contain a secret reference"
+      }
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.uri",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "uri",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.userName",
+    "label" : "Username",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.userName",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.password",
+    "label" : "Password",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.password",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "routing.virtualHost",
+    "label" : "Virtual host",
+    "description" : "Virtual name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "routing",
+    "binding" : {
+      "name" : "routing.virtualHost",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "routing.hostName",
+    "label" : "Host name",
+    "description" : "Host name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "routing",
+    "binding" : {
+      "name" : "routing.hostName",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "routing.port",
+    "label" : "Port",
+    "description" : "Port: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "routing",
+    "binding" : {
+      "name" : "routing.port",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queueName",
+    "label" : "Queue name",
+    "description" : "Name of the queue to subscribe to",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "subscription",
+    "binding" : {
+      "name" : "queueName",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "consumerTag",
+    "label" : "Consumer tag",
+    "description" : "Consumer tag to use for the subscription",
+    "optional" : false,
+    "group" : "subscription",
+    "binding" : {
+      "name" : "consumerTag",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "arguments",
+    "label" : "Arguments",
+    "description" : "Arguments to use for the subscription",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "subscription",
+    "binding" : {
+      "name" : "arguments",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "exclusive",
+    "label" : "Exclusive consumer",
+    "optional" : false,
+    "value" : "false",
+    "group" : "subscription",
+    "binding" : {
+      "name" : "exclusive",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Yes",
+      "value" : "true"
+    }, {
+      "name" : "No",
+      "value" : "false"
+    } ]
+  }, {
+    "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" : "correlationKeyProcess",
+    "label" : "Correlation key (process)",
+    "description" : "Sets up the correlation key from process variables",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKey",
+      "type" : "bpmn:Message#zeebe:subscription#property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "correlationKeyPayload",
+    "label" : "Correlation key (payload)",
+    "description" : "Extracts the correlation key from the incoming message payload",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKeyExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageIdExpression",
+    "label" : "Message ID expression",
+    "description" : "Expression to extract unique identifier of a message",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "messageIdExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageNameUuid",
+    "generatedValue" : {
+      "type" : "uuid"
+    },
+    "group" : "correlation",
+    "binding" : {
+      "name" : "name",
+      "type" : "bpmn:Message#property"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "deduplicationModeManualFlag",
+    "label" : "Manual mode",
+    "description" : "By default, similar connectors receive the same deduplication ID. Customize by activating manual mode",
+    "value" : false,
+    "group" : "deduplication",
+    "binding" : {
+      "name" : "deduplicationModeManualFlag",
+      "type" : "zeebe:property"
+    },
+    "type" : "Boolean"
+  }, {
+    "id" : "deduplicationId",
+    "label" : "Deduplication ID",
+    "constraints" : {
+      "notEmpty" : true,
+      "pattern" : {
+        "value" : "^[a-zA-Z0-9_-]+$",
+        "message" : "Only alphanumeric characters, dashes, and underscores are allowed"
+      }
+    },
+    "group" : "deduplication",
+    "binding" : {
+      "name" : "deduplicationId",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "deduplicationModeManualFlag",
+      "equals" : true,
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "deduplicationModeManual",
+    "value" : "MANUAL",
+    "group" : "deduplication",
+    "binding" : {
+      "name" : "deduplicationMode",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "deduplicationId",
+      "isActive" : true,
+      "type" : "simple"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "deduplicationModeAuto",
+    "value" : "AUTO",
+    "group" : "deduplication",
+    "binding" : {
+      "name" : "deduplicationMode",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "deduplicationId",
+      "isActive" : false,
+      "type" : "simple"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultVariable",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "Text"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxOCcgaGVpZ2h0PScxOCcgdmlld0JveD0nLTcuNSAwIDI3MSAyNzEnIHByZXNlcnZlQXNwZWN0UmF0aW89J3hNaWRZTWlkJz4KICAgIDxwYXRoIGQ9J00yNDUuNDQgMTA4LjMwOGgtODUuMDlhNy43MzggNy43MzggMCAwIDEtNy43MzUtNy43MzR2LTg4LjY4QzE1Mi42MTUgNS4zMjcgMTQ3LjI5IDAgMTQwLjcyNiAwaC0zMC4zNzVjLTYuNTY4IDAtMTEuODkgNS4zMjctMTEuODkgMTEuODk0djg4LjE0M2MwIDQuNTczLTMuNjk3IDguMjktOC4yNyA4LjMxbC0yNy44ODUuMTMzYy00LjYxMi4wMjUtOC4zNTktMy43MTctOC4zNS04LjMyNWwuMTczLTg4LjI0MUM1NC4xNDQgNS4zMzcgNDguODE3IDAgNDIuMjQgMEgxMS44OUM1LjMyMSAwIDAgNS4zMjcgMCAxMS44OTRWMjYwLjIxYzAgNS44MzQgNC43MjYgMTAuNTYgMTAuNTU1IDEwLjU2SDI0NS40NGM1LjgzNCAwIDEwLjU2LTQuNzI2IDEwLjU2LTEwLjU2VjExOC44NjhjMC01LjgzNC00LjcyNi0xMC41Ni0xMC41Ni0xMC41NnptLTM5LjkwMiA5My4yMzNjMCA3LjY0NS02LjE5OCAxMy44NDQtMTMuODQzIDEzLjg0NEgxNjcuNjljLTcuNjQ2IDAtMTMuODQ0LTYuMTk5LTEzLjg0NC0xMy44NDR2LTI0LjAwNWMwLTcuNjQ2IDYuMTk4LTEzLjg0NCAxMy44NDQtMTMuODQ0aDI0LjAwNWM3LjY0NSAwIDEzLjg0MyA2LjE5OCAxMy44NDMgMTMuODQ0djI0LjAwNXonCiAgICAgICAgICBmaWxsPScjRjYwJy8+Cjwvc3ZnPg=="
+  }
+}
\ No newline at end of file
diff --git a/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-intermediate-hybrid.json b/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-intermediate-hybrid.json
new file mode 100644
index 0000000000..960720668c
--- /dev/null
+++ b/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-intermediate-hybrid.json
@@ -0,0 +1,388 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid RabbitMQ Intermediate Catch Event Connector",
+  "id" : "io.camunda.connectors.inbound.RabbitMQ.Intermediate.v1-hybrid",
+  "description" : "Receive a message from RabbitMQ",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound",
+  "version" : 7,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:IntermediateCatchEvent", "bpmn:IntermediateThrowEvent" ],
+  "elementType" : {
+    "value" : "bpmn:IntermediateCatchEvent",
+    "eventDefinition" : "bpmn:MessageEventDefinition"
+  },
+  "groups" : [ {
+    "id" : "connectorType",
+    "label" : "Connector type"
+  }, {
+    "id" : "authentication",
+    "label" : "Authentication"
+  }, {
+    "id" : "routing",
+    "label" : "Routing"
+  }, {
+    "id" : "subscription",
+    "label" : "Subscription"
+  }, {
+    "id" : "activation",
+    "label" : "Activation"
+  }, {
+    "id" : "correlation",
+    "label" : "Correlation"
+  }, {
+    "id" : "deduplication",
+    "label" : "Deduplication",
+    "tooltip" : "Deduplication allows you to configure multiple inbound connector elements to reuse the same backend (consumer/thread/endpoint) by sharing the same deduplication ID."
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  } ],
+  "properties" : [ {
+    "id" : "connectorType",
+    "value" : "io.camunda:connector-rabbitmq-inbound:1",
+    "group" : "connectorType",
+    "binding" : {
+      "name" : "inbound.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.authType",
+    "label" : "Connection type",
+    "value" : "uri",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.authType",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "URI",
+      "value" : "uri"
+    }, {
+      "name" : "Username/Password",
+      "value" : "credentials"
+    } ]
+  }, {
+    "id" : "authentication.uri",
+    "label" : "URI",
+    "description" : "URI should contain username, password, host name, port number, and virtual host",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true,
+      "pattern" : {
+        "value" : "^(=|amqps?://|secrets|\\{\\{).*$",
+        "message" : "Must start with amqp(s):// or contain a secret reference"
+      }
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.uri",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "uri",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.userName",
+    "label" : "Username",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.userName",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.password",
+    "label" : "Password",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.password",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "routing.virtualHost",
+    "label" : "Virtual host",
+    "description" : "Virtual name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "routing",
+    "binding" : {
+      "name" : "routing.virtualHost",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "routing.hostName",
+    "label" : "Host name",
+    "description" : "Host name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "routing",
+    "binding" : {
+      "name" : "routing.hostName",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "routing.port",
+    "label" : "Port",
+    "description" : "Port: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "routing",
+    "binding" : {
+      "name" : "routing.port",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queueName",
+    "label" : "Queue name",
+    "description" : "Name of the queue to subscribe to",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "subscription",
+    "binding" : {
+      "name" : "queueName",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "consumerTag",
+    "label" : "Consumer tag",
+    "description" : "Consumer tag to use for the subscription",
+    "optional" : false,
+    "group" : "subscription",
+    "binding" : {
+      "name" : "consumerTag",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "arguments",
+    "label" : "Arguments",
+    "description" : "Arguments to use for the subscription",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "subscription",
+    "binding" : {
+      "name" : "arguments",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "exclusive",
+    "label" : "Exclusive consumer",
+    "optional" : false,
+    "value" : "false",
+    "group" : "subscription",
+    "binding" : {
+      "name" : "exclusive",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Yes",
+      "value" : "true"
+    }, {
+      "name" : "No",
+      "value" : "false"
+    } ]
+  }, {
+    "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" : "correlationKeyProcess",
+    "label" : "Correlation key (process)",
+    "description" : "Sets up the correlation key from process variables",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKey",
+      "type" : "bpmn:Message#zeebe:subscription#property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "correlationKeyPayload",
+    "label" : "Correlation key (payload)",
+    "description" : "Extracts the correlation key from the incoming message payload",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKeyExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageIdExpression",
+    "label" : "Message ID expression",
+    "description" : "Expression to extract unique identifier of a message",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "messageIdExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageNameUuid",
+    "generatedValue" : {
+      "type" : "uuid"
+    },
+    "group" : "correlation",
+    "binding" : {
+      "name" : "name",
+      "type" : "bpmn:Message#property"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "deduplicationModeManualFlag",
+    "label" : "Manual mode",
+    "description" : "By default, similar connectors receive the same deduplication ID. Customize by activating manual mode",
+    "value" : false,
+    "group" : "deduplication",
+    "binding" : {
+      "name" : "deduplicationModeManualFlag",
+      "type" : "zeebe:property"
+    },
+    "type" : "Boolean"
+  }, {
+    "id" : "deduplicationId",
+    "label" : "Deduplication ID",
+    "constraints" : {
+      "notEmpty" : true,
+      "pattern" : {
+        "value" : "^[a-zA-Z0-9_-]+$",
+        "message" : "Only alphanumeric characters, dashes, and underscores are allowed"
+      }
+    },
+    "group" : "deduplication",
+    "binding" : {
+      "name" : "deduplicationId",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "deduplicationModeManualFlag",
+      "equals" : true,
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "deduplicationModeManual",
+    "value" : "MANUAL",
+    "group" : "deduplication",
+    "binding" : {
+      "name" : "deduplicationMode",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "deduplicationId",
+      "isActive" : true,
+      "type" : "simple"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "deduplicationModeAuto",
+    "value" : "AUTO",
+    "group" : "deduplication",
+    "binding" : {
+      "name" : "deduplicationMode",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "deduplicationId",
+      "isActive" : false,
+      "type" : "simple"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultVariable",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "Text"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxOCcgaGVpZ2h0PScxOCcgdmlld0JveD0nLTcuNSAwIDI3MSAyNzEnIHByZXNlcnZlQXNwZWN0UmF0aW89J3hNaWRZTWlkJz4KICAgIDxwYXRoIGQ9J00yNDUuNDQgMTA4LjMwOGgtODUuMDlhNy43MzggNy43MzggMCAwIDEtNy43MzUtNy43MzR2LTg4LjY4QzE1Mi42MTUgNS4zMjcgMTQ3LjI5IDAgMTQwLjcyNiAwaC0zMC4zNzVjLTYuNTY4IDAtMTEuODkgNS4zMjctMTEuODkgMTEuODk0djg4LjE0M2MwIDQuNTczLTMuNjk3IDguMjktOC4yNyA4LjMxbC0yNy44ODUuMTMzYy00LjYxMi4wMjUtOC4zNTktMy43MTctOC4zNS04LjMyNWwuMTczLTg4LjI0MUM1NC4xNDQgNS4zMzcgNDguODE3IDAgNDIuMjQgMEgxMS44OUM1LjMyMSAwIDAgNS4zMjcgMCAxMS44OTRWMjYwLjIxYzAgNS44MzQgNC43MjYgMTAuNTYgMTAuNTU1IDEwLjU2SDI0NS40NGM1LjgzNCAwIDEwLjU2LTQuNzI2IDEwLjU2LTEwLjU2VjExOC44NjhjMC01LjgzNC00LjcyNi0xMC41Ni0xMC41Ni0xMC41NnptLTM5LjkwMiA5My4yMzNjMCA3LjY0NS02LjE5OCAxMy44NDQtMTMuODQzIDEzLjg0NEgxNjcuNjljLTcuNjQ2IDAtMTMuODQ0LTYuMTk5LTEzLjg0NC0xMy44NDR2LTI0LjAwNWMwLTcuNjQ2IDYuMTk4LTEzLjg0NCAxMy44NDQtMTMuODQ0aDI0LjAwNWM3LjY0NSAwIDEzLjg0MyA2LjE5OCAxMy44NDMgMTMuODQ0djI0LjAwNXonCiAgICAgICAgICBmaWxsPScjRjYwJy8+Cjwvc3ZnPg=="
+  }
+}
\ No newline at end of file
diff --git a/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-message-start-hybrid.json b/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-message-start-hybrid.json
new file mode 100644
index 0000000000..1367f84f11
--- /dev/null
+++ b/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-message-start-hybrid.json
@@ -0,0 +1,416 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid RabbitMQ Message Start Event Connector",
+  "id" : "io.camunda.connectors.inbound.RabbitMQ.MessageStart.v1-hybrid",
+  "description" : "Receive a message from RabbitMQ",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound",
+  "version" : 7,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:StartEvent" ],
+  "elementType" : {
+    "value" : "bpmn:StartEvent",
+    "eventDefinition" : "bpmn:MessageEventDefinition"
+  },
+  "groups" : [ {
+    "id" : "connectorType",
+    "label" : "Connector type"
+  }, {
+    "id" : "authentication",
+    "label" : "Authentication"
+  }, {
+    "id" : "routing",
+    "label" : "Routing"
+  }, {
+    "id" : "subscription",
+    "label" : "Subscription"
+  }, {
+    "id" : "activation",
+    "label" : "Activation"
+  }, {
+    "id" : "correlation",
+    "label" : "Correlation"
+  }, {
+    "id" : "deduplication",
+    "label" : "Deduplication",
+    "tooltip" : "Deduplication allows you to configure multiple inbound connector elements to reuse the same backend (consumer/thread/endpoint) by sharing the same deduplication ID."
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  } ],
+  "properties" : [ {
+    "id" : "connectorType",
+    "value" : "io.camunda:connector-rabbitmq-inbound:1",
+    "group" : "connectorType",
+    "binding" : {
+      "name" : "inbound.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.authType",
+    "label" : "Connection type",
+    "value" : "uri",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.authType",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "URI",
+      "value" : "uri"
+    }, {
+      "name" : "Username/Password",
+      "value" : "credentials"
+    } ]
+  }, {
+    "id" : "authentication.uri",
+    "label" : "URI",
+    "description" : "URI should contain username, password, host name, port number, and virtual host",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true,
+      "pattern" : {
+        "value" : "^(=|amqps?://|secrets|\\{\\{).*$",
+        "message" : "Must start with amqp(s):// or contain a secret reference"
+      }
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.uri",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "uri",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.userName",
+    "label" : "Username",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.userName",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.password",
+    "label" : "Password",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.password",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "routing.virtualHost",
+    "label" : "Virtual host",
+    "description" : "Virtual name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "routing",
+    "binding" : {
+      "name" : "routing.virtualHost",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "routing.hostName",
+    "label" : "Host name",
+    "description" : "Host name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "routing",
+    "binding" : {
+      "name" : "routing.hostName",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "routing.port",
+    "label" : "Port",
+    "description" : "Port: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "routing",
+    "binding" : {
+      "name" : "routing.port",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queueName",
+    "label" : "Queue name",
+    "description" : "Name of the queue to subscribe to",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "subscription",
+    "binding" : {
+      "name" : "queueName",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "consumerTag",
+    "label" : "Consumer tag",
+    "description" : "Consumer tag to use for the subscription",
+    "optional" : false,
+    "group" : "subscription",
+    "binding" : {
+      "name" : "consumerTag",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "arguments",
+    "label" : "Arguments",
+    "description" : "Arguments to use for the subscription",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "subscription",
+    "binding" : {
+      "name" : "arguments",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "exclusive",
+    "label" : "Exclusive consumer",
+    "optional" : false,
+    "value" : "false",
+    "group" : "subscription",
+    "binding" : {
+      "name" : "exclusive",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Yes",
+      "value" : "true"
+    }, {
+      "name" : "No",
+      "value" : "false"
+    } ]
+  }, {
+    "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" : "correlationRequired",
+    "label" : "Subprocess correlation required",
+    "description" : "Indicates whether correlation is required. This is needed for event-based subprocess message start events",
+    "value" : "notRequired",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationRequired",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Correlation not required",
+      "value" : "notRequired"
+    }, {
+      "name" : "Correlation required",
+      "value" : "required"
+    } ]
+  }, {
+    "id" : "correlationKeyProcess",
+    "label" : "Correlation key (process)",
+    "description" : "Sets up the correlation key from process variables",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKey",
+      "type" : "bpmn:Message#zeebe:subscription#property"
+    },
+    "condition" : {
+      "property" : "correlationRequired",
+      "equals" : "required",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "correlationKeyPayload",
+    "label" : "Correlation key (payload)",
+    "description" : "Extracts the correlation key from the incoming message payload",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKeyExpression",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "correlationRequired",
+      "equals" : "required",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageIdExpression",
+    "label" : "Message ID expression",
+    "description" : "Expression to extract unique identifier of a message",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "messageIdExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageNameUuid",
+    "generatedValue" : {
+      "type" : "uuid"
+    },
+    "group" : "correlation",
+    "binding" : {
+      "name" : "name",
+      "type" : "bpmn:Message#property"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "deduplicationModeManualFlag",
+    "label" : "Manual mode",
+    "description" : "By default, similar connectors receive the same deduplication ID. Customize by activating manual mode",
+    "value" : false,
+    "group" : "deduplication",
+    "binding" : {
+      "name" : "deduplicationModeManualFlag",
+      "type" : "zeebe:property"
+    },
+    "type" : "Boolean"
+  }, {
+    "id" : "deduplicationId",
+    "label" : "Deduplication ID",
+    "constraints" : {
+      "notEmpty" : true,
+      "pattern" : {
+        "value" : "^[a-zA-Z0-9_-]+$",
+        "message" : "Only alphanumeric characters, dashes, and underscores are allowed"
+      }
+    },
+    "group" : "deduplication",
+    "binding" : {
+      "name" : "deduplicationId",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "deduplicationModeManualFlag",
+      "equals" : true,
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "deduplicationModeManual",
+    "value" : "MANUAL",
+    "group" : "deduplication",
+    "binding" : {
+      "name" : "deduplicationMode",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "deduplicationId",
+      "isActive" : true,
+      "type" : "simple"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "deduplicationModeAuto",
+    "value" : "AUTO",
+    "group" : "deduplication",
+    "binding" : {
+      "name" : "deduplicationMode",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "deduplicationId",
+      "isActive" : false,
+      "type" : "simple"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultVariable",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "Text"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxOCcgaGVpZ2h0PScxOCcgdmlld0JveD0nLTcuNSAwIDI3MSAyNzEnIHByZXNlcnZlQXNwZWN0UmF0aW89J3hNaWRZTWlkJz4KICAgIDxwYXRoIGQ9J00yNDUuNDQgMTA4LjMwOGgtODUuMDlhNy43MzggNy43MzggMCAwIDEtNy43MzUtNy43MzR2LTg4LjY4QzE1Mi42MTUgNS4zMjcgMTQ3LjI5IDAgMTQwLjcyNiAwaC0zMC4zNzVjLTYuNTY4IDAtMTEuODkgNS4zMjctMTEuODkgMTEuODk0djg4LjE0M2MwIDQuNTczLTMuNjk3IDguMjktOC4yNyA4LjMxbC0yNy44ODUuMTMzYy00LjYxMi4wMjUtOC4zNTktMy43MTctOC4zNS04LjMyNWwuMTczLTg4LjI0MUM1NC4xNDQgNS4zMzcgNDguODE3IDAgNDIuMjQgMEgxMS44OUM1LjMyMSAwIDAgNS4zMjcgMCAxMS44OTRWMjYwLjIxYzAgNS44MzQgNC43MjYgMTAuNTYgMTAuNTU1IDEwLjU2SDI0NS40NGM1LjgzNCAwIDEwLjU2LTQuNzI2IDEwLjU2LTEwLjU2VjExOC44NjhjMC01LjgzNC00LjcyNi0xMC41Ni0xMC41Ni0xMC41NnptLTM5LjkwMiA5My4yMzNjMCA3LjY0NS02LjE5OCAxMy44NDQtMTMuODQzIDEzLjg0NEgxNjcuNjljLTcuNjQ2IDAtMTMuODQ0LTYuMTk5LTEzLjg0NC0xMy44NDR2LTI0LjAwNWMwLTcuNjQ2IDYuMTk4LTEzLjg0NCAxMy44NDQtMTMuODQ0aDI0LjAwNWM3LjY0NSAwIDEzLjg0MyA2LjE5OCAxMy44NDMgMTMuODQ0djI0LjAwNXonCiAgICAgICAgICBmaWxsPScjRjYwJy8+Cjwvc3ZnPg=="
+  }
+}
\ No newline at end of file
diff --git a/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-start-event-hybrid.json b/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-start-event-hybrid.json
new file mode 100644
index 0000000000..8b52088f2d
--- /dev/null
+++ b/connectors/rabbitmq/element-templates/hybrid/rabbitmq-inbound-connector-start-event-hybrid.json
@@ -0,0 +1,333 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid RabbitMQ Start Event Connector",
+  "id" : "io.camunda.connectors.inbound.RabbitMQ.StartEvent.v1-hybrid",
+  "description" : "Receive a message from RabbitMQ",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=inbound",
+  "version" : 7,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:StartEvent" ],
+  "elementType" : {
+    "value" : "bpmn:StartEvent"
+  },
+  "groups" : [ {
+    "id" : "connectorType",
+    "label" : "Connector type"
+  }, {
+    "id" : "authentication",
+    "label" : "Authentication"
+  }, {
+    "id" : "routing",
+    "label" : "Routing"
+  }, {
+    "id" : "subscription",
+    "label" : "Subscription"
+  }, {
+    "id" : "activation",
+    "label" : "Activation"
+  }, {
+    "id" : "deduplication",
+    "label" : "Deduplication",
+    "tooltip" : "Deduplication allows you to configure multiple inbound connector elements to reuse the same backend (consumer/thread/endpoint) by sharing the same deduplication ID."
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  } ],
+  "properties" : [ {
+    "id" : "connectorType",
+    "value" : "io.camunda:connector-rabbitmq-inbound:1",
+    "group" : "connectorType",
+    "binding" : {
+      "name" : "inbound.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.authType",
+    "label" : "Connection type",
+    "value" : "uri",
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.authType",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "URI",
+      "value" : "uri"
+    }, {
+      "name" : "Username/Password",
+      "value" : "credentials"
+    } ]
+  }, {
+    "id" : "authentication.uri",
+    "label" : "URI",
+    "description" : "URI should contain username, password, host name, port number, and virtual host",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true,
+      "pattern" : {
+        "value" : "^(=|amqps?://|secrets|\\{\\{).*$",
+        "message" : "Must start with amqp(s):// or contain a secret reference"
+      }
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.uri",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "uri",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.userName",
+    "label" : "Username",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.userName",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "authentication.password",
+    "label" : "Password",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "authentication",
+    "binding" : {
+      "name" : "authentication.password",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "routing.virtualHost",
+    "label" : "Virtual host",
+    "description" : "Virtual name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "routing",
+    "binding" : {
+      "name" : "routing.virtualHost",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "routing.hostName",
+    "label" : "Host name",
+    "description" : "Host name: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "routing",
+    "binding" : {
+      "name" : "routing.hostName",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "routing.port",
+    "label" : "Port",
+    "description" : "Port: get from RabbitMQ external application configurations. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound#routing-data\"target=\"_blank\">documentation</a>",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "routing",
+    "binding" : {
+      "name" : "routing.port",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "authentication.authType",
+      "equals" : "credentials",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "queueName",
+    "label" : "Queue name",
+    "description" : "Name of the queue to subscribe to",
+    "optional" : false,
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "group" : "subscription",
+    "binding" : {
+      "name" : "queueName",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "consumerTag",
+    "label" : "Consumer tag",
+    "description" : "Consumer tag to use for the subscription",
+    "optional" : false,
+    "group" : "subscription",
+    "binding" : {
+      "name" : "consumerTag",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "arguments",
+    "label" : "Arguments",
+    "description" : "Arguments to use for the subscription",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "subscription",
+    "binding" : {
+      "name" : "arguments",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "exclusive",
+    "label" : "Exclusive consumer",
+    "optional" : false,
+    "value" : "false",
+    "group" : "subscription",
+    "binding" : {
+      "name" : "exclusive",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Yes",
+      "value" : "true"
+    }, {
+      "name" : "No",
+      "value" : "false"
+    } ]
+  }, {
+    "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" : "deduplicationModeManualFlag",
+    "label" : "Manual mode",
+    "description" : "By default, similar connectors receive the same deduplication ID. Customize by activating manual mode",
+    "value" : false,
+    "group" : "deduplication",
+    "binding" : {
+      "name" : "deduplicationModeManualFlag",
+      "type" : "zeebe:property"
+    },
+    "type" : "Boolean"
+  }, {
+    "id" : "deduplicationId",
+    "label" : "Deduplication ID",
+    "constraints" : {
+      "notEmpty" : true,
+      "pattern" : {
+        "value" : "^[a-zA-Z0-9_-]+$",
+        "message" : "Only alphanumeric characters, dashes, and underscores are allowed"
+      }
+    },
+    "group" : "deduplication",
+    "binding" : {
+      "name" : "deduplicationId",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "deduplicationModeManualFlag",
+      "equals" : true,
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "deduplicationModeManual",
+    "value" : "MANUAL",
+    "group" : "deduplication",
+    "binding" : {
+      "name" : "deduplicationMode",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "deduplicationId",
+      "isActive" : true,
+      "type" : "simple"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "deduplicationModeAuto",
+    "value" : "AUTO",
+    "group" : "deduplication",
+    "binding" : {
+      "name" : "deduplicationMode",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "deduplicationId",
+      "isActive" : false,
+      "type" : "simple"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultVariable",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "Text"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxOCcgaGVpZ2h0PScxOCcgdmlld0JveD0nLTcuNSAwIDI3MSAyNzEnIHByZXNlcnZlQXNwZWN0UmF0aW89J3hNaWRZTWlkJz4KICAgIDxwYXRoIGQ9J00yNDUuNDQgMTA4LjMwOGgtODUuMDlhNy43MzggNy43MzggMCAwIDEtNy43MzUtNy43MzR2LTg4LjY4QzE1Mi42MTUgNS4zMjcgMTQ3LjI5IDAgMTQwLjcyNiAwaC0zMC4zNzVjLTYuNTY4IDAtMTEuODkgNS4zMjctMTEuODkgMTEuODk0djg4LjE0M2MwIDQuNTczLTMuNjk3IDguMjktOC4yNyA4LjMxbC0yNy44ODUuMTMzYy00LjYxMi4wMjUtOC4zNTktMy43MTctOC4zNS04LjMyNWwuMTczLTg4LjI0MUM1NC4xNDQgNS4zMzcgNDguODE3IDAgNDIuMjQgMEgxMS44OUM1LjMyMSAwIDAgNS4zMjcgMCAxMS44OTRWMjYwLjIxYzAgNS44MzQgNC43MjYgMTAuNTYgMTAuNTU1IDEwLjU2SDI0NS40NGM1LjgzNCAwIDEwLjU2LTQuNzI2IDEwLjU2LTEwLjU2VjExOC44NjhjMC01LjgzNC00LjcyNi0xMC41Ni0xMC41Ni0xMC41NnptLTM5LjkwMiA5My4yMzNjMCA3LjY0NS02LjE5OCAxMy44NDQtMTMuODQzIDEzLjg0NEgxNjcuNjljLTcuNjQ2IDAtMTMuODQ0LTYuMTk5LTEzLjg0NC0xMy44NDR2LTI0LjAwNWMwLTcuNjQ2IDYuMTk4LTEzLjg0NCAxMy44NDQtMTMuODQ0aDI0LjAwNWM3LjY0NSAwIDEzLjg0MyA2LjE5OCAxMy44NDMgMTMuODQ0djI0LjAwNXonCiAgICAgICAgICBmaWxsPScjRjYwJy8+Cjwvc3ZnPg=="
+  }
+}
\ No newline at end of file
diff --git a/connectors/rabbitmq/element-templates/hybrid/rabbitmq-outbound-connector-hybrid.json b/connectors/rabbitmq/element-templates/hybrid/rabbitmq-outbound-connector-hybrid.json
index 959fdfe220..5e7c37997a 100644
--- a/connectors/rabbitmq/element-templates/hybrid/rabbitmq-outbound-connector-hybrid.json
+++ b/connectors/rabbitmq/element-templates/hybrid/rabbitmq-outbound-connector-hybrid.json
@@ -1,7 +1,7 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "RabbitMQ Outbound Connector",
-  "id" : "io.camunda.connectors.RabbitMQ.v1",
+  "name" : "Hybrid RabbitMQ Outbound Connector",
+  "id" : "io.camunda.connectors.RabbitMQ.v1-hybrid",
   "description" : "Send message to RabbitMQ",
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/rabbitmq/?rabbitmq=outbound",
   "version" : 5,
diff --git a/connectors/rabbitmq/pom.xml b/connectors/rabbitmq/pom.xml
index 05e4d6a966..633dbc286a 100644
--- a/connectors/rabbitmq/pom.xml
+++ b/connectors/rabbitmq/pom.xml
@@ -84,6 +84,7 @@
                   <templateFileName>rabbitmq-inbound-connector-boundary.json</templateFileName>
                 </file>
               </files>
+              <generateHybridTemplates>true</generateHybridTemplates>
               <features>
                 <INBOUND_DEDUPLICATION>true</INBOUND_DEDUPLICATION>
               </features>
diff --git a/connectors/sendgrid/element-templates/hybrid/sendgrid-outbound-connector-hybrid.json b/connectors/sendgrid/element-templates/hybrid/sendgrid-outbound-connector-hybrid.json
index 1ab4a3d9cd..2d9cfba115 100644
--- a/connectors/sendgrid/element-templates/hybrid/sendgrid-outbound-connector-hybrid.json
+++ b/connectors/sendgrid/element-templates/hybrid/sendgrid-outbound-connector-hybrid.json
@@ -1,7 +1,7 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "SendGrid Outbound Connector",
-  "id" : "io.camunda.connectors.SendGrid.v2",
+  "name" : "Hybrid SendGrid Outbound Connector",
+  "id" : "io.camunda.connectors.SendGrid.v2-hybrid",
   "description" : "Send an email via SendGrid",
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/sendgrid/",
   "version" : 3,
diff --git a/connectors/slack/element-templates/hybrid/slack-inbound-boundary-hybrid.json b/connectors/slack/element-templates/hybrid/slack-inbound-boundary-hybrid.json
index c939d4a02e..fe4c9d1137 100644
--- a/connectors/slack/element-templates/hybrid/slack-inbound-boundary-hybrid.json
+++ b/connectors/slack/element-templates/hybrid/slack-inbound-boundary-hybrid.json
@@ -1,7 +1,7 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "Slack Webhook Boundary Event Connector",
-  "id" : "io.camunda.connectors.inbound.Slack.BoundaryEvent.v1",
+  "name" : "Hybrid Slack Webhook Boundary Event Connector",
+  "id" : "io.camunda.connectors.inbound.Slack.BoundaryEvent.v1-hybrid",
   "description" : "Receive events from Slack",
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/slack/?slack=inbound",
   "version" : 5,
diff --git a/connectors/slack/element-templates/hybrid/slack-inbound-intermediate-hybrid.json b/connectors/slack/element-templates/hybrid/slack-inbound-intermediate-hybrid.json
index 5d0902b7c5..58581710ee 100644
--- a/connectors/slack/element-templates/hybrid/slack-inbound-intermediate-hybrid.json
+++ b/connectors/slack/element-templates/hybrid/slack-inbound-intermediate-hybrid.json
@@ -1,7 +1,7 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "Slack Webhook Intermediate Catch Event Connector",
-  "id" : "io.camunda.connectors.inbound.Slack.IntermediateCatchEvent.v1",
+  "name" : "Hybrid Slack Webhook Intermediate Catch Event Connector",
+  "id" : "io.camunda.connectors.inbound.Slack.IntermediateCatchEvent.v1-hybrid",
   "description" : "Receive events from Slack",
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/slack/?slack=inbound",
   "version" : 5,
diff --git a/connectors/slack/element-templates/hybrid/slack-inbound-message-start-hybrid.json b/connectors/slack/element-templates/hybrid/slack-inbound-message-start-hybrid.json
index 8857ffa8eb..c35256d207 100644
--- a/connectors/slack/element-templates/hybrid/slack-inbound-message-start-hybrid.json
+++ b/connectors/slack/element-templates/hybrid/slack-inbound-message-start-hybrid.json
@@ -1,7 +1,7 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "Slack Webhook Message Start Event Connector",
-  "id" : "io.camunda.connectors.inbound.Slack.MessageStartEvent.v1",
+  "name" : "Hybrid Slack Webhook Message Start Event Connector",
+  "id" : "io.camunda.connectors.inbound.Slack.MessageStartEvent.v1-hybrid",
   "description" : "Receive events from Slack",
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/slack/?slack=inbound",
   "version" : 5,
diff --git a/connectors/slack/element-templates/hybrid/slack-inbound-start-event-hybrid.json b/connectors/slack/element-templates/hybrid/slack-inbound-start-event-hybrid.json
index 83d3e02d7b..1b327bffbf 100644
--- a/connectors/slack/element-templates/hybrid/slack-inbound-start-event-hybrid.json
+++ b/connectors/slack/element-templates/hybrid/slack-inbound-start-event-hybrid.json
@@ -1,7 +1,7 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "Slack Webhook Start Event Connector",
-  "id" : "io.camunda.connectors.inbound.Slack.StartEvent.v1",
+  "name" : "Hybrid Slack Webhook Start Event Connector",
+  "id" : "io.camunda.connectors.inbound.Slack.StartEvent.v1-hybrid",
   "description" : "Receive events from Slack",
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/slack/?slack=inbound",
   "version" : 5,
diff --git a/connectors/slack/element-templates/hybrid/slack-outbound-connector-hybrid.json b/connectors/slack/element-templates/hybrid/slack-outbound-connector-hybrid.json
index 1fe7dae45b..16461db258 100644
--- a/connectors/slack/element-templates/hybrid/slack-outbound-connector-hybrid.json
+++ b/connectors/slack/element-templates/hybrid/slack-outbound-connector-hybrid.json
@@ -1,7 +1,7 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "Slack Outbound Connector",
-  "id" : "io.camunda.connectors.Slack.v1",
+  "name" : "Hybrid Slack Outbound Connector",
+  "id" : "io.camunda.connectors.Slack.v1-hybrid",
   "description" : "Create a channel or send a message to a channel or user",
   "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/slack/?slack=outbound",
   "version" : 3,
diff --git a/connectors/soap/element-templates/hybrid/soap-outbound-connector-hybrid.json b/connectors/soap/element-templates/hybrid/soap-outbound-connector-hybrid.json
index 3c57d45206..d4d4e66b76 100644
--- a/connectors/soap/element-templates/hybrid/soap-outbound-connector-hybrid.json
+++ b/connectors/soap/element-templates/hybrid/soap-outbound-connector-hybrid.json
@@ -1,7 +1,7 @@
 {
   "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-  "name" : "SOAP Connector",
-  "id" : "io.camunda:soap",
+  "name" : "Hybrid SOAP Connector",
+  "id" : "io.camunda:soap-hybrid",
   "description" : "A Connector to execute a SOAP request",
   "version" : 1,
   "category" : {
diff --git a/connectors/webhook/element-templates/hybrid/webhook-connector-boundary-hybrid.json b/connectors/webhook/element-templates/hybrid/webhook-connector-boundary-hybrid.json
new file mode 100644
index 0000000000..4ab938f87b
--- /dev/null
+++ b/connectors/webhook/element-templates/hybrid/webhook-connector-boundary-hybrid.json
@@ -0,0 +1,453 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid Webhook Boundary Event Connector",
+  "id" : "io.camunda.connectors.webhook.WebhookConnectorBoundary.v1-hybrid",
+  "description" : "Configure webhook to receive callbacks",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
+  "version" : 11,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:BoundaryEvent" ],
+  "elementType" : {
+    "value" : "bpmn:BoundaryEvent",
+    "eventDefinition" : "bpmn:MessageEventDefinition"
+  },
+  "groups" : [ {
+    "id" : "connectorType",
+    "label" : "Connector type"
+  }, {
+    "id" : "endpoint",
+    "label" : "Webhook configuration"
+  }, {
+    "id" : "authentication",
+    "label" : "Authentication"
+  }, {
+    "id" : "authorization",
+    "label" : "Authorization"
+  }, {
+    "id" : "webhookResponse",
+    "label" : "Webhook response"
+  }, {
+    "id" : "activation",
+    "label" : "Activation"
+  }, {
+    "id" : "correlation",
+    "label" : "Correlation"
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  } ],
+  "properties" : [ {
+    "id" : "connectorType",
+    "value" : "io.camunda:webhook:1",
+    "group" : "connectorType",
+    "binding" : {
+      "name" : "inbound.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "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/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" : [ {
+      "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/out-of-the-box-connectors/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" : "Basic",
+      "value" : "BASIC"
+    }, {
+      "name" : "API key",
+      "value" : "APIKEY"
+    }, {
+      "name" : "None",
+      "value" : "NONE"
+    }, {
+      "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/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",
+    "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/out-of-the-box-connectors/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" : "correlationKeyProcess",
+    "label" : "Correlation key (process)",
+    "description" : "Sets up the correlation key from process variables",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKey",
+      "type" : "bpmn:Message#zeebe:subscription#property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "correlationKeyPayload",
+    "label" : "Correlation key (payload)",
+    "description" : "Extracts the correlation key from the incoming message payload",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKeyExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageIdExpression",
+    "label" : "Message ID expression",
+    "description" : "Expression to extract unique identifier of a message",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "messageIdExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageNameUuid",
+    "generatedValue" : {
+      "type" : "uuid"
+    },
+    "group" : "correlation",
+    "binding" : {
+      "name" : "name",
+      "type" : "bpmn:Message#property"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultVariable",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "Text"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,PHN2ZyBpZD0naWNvbicgeG1sbnM9J2h0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnJyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCAzMiAzMic+CiAgPGRlZnM+CiAgICA8c3R5bGU+LmNscy0xIHsgZmlsbDogbm9uZTsgfTwvc3R5bGU+CiAgPC9kZWZzPgogIDxwYXRoCiAgICBkPSdNMjQsMjZhMywzLDAsMSwwLTIuODE2NC00SDEzdjFhNSw1LDAsMSwxLTUtNVYxNmE3LDcsMCwxLDAsNi45Mjg3LDhoNi4yNTQ5QTIuOTkxNCwyLjk5MTQsMCwwLDAsMjQsMjZaJy8+CiAgPHBhdGgKICAgIGQ9J00yNCwxNmE3LjAyNCw3LjAyNCwwLDAsMC0yLjU3LjQ4NzNsLTMuMTY1Ni01LjUzOTVhMy4wNDY5LDMuMDQ2OSwwLDEsMC0xLjczMjYuOTk4NWw0LjExODksNy4yMDg1Ljg2ODYtLjQ5NzZhNS4wMDA2LDUuMDAwNiwwLDEsMS0xLjg1MSw2Ljg0MThMMTcuOTM3LDI2LjUwMUE3LjAwMDUsNy4wMDA1LDAsMSwwLDI0LDE2WicvPgogIDxwYXRoCiAgICBkPSdNOC41MzIsMjAuMDUzN2EzLjAzLDMuMDMsMCwxLDAsMS43MzI2Ljk5ODVDMTEuNzQsMTguNDcsMTMuODYsMTQuNzYwNywxMy44OSwxNC43MDhsLjQ5NzYtLjg2ODItLjg2NzctLjQ5N2E1LDUsMCwxLDEsNi44MTItMS44NDM4bDEuNzMxNSwxLjAwMmE3LjAwMDgsNy4wMDA4LDAsMSwwLTEwLjM0NjIsMi4wMzU2Yy0uNDU3Ljc0MjctMS4xMDIxLDEuODcxNi0yLjA3MzcsMy41NzI4WicvPgogIDxyZWN0IGlkPSdfVHJhbnNwYXJlbnRfUmVjdGFuZ2xlXycgZGF0YS1uYW1lPScmbHQ7VHJhbnNwYXJlbnQgUmVjdGFuZ2xlJmd0OycgY2xhc3M9J2Nscy0xJwogICAgd2lkdGg9JzMyJyBoZWlnaHQ9JzMyJy8+Cjwvc3ZnPg=="
+  }
+}
\ No newline at end of file
diff --git a/connectors/webhook/element-templates/hybrid/webhook-connector-intermediate-hybrid.json b/connectors/webhook/element-templates/hybrid/webhook-connector-intermediate-hybrid.json
new file mode 100644
index 0000000000..90e4b04872
--- /dev/null
+++ b/connectors/webhook/element-templates/hybrid/webhook-connector-intermediate-hybrid.json
@@ -0,0 +1,453 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid Webhook Intermediate Event Connector",
+  "id" : "io.camunda.connectors.webhook.WebhookConnectorIntermediate.v1-hybrid",
+  "description" : "Configure webhook to receive callbacks",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
+  "version" : 11,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:IntermediateCatchEvent", "bpmn:IntermediateThrowEvent" ],
+  "elementType" : {
+    "value" : "bpmn:IntermediateCatchEvent",
+    "eventDefinition" : "bpmn:MessageEventDefinition"
+  },
+  "groups" : [ {
+    "id" : "connectorType",
+    "label" : "Connector type"
+  }, {
+    "id" : "endpoint",
+    "label" : "Webhook configuration"
+  }, {
+    "id" : "authentication",
+    "label" : "Authentication"
+  }, {
+    "id" : "authorization",
+    "label" : "Authorization"
+  }, {
+    "id" : "webhookResponse",
+    "label" : "Webhook response"
+  }, {
+    "id" : "activation",
+    "label" : "Activation"
+  }, {
+    "id" : "correlation",
+    "label" : "Correlation"
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  } ],
+  "properties" : [ {
+    "id" : "connectorType",
+    "value" : "io.camunda:webhook:1",
+    "group" : "connectorType",
+    "binding" : {
+      "name" : "inbound.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "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/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" : [ {
+      "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/out-of-the-box-connectors/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" : "Basic",
+      "value" : "BASIC"
+    }, {
+      "name" : "API key",
+      "value" : "APIKEY"
+    }, {
+      "name" : "None",
+      "value" : "NONE"
+    }, {
+      "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/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",
+    "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/out-of-the-box-connectors/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" : "correlationKeyProcess",
+    "label" : "Correlation key (process)",
+    "description" : "Sets up the correlation key from process variables",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKey",
+      "type" : "bpmn:Message#zeebe:subscription#property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "correlationKeyPayload",
+    "label" : "Correlation key (payload)",
+    "description" : "Extracts the correlation key from the incoming message payload",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKeyExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageIdExpression",
+    "label" : "Message ID expression",
+    "description" : "Expression to extract unique identifier of a message",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "messageIdExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageNameUuid",
+    "generatedValue" : {
+      "type" : "uuid"
+    },
+    "group" : "correlation",
+    "binding" : {
+      "name" : "name",
+      "type" : "bpmn:Message#property"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultVariable",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "Text"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,PHN2ZyBpZD0naWNvbicgeG1sbnM9J2h0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnJyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCAzMiAzMic+CiAgPGRlZnM+CiAgICA8c3R5bGU+LmNscy0xIHsgZmlsbDogbm9uZTsgfTwvc3R5bGU+CiAgPC9kZWZzPgogIDxwYXRoCiAgICBkPSdNMjQsMjZhMywzLDAsMSwwLTIuODE2NC00SDEzdjFhNSw1LDAsMSwxLTUtNVYxNmE3LDcsMCwxLDAsNi45Mjg3LDhoNi4yNTQ5QTIuOTkxNCwyLjk5MTQsMCwwLDAsMjQsMjZaJy8+CiAgPHBhdGgKICAgIGQ9J00yNCwxNmE3LjAyNCw3LjAyNCwwLDAsMC0yLjU3LjQ4NzNsLTMuMTY1Ni01LjUzOTVhMy4wNDY5LDMuMDQ2OSwwLDEsMC0xLjczMjYuOTk4NWw0LjExODksNy4yMDg1Ljg2ODYtLjQ5NzZhNS4wMDA2LDUuMDAwNiwwLDEsMS0xLjg1MSw2Ljg0MThMMTcuOTM3LDI2LjUwMUE3LjAwMDUsNy4wMDA1LDAsMSwwLDI0LDE2WicvPgogIDxwYXRoCiAgICBkPSdNOC41MzIsMjAuMDUzN2EzLjAzLDMuMDMsMCwxLDAsMS43MzI2Ljk5ODVDMTEuNzQsMTguNDcsMTMuODYsMTQuNzYwNywxMy44OSwxNC43MDhsLjQ5NzYtLjg2ODItLjg2NzctLjQ5N2E1LDUsMCwxLDEsNi44MTItMS44NDM4bDEuNzMxNSwxLjAwMmE3LjAwMDgsNy4wMDA4LDAsMSwwLTEwLjM0NjIsMi4wMzU2Yy0uNDU3Ljc0MjctMS4xMDIxLDEuODcxNi0yLjA3MzcsMy41NzI4WicvPgogIDxyZWN0IGlkPSdfVHJhbnNwYXJlbnRfUmVjdGFuZ2xlXycgZGF0YS1uYW1lPScmbHQ7VHJhbnNwYXJlbnQgUmVjdGFuZ2xlJmd0OycgY2xhc3M9J2Nscy0xJwogICAgd2lkdGg9JzMyJyBoZWlnaHQ9JzMyJy8+Cjwvc3ZnPg=="
+  }
+}
\ No newline at end of file
diff --git a/connectors/webhook/element-templates/hybrid/webhook-connector-start-event-hybrid.json b/connectors/webhook/element-templates/hybrid/webhook-connector-start-event-hybrid.json
new file mode 100644
index 0000000000..c7c8608d3f
--- /dev/null
+++ b/connectors/webhook/element-templates/hybrid/webhook-connector-start-event-hybrid.json
@@ -0,0 +1,398 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid Webhook Start Event Connector",
+  "id" : "io.camunda.connectors.webhook.WebhookConnector.v1-hybrid",
+  "description" : "Configure webhook to receive callbacks",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
+  "version" : 11,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:StartEvent" ],
+  "elementType" : {
+    "value" : "bpmn:StartEvent"
+  },
+  "groups" : [ {
+    "id" : "connectorType",
+    "label" : "Connector type"
+  }, {
+    "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" : [ {
+    "id" : "connectorType",
+    "value" : "io.camunda:webhook:1",
+    "group" : "connectorType",
+    "binding" : {
+      "name" : "inbound.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "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/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" : [ {
+      "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/out-of-the-box-connectors/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" : "Basic",
+      "value" : "BASIC"
+    }, {
+      "name" : "API key",
+      "value" : "APIKEY"
+    }, {
+      "name" : "None",
+      "value" : "NONE"
+    }, {
+      "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/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",
+    "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/out-of-the-box-connectors/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" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultVariable",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "Text"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,PHN2ZyBpZD0naWNvbicgeG1sbnM9J2h0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnJyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCAzMiAzMic+CiAgPGRlZnM+CiAgICA8c3R5bGU+LmNscy0xIHsgZmlsbDogbm9uZTsgfTwvc3R5bGU+CiAgPC9kZWZzPgogIDxwYXRoCiAgICBkPSdNMjQsMjZhMywzLDAsMSwwLTIuODE2NC00SDEzdjFhNSw1LDAsMSwxLTUtNVYxNmE3LDcsMCwxLDAsNi45Mjg3LDhoNi4yNTQ5QTIuOTkxNCwyLjk5MTQsMCwwLDAsMjQsMjZaJy8+CiAgPHBhdGgKICAgIGQ9J00yNCwxNmE3LjAyNCw3LjAyNCwwLDAsMC0yLjU3LjQ4NzNsLTMuMTY1Ni01LjUzOTVhMy4wNDY5LDMuMDQ2OSwwLDEsMC0xLjczMjYuOTk4NWw0LjExODksNy4yMDg1Ljg2ODYtLjQ5NzZhNS4wMDA2LDUuMDAwNiwwLDEsMS0xLjg1MSw2Ljg0MThMMTcuOTM3LDI2LjUwMUE3LjAwMDUsNy4wMDA1LDAsMSwwLDI0LDE2WicvPgogIDxwYXRoCiAgICBkPSdNOC41MzIsMjAuMDUzN2EzLjAzLDMuMDMsMCwxLDAsMS43MzI2Ljk5ODVDMTEuNzQsMTguNDcsMTMuODYsMTQuNzYwNywxMy44OSwxNC43MDhsLjQ5NzYtLjg2ODItLjg2NzctLjQ5N2E1LDUsMCwxLDEsNi44MTItMS44NDM4bDEuNzMxNSwxLjAwMmE3LjAwMDgsNy4wMDA4LDAsMSwwLTEwLjM0NjIsMi4wMzU2Yy0uNDU3Ljc0MjctMS4xMDIxLDEuODcxNi0yLjA3MzcsMy41NzI4WicvPgogIDxyZWN0IGlkPSdfVHJhbnNwYXJlbnRfUmVjdGFuZ2xlXycgZGF0YS1uYW1lPScmbHQ7VHJhbnNwYXJlbnQgUmVjdGFuZ2xlJmd0OycgY2xhc3M9J2Nscy0xJwogICAgd2lkdGg9JzMyJyBoZWlnaHQ9JzMyJy8+Cjwvc3ZnPg=="
+  }
+}
\ No newline at end of file
diff --git a/connectors/webhook/element-templates/hybrid/webhook-connector-start-message-hybrid.json b/connectors/webhook/element-templates/hybrid/webhook-connector-start-message-hybrid.json
new file mode 100644
index 0000000000..fb91f6b90a
--- /dev/null
+++ b/connectors/webhook/element-templates/hybrid/webhook-connector-start-message-hybrid.json
@@ -0,0 +1,481 @@
+{
+  "$schema" : "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+  "name" : "Hybrid Webhook Message Start Event Connector",
+  "id" : "io.camunda.connectors.webhook.WebhookConnectorStartMessage.v1-hybrid",
+  "description" : "Configure webhook to receive callbacks",
+  "documentationRef" : "https://docs.camunda.io/docs/components/connectors/out-of-the-box-connectors/http-webhook/",
+  "version" : 11,
+  "category" : {
+    "id" : "connectors",
+    "name" : "Connectors"
+  },
+  "appliesTo" : [ "bpmn:StartEvent" ],
+  "elementType" : {
+    "value" : "bpmn:StartEvent",
+    "eventDefinition" : "bpmn:MessageEventDefinition"
+  },
+  "groups" : [ {
+    "id" : "connectorType",
+    "label" : "Connector type"
+  }, {
+    "id" : "endpoint",
+    "label" : "Webhook configuration"
+  }, {
+    "id" : "authentication",
+    "label" : "Authentication"
+  }, {
+    "id" : "authorization",
+    "label" : "Authorization"
+  }, {
+    "id" : "webhookResponse",
+    "label" : "Webhook response"
+  }, {
+    "id" : "activation",
+    "label" : "Activation"
+  }, {
+    "id" : "correlation",
+    "label" : "Correlation"
+  }, {
+    "id" : "output",
+    "label" : "Output mapping"
+  } ],
+  "properties" : [ {
+    "id" : "connectorType",
+    "value" : "io.camunda:webhook:1",
+    "group" : "connectorType",
+    "binding" : {
+      "name" : "inbound.type",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "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/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" : [ {
+      "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/out-of-the-box-connectors/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" : "Basic",
+      "value" : "BASIC"
+    }, {
+      "name" : "API key",
+      "value" : "APIKEY"
+    }, {
+      "name" : "None",
+      "value" : "NONE"
+    }, {
+      "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/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",
+    "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/out-of-the-box-connectors/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" : "correlationRequired",
+    "label" : "Subprocess correlation required",
+    "description" : "Indicates whether correlation is required. This is needed for event-based subprocess message start events",
+    "value" : "notRequired",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationRequired",
+      "type" : "zeebe:property"
+    },
+    "type" : "Dropdown",
+    "choices" : [ {
+      "name" : "Correlation not required",
+      "value" : "notRequired"
+    }, {
+      "name" : "Correlation required",
+      "value" : "required"
+    } ]
+  }, {
+    "id" : "correlationKeyProcess",
+    "label" : "Correlation key (process)",
+    "description" : "Sets up the correlation key from process variables",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKey",
+      "type" : "bpmn:Message#zeebe:subscription#property"
+    },
+    "condition" : {
+      "property" : "correlationRequired",
+      "equals" : "required",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "correlationKeyPayload",
+    "label" : "Correlation key (payload)",
+    "description" : "Extracts the correlation key from the incoming message payload",
+    "constraints" : {
+      "notEmpty" : true
+    },
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "correlationKeyExpression",
+      "type" : "zeebe:property"
+    },
+    "condition" : {
+      "property" : "correlationRequired",
+      "equals" : "required",
+      "type" : "simple"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageIdExpression",
+    "label" : "Message ID expression",
+    "description" : "Expression to extract unique identifier of a message",
+    "optional" : true,
+    "feel" : "required",
+    "group" : "correlation",
+    "binding" : {
+      "name" : "messageIdExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "messageNameUuid",
+    "generatedValue" : {
+      "type" : "uuid"
+    },
+    "group" : "correlation",
+    "binding" : {
+      "name" : "name",
+      "type" : "bpmn:Message#property"
+    },
+    "type" : "Hidden"
+  }, {
+    "id" : "resultVariable",
+    "label" : "Result variable",
+    "description" : "Name of variable to store the response in",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultVariable",
+      "type" : "zeebe:property"
+    },
+    "type" : "String"
+  }, {
+    "id" : "resultExpression",
+    "label" : "Result expression",
+    "description" : "Expression to map the response into process variables",
+    "feel" : "required",
+    "group" : "output",
+    "binding" : {
+      "name" : "resultExpression",
+      "type" : "zeebe:property"
+    },
+    "type" : "Text"
+  } ],
+  "icon" : {
+    "contents" : "data:image/svg+xml;base64,PHN2ZyBpZD0naWNvbicgeG1sbnM9J2h0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnJyB3aWR0aD0nMTgnIGhlaWdodD0nMTgnIHZpZXdCb3g9JzAgMCAzMiAzMic+CiAgPGRlZnM+CiAgICA8c3R5bGU+LmNscy0xIHsgZmlsbDogbm9uZTsgfTwvc3R5bGU+CiAgPC9kZWZzPgogIDxwYXRoCiAgICBkPSdNMjQsMjZhMywzLDAsMSwwLTIuODE2NC00SDEzdjFhNSw1LDAsMSwxLTUtNVYxNmE3LDcsMCwxLDAsNi45Mjg3LDhoNi4yNTQ5QTIuOTkxNCwyLjk5MTQsMCwwLDAsMjQsMjZaJy8+CiAgPHBhdGgKICAgIGQ9J00yNCwxNmE3LjAyNCw3LjAyNCwwLDAsMC0yLjU3LjQ4NzNsLTMuMTY1Ni01LjUzOTVhMy4wNDY5LDMuMDQ2OSwwLDEsMC0xLjczMjYuOTk4NWw0LjExODksNy4yMDg1Ljg2ODYtLjQ5NzZhNS4wMDA2LDUuMDAwNiwwLDEsMS0xLjg1MSw2Ljg0MThMMTcuOTM3LDI2LjUwMUE3LjAwMDUsNy4wMDA1LDAsMSwwLDI0LDE2WicvPgogIDxwYXRoCiAgICBkPSdNOC41MzIsMjAuMDUzN2EzLjAzLDMuMDMsMCwxLDAsMS43MzI2Ljk5ODVDMTEuNzQsMTguNDcsMTMuODYsMTQuNzYwNywxMy44OSwxNC43MDhsLjQ5NzYtLjg2ODItLjg2NzctLjQ5N2E1LDUsMCwxLDEsNi44MTItMS44NDM4bDEuNzMxNSwxLjAwMmE3LjAwMDgsNy4wMDA4LDAsMSwwLTEwLjM0NjIsMi4wMzU2Yy0uNDU3Ljc0MjctMS4xMDIxLDEuODcxNi0yLjA3MzcsMy41NzI4WicvPgogIDxyZWN0IGlkPSdfVHJhbnNwYXJlbnRfUmVjdGFuZ2xlXycgZGF0YS1uYW1lPScmbHQ7VHJhbnNwYXJlbnQgUmVjdGFuZ2xlJmd0OycgY2xhc3M9J2Nscy0xJwogICAgd2lkdGg9JzMyJyBoZWlnaHQ9JzMyJy8+Cjwvc3ZnPg=="
+  }
+}
\ No newline at end of file
diff --git a/connectors/webhook/pom.xml b/connectors/webhook/pom.xml
index 7b6ac2fb33..0a1e51f80a 100644
--- a/connectors/webhook/pom.xml
+++ b/connectors/webhook/pom.xml
@@ -104,6 +104,7 @@
                   <templateFileName>webhook-connector-boundary.json</templateFileName>
                 </file>
               </files>
+              <generateHybridTemplates>true</generateHybridTemplates>
             </connector>
           </connectors>
         </configuration>
diff --git a/element-template-generator/core/src/main/java/io/camunda/connector/generator/api/GeneratorConfiguration.java b/element-template-generator/core/src/main/java/io/camunda/connector/generator/api/GeneratorConfiguration.java
index b8859cfab5..a63ef4023c 100644
--- a/element-template-generator/core/src/main/java/io/camunda/connector/generator/api/GeneratorConfiguration.java
+++ b/element-template-generator/core/src/main/java/io/camunda/connector/generator/api/GeneratorConfiguration.java
@@ -40,6 +40,9 @@ public enum ConnectorMode {
     HYBRID
   }
 
+  public static String HYBRID_TEMPLATE_ID_SUFFIX = "-hybrid";
+  public static String HYBRID_TEMPLATE_NAME_PREFIX = "Hybrid ";
+
   public enum GenerationFeature {
     INBOUND_DEDUPLICATION
   }
diff --git a/element-template-generator/core/src/main/java/io/camunda/connector/generator/java/ClassBasedTemplateGenerator.java b/element-template-generator/core/src/main/java/io/camunda/connector/generator/java/ClassBasedTemplateGenerator.java
index c2130e74ad..d77642a3d6 100644
--- a/element-template-generator/core/src/main/java/io/camunda/connector/generator/java/ClassBasedTemplateGenerator.java
+++ b/element-template-generator/core/src/main/java/io/camunda/connector/generator/java/ClassBasedTemplateGenerator.java
@@ -121,12 +121,11 @@ public List<io.camunda.connector.generator.dsl.ElementTemplate> generate(
                   context instanceof Outbound
                       ? ElementTemplateBuilder.createOutbound()
                       : ElementTemplateBuilder.createInbound();
+              boolean isHybridMode = ConnectorMode.HYBRID.equals(configuration.connectorMode());
               return builder
-                  .id(createId(context, template.id(), elementType))
-                  .type(
-                      context.connectorType(),
-                      ConnectorMode.HYBRID.equals(configuration.connectorMode()))
-                  .name(createName(context, template.name(), elementType))
+                  .id(createId(context, template.id(), elementType, isHybridMode))
+                  .type(context.connectorType(), isHybridMode)
+                  .name(createName(context, template.name(), elementType, isHybridMode))
                   .version(template.version())
                   .appliesTo(elementType.appliesTo())
                   .elementType(elementType.elementType())
@@ -143,28 +142,42 @@ public List<io.camunda.connector.generator.dsl.ElementTemplate> generate(
   }
 
   private static String createId(
-      TemplateGenerationContext context, String templateId, ConnectorElementType elementType) {
-    return Optional.ofNullable(elementType.templateIdOverride())
-        .orElseGet(
-            () ->
-                context.elementTypes().size() > 1
-                    ? templateId + ":" + elementType.elementType().getId()
-                    : templateId);
+      TemplateGenerationContext context,
+      String templateId,
+      ConnectorElementType elementType,
+      final boolean isHybridMode) {
+    String baseTemplateId =
+        Optional.ofNullable(elementType.templateIdOverride())
+            .orElseGet(
+                () ->
+                    context.elementTypes().size() > 1
+                        ? templateId + ":" + elementType.elementType().getId()
+                        : templateId);
+    return isHybridMode
+        ? baseTemplateId + GeneratorConfiguration.HYBRID_TEMPLATE_ID_SUFFIX
+        : baseTemplateId;
   }
 
   private static String createName(
-      TemplateGenerationContext context, String templateName, ConnectorElementType elementType) {
-    return Optional.ofNullable(elementType.templateNameOverride())
-        .orElseGet(
-            () -> {
-              if (context.elementTypes().size() > 1) {
-                return templateName
-                    + " ("
-                    + camelCaseToSpaces(elementType.elementType().getId())
-                    + ")";
-              }
-              return templateName;
-            });
+      TemplateGenerationContext context,
+      String templateName,
+      ConnectorElementType elementType,
+      boolean isHybridMode) {
+    String baseTemplateName =
+        Optional.ofNullable(elementType.templateNameOverride())
+            .orElseGet(
+                () -> {
+                  if (context.elementTypes().size() > 1) {
+                    return templateName
+                        + " ("
+                        + camelCaseToSpaces(elementType.elementType().getId())
+                        + ")";
+                  }
+                  return templateName;
+                });
+    return isHybridMode
+        ? GeneratorConfiguration.HYBRID_TEMPLATE_NAME_PREFIX + baseTemplateName
+        : baseTemplateName;
   }
 
   private List<PropertyGroup> addServiceProperties(
diff --git a/element-template-generator/maven-plugin/src/main/java/io/camunda/connector/generator/ElementTemplateGeneratorMojo.java b/element-template-generator/maven-plugin/src/main/java/io/camunda/connector/generator/ElementTemplateGeneratorMojo.java
index eeea70ba98..0e922bee66 100644
--- a/element-template-generator/maven-plugin/src/main/java/io/camunda/connector/generator/ElementTemplateGeneratorMojo.java
+++ b/element-template-generator/maven-plugin/src/main/java/io/camunda/connector/generator/ElementTemplateGeneratorMojo.java
@@ -173,44 +173,32 @@ private void generateElementTemplates(ConnectorConfig config, ClassLoader classL
 
   private void writeElementTemplates(
       List<ElementTemplate> templates, boolean hybrid, List<FileNameById> fileNames) {
-    if (templates.size() == 1) {
-      var fileName =
-          fileNames.stream()
-              .filter(f -> f.getTemplateId().equals(templates.getFirst().id()))
-              .findFirst()
-              .map(FileNameById::getTemplateFileName)
-              .orElseGet(
-                  () -> {
-                    getLog()
-                        .warn(
-                            "No file name specified for "
-                                + templates.getFirst().id()
-                                + ". Using default.");
-                    return transformConnectorNameToTemplateFileName(templates.getFirst().name());
-                  });
-      if (hybrid) {
-        fileName = fileName.replace(".json", "-hybrid.json");
-      }
-      writeElementTemplate(templates.getFirst(), hybrid, fileName);
-    } else {
-      for (var template : templates) {
-        var fileName =
-            fileNames.stream()
-                .filter(f -> f.getTemplateId().equals(template.id()))
-                .findFirst()
-                .map(FileNameById::getTemplateFileName)
-                .orElseGet(
-                    () -> {
-                      getLog()
-                          .warn("No file name specified for " + template.id() + ". Using default.");
-                      return transformConnectorNameToTemplateFileName(template.name());
-                    });
-        if (hybrid) {
-          fileName = fileName.replace(".json", "-hybrid.json");
-        }
-        writeElementTemplate(template, hybrid, fileName);
-      }
+    for (var template : templates) {
+      var fileName = determineFileName(template, fileNames, hybrid);
+      writeElementTemplate(template, hybrid, fileName);
+    }
+  }
+
+  private String determineFileName(
+      ElementTemplate template, List<FileNameById> fileNames, boolean hybrid) {
+    String expectedId =
+        hybrid && template.id() != null
+            ? template.id().replace(GeneratorConfiguration.HYBRID_TEMPLATE_ID_SUFFIX, "")
+            : template.id();
+    String fileName =
+        fileNames.stream()
+            .filter(f -> f.getTemplateId().equals(expectedId))
+            .findFirst()
+            .map(FileNameById::getTemplateFileName)
+            .orElseGet(
+                () -> {
+                  getLog().warn("No file name specified for " + expectedId + ". Using default.");
+                  return transformConnectorNameToTemplateFileName(template.name());
+                });
+    if (hybrid) {
+      fileName = fileName.replace(".json", "-hybrid.json");
     }
+    return fileName;
   }
 
   private void writeElementTemplate(ElementTemplate template, boolean hybrid, String fileName) {