diff --git a/kogito-quarkus-examples/flexible-process-quarkus/src/main/resources/service-desk.bpmn b/kogito-quarkus-examples/flexible-process-quarkus/src/main/resources/service-desk.bpmn
index 264cf721c3..bcc7565ee6 100644
--- a/kogito-quarkus-examples/flexible-process-quarkus/src/main/resources/service-desk.bpmn
+++ b/kogito-quarkus-examples/flexible-process-quarkus/src/main/resources/service-desk.bpmn
@@ -83,7 +83,6 @@
   <bpmn2:itemDefinition id="__D17F5E0D-779E-4AF4-9E33-6E37D8F54DA7_supportCaseOutputXItem" structureRef="org.kie.kogito.flexible.example.model.SupportCase"/>
   <bpmn2:itemDefinition id="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_ProductFamilyInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_ProductNameInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_SupportGroupOutputXItem" structureRef="String"/>
@@ -241,14 +240,12 @@
         <bpmn2:outgoing>_4D493B33-AE13-464F-B7F5-4A7A9A9044BA</bpmn2:outgoing>
         <bpmn2:ioSpecification>
           <bpmn2:dataInput id="_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_namespaceInputX" drools:dtype="java.lang.String" itemSubjectRef="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_namespaceInputXItem" name="namespace"/>
-          <bpmn2:dataInput id="_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_decisionInputX" drools:dtype="java.lang.String" itemSubjectRef="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_decisionInputXItem" name="decision"/>
           <bpmn2:dataInput id="_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_modelInputX" drools:dtype="java.lang.String" itemSubjectRef="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_modelInputXItem" name="model"/>
           <bpmn2:dataInput id="_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_ProductFamilyInputX" drools:dtype="String" itemSubjectRef="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_ProductFamilyInputXItem" name="ProductFamily"/>
           <bpmn2:dataInput id="_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_ProductNameInputX" drools:dtype="String" itemSubjectRef="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_ProductNameInputXItem" name="ProductName"/>
           <bpmn2:dataOutput id="_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_SupportGroupOutputX" drools:dtype="String" itemSubjectRef="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_SupportGroupOutputXItem" name="SupportGroup"/>
           <bpmn2:inputSet>
             <bpmn2:dataInputRefs>_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_namespaceInputX</bpmn2:dataInputRefs>
-            <bpmn2:dataInputRefs>_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_decisionInputX</bpmn2:dataInputRefs>
             <bpmn2:dataInputRefs>_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_modelInputX</bpmn2:dataInputRefs>
             <bpmn2:dataInputRefs>_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_ProductFamilyInputX</bpmn2:dataInputRefs>
             <bpmn2:dataInputRefs>_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_ProductNameInputX</bpmn2:dataInputRefs>
@@ -264,13 +261,6 @@
             <bpmn2:to xsi:type="bpmn2:tFormalExpression"><![CDATA[_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_namespaceInputX]]></bpmn2:to>
           </bpmn2:assignment>
         </bpmn2:dataInputAssociation>
-        <bpmn2:dataInputAssociation>
-          <bpmn2:targetRef>_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_decisionInputX</bpmn2:targetRef>
-          <bpmn2:assignment>
-            <bpmn2:from xsi:type="bpmn2:tFormalExpression"><![CDATA[triage]]></bpmn2:from>
-            <bpmn2:to xsi:type="bpmn2:tFormalExpression"><![CDATA[_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_decisionInputX]]></bpmn2:to>
-          </bpmn2:assignment>
-        </bpmn2:dataInputAssociation>
         <bpmn2:dataInputAssociation>
           <bpmn2:targetRef>_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_modelInputX</bpmn2:targetRef>
           <bpmn2:assignment>
diff --git a/kogito-quarkus-examples/kogito-travel-agency/basic/src/main/resources/org/acme/travels/travels.bpmn2 b/kogito-quarkus-examples/kogito-travel-agency/basic/src/main/resources/org/acme/travels/travels.bpmn2
index 9c2d8e3036..59906d3c8b 100644
--- a/kogito-quarkus-examples/kogito-travel-agency/basic/src/main/resources/org/acme/travels/travels.bpmn2
+++ b/kogito-quarkus-examples/kogito-travel-agency/basic/src/main/resources/org/acme/travels/travels.bpmn2
@@ -40,7 +40,6 @@
   <bpmn2:itemDefinition id="_UserTask_1_visaApplicationOutputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="_BusinessRuleTask_1_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_travellerInputXItem" structureRef="org.acme.travels.Traveller"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_tripInputXItem" structureRef="org.acme.travels.Trip"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_tripOutputXItem" structureRef="org.acme.travels.Trip"/>
diff --git a/kogito-quarkus-examples/kogito-travel-agency/extended/travels/src/main/resources/org/acme/travels/travels.bpmn2 b/kogito-quarkus-examples/kogito-travel-agency/extended/travels/src/main/resources/org/acme/travels/travels.bpmn2
index 025b198fe5..bdcebff6e5 100644
--- a/kogito-quarkus-examples/kogito-travel-agency/extended/travels/src/main/resources/org/acme/travels/travels.bpmn2
+++ b/kogito-quarkus-examples/kogito-travel-agency/extended/travels/src/main/resources/org/acme/travels/travels.bpmn2
@@ -44,7 +44,6 @@
   <bpmn2:itemDefinition id="__24FBB8D6-EF2D-4DCC-846D-D8C5E21849D2_tripInputXItem" structureRef="org.acme.travels.Trip"/>
   <bpmn2:itemDefinition id="__54ABE1ED-61BE-45F9-812C-795A5D4ED35E_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__54ABE1ED-61BE-45F9-812C-795A5D4ED35E_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__54ABE1ED-61BE-45F9-812C-795A5D4ED35E_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__54ABE1ED-61BE-45F9-812C-795A5D4ED35E_travellerInputXItem" structureRef="org.acme.travels.Traveller"/>
   <bpmn2:itemDefinition id="__54ABE1ED-61BE-45F9-812C-795A5D4ED35E_tripInputXItem" structureRef="org.acme.travels.Trip"/>
   <bpmn2:itemDefinition id="__54ABE1ED-61BE-45F9-812C-795A5D4ED35E_tripOutputXItem" structureRef="org.acme.travels.Trip"/>
diff --git a/kogito-quarkus-examples/kogito-travel-agency/extended/visas/src/main/resources/org/acme/travels/ProcessVisaApplications.bpmn2 b/kogito-quarkus-examples/kogito-travel-agency/extended/visas/src/main/resources/org/acme/travels/ProcessVisaApplications.bpmn2
index 9b724728b8..287146b28e 100644
--- a/kogito-quarkus-examples/kogito-travel-agency/extended/visas/src/main/resources/org/acme/travels/ProcessVisaApplications.bpmn2
+++ b/kogito-quarkus-examples/kogito-travel-agency/extended/visas/src/main/resources/org/acme/travels/ProcessVisaApplications.bpmn2
@@ -23,7 +23,6 @@
   <bpmn2:itemDefinition id="visasapprovedType" structureRef="org.acme.travels.VisaResolution"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="_BusinessRuleTask_1_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_applicationInputXItem" structureRef="org.acme.travels.VisaApplication"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_resolutionInputXItem" structureRef="org.acme.travels.VisaResolution"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_resolutionOutputXItem" structureRef="org.acme.travels.VisaResolution"/>
diff --git a/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/resources/org/kie/kogito/examples/onboarding/onboarding.bpmn b/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/resources/org/kie/kogito/examples/onboarding/onboarding.bpmn
index c82b0acf00..9509809d2e 100644
--- a/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/resources/org/kie/kogito/examples/onboarding/onboarding.bpmn
+++ b/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/resources/org/kie/kogito/examples/onboarding/onboarding.bpmn
@@ -8,14 +8,12 @@
   <bpmn2:itemDefinition id="_messageItem" structureRef="String"/>
   <bpmn2:itemDefinition id="_managerItem" structureRef="String"/>
   <bpmn2:itemDefinition id="_departmentItem" structureRef="String"/>
-  <bpmn2:itemDefinition id="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_DecisionInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_ModelInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_NamespaceInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_emailOutputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_employeeIdOutputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__9D7A4927-BFCB-4F17-A4D4-E3D03B3FBE49_employeeInputXItem" structureRef="org.kie.kogito.examples.onboarding.Employee"/>
   <bpmn2:itemDefinition id="__9D7A4927-BFCB-4F17-A4D4-E3D03B3FBE49_payrollOutputXItem" structureRef="org.kie.kogito.examples.onboarding.Payroll"/>
-  <bpmn2:itemDefinition id="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_DecisionInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_ModelInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_NamespaceInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_employeeInputXItem" structureRef="org.kie.kogito.examples.onboarding.Employee"/>
@@ -245,7 +243,6 @@
       <bpmn2:incoming>_9D72C909-B631-415E-B015-30812A42B8C2</bpmn2:incoming>
       <bpmn2:outgoing>_5A442C9F-BADA-4D95-9ECA-3BD2898C8377</bpmn2:outgoing>
       <bpmn2:ioSpecification id="_YwdwTVr1EemSce_o1Tqd5Q">
-        <bpmn2:dataInput id="_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_DecisionInputX" drools:dtype="String" itemSubjectRef="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_DecisionInputXItem" name="Decision"/>
         <bpmn2:dataInput id="_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_ModelInputX" drools:dtype="String" itemSubjectRef="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_ModelInputXItem" name="Model"/>
         <bpmn2:dataInput id="_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_NamespaceInputX" drools:dtype="String" itemSubjectRef="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_NamespaceInputXItem" name="Namespace"/>
         <bpmn2:dataInput id="_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_employeeInputX" drools:dtype="org.kie.kogito.examples.onboarding.Employee" itemSubjectRef="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_employeeInputXItem" name="employee"/>
@@ -253,7 +250,6 @@
         <bpmn2:dataOutput id="_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_statusOutputX" drools:dtype="String" itemSubjectRef="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_statusOutputXItem" name="status"/>
         <bpmn2:dataOutput id="_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_messageOutputX" drools:dtype="String" itemSubjectRef="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_messageOutputXItem" name="message"/>
         <bpmn2:inputSet id="_YwdwTlr1EemSce_o1Tqd5Q">
-          <bpmn2:dataInputRefs>_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_DecisionInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_ModelInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_NamespaceInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_employeeInputX</bpmn2:dataInputRefs>
@@ -264,13 +260,6 @@
           <bpmn2:dataOutputRefs>_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_messageOutputX</bpmn2:dataOutputRefs>
         </bpmn2:outputSet>
       </bpmn2:ioSpecification>
-      <bpmn2:dataInputAssociation id="_YwdwUFr1EemSce_o1Tqd5Q">
-        <bpmn2:targetRef>_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_DecisionInputX</bpmn2:targetRef>
-        <bpmn2:assignment id="_YwdwUVr1EemSce_o1Tqd5Q">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="_YwdwUlr1EemSce_o1Tqd5Q"><![CDATA[employee-validation/first]]></bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="_YwdwU1r1EemSce_o1Tqd5Q">_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_DecisionInputX</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
       <bpmn2:dataInputAssociation id="_YwdwVFr1EemSce_o1Tqd5Q">
         <bpmn2:targetRef>_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_ModelInputX</bpmn2:targetRef>
         <bpmn2:assignment id="_YwdwVVr1EemSce_o1Tqd5Q">
@@ -350,7 +339,6 @@
       <bpmn2:incoming>_A65F4850-A93F-4703-B5AA-2EF5F649BC86</bpmn2:incoming>
       <bpmn2:outgoing>_7DF7D2C1-195D-4C19-BC47-CC4462F9062D</bpmn2:outgoing>
       <bpmn2:ioSpecification id="_YweXUlr1EemSce_o1Tqd5Q">
-        <bpmn2:dataInput id="_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_DecisionInputX" drools:dtype="String" itemSubjectRef="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_DecisionInputXItem" name="Decision"/>
         <bpmn2:dataInput id="_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_ModelInputX" drools:dtype="String" itemSubjectRef="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_ModelInputXItem" name="Model"/>
         <bpmn2:dataInput id="_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_NamespaceInputX" drools:dtype="String" itemSubjectRef="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_NamespaceInputXItem" name="Namespace"/>
         <bpmn2:dataInput id="_9D7A4927-BFCB-4F17-A4D4-E3D03B3FBE40_employeeInputX" drools:dtype="org.kie.kogito.examples.onboarding.Employee" itemSubjectRef="__9D7A4927-BFCB-4F17-A4D4-E3D03B3FBE49_employeeInputXItem" name="employee"/>
@@ -358,7 +346,6 @@
         <bpmn2:dataOutput id="_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_emailOutputX" drools:dtype="String" itemSubjectRef="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_emailOutputXItem" name="email"/>
         <bpmn2:dataOutput id="_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_employeeIdOutputX" drools:dtype="String" itemSubjectRef="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_employeeIdOutputXItem" name="employeeId"/>
         <bpmn2:inputSet id="_YweXU1r1EemSce_o1Tqd5Q">
-          <bpmn2:dataInputRefs>_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_DecisionInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_ModelInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_NamespaceInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_9D7A4927-BFCB-4F17-A4D4-E3D03B3FBE40_employeeInputX</bpmn2:dataInputRefs>
@@ -369,13 +356,6 @@
           <bpmn2:dataOutputRefs>_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_employeeIdOutputX</bpmn2:dataOutputRefs>
         </bpmn2:outputSet>
       </bpmn2:ioSpecification>
-      <bpmn2:dataInputAssociation id="_YweXVVr1EemSce_o1Tqd5Q">
-        <bpmn2:targetRef>_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_DecisionInputX</bpmn2:targetRef>
-        <bpmn2:assignment id="_YweXVlr1EemSce_o1Tqd5Q">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="_YweXV1r1EemSce_o1Tqd5Q"><![CDATA[id]]></bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="_YweXWFr1EemSce_o1Tqd5Q">_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_DecisionInputX</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
       <bpmn2:dataInputAssociation id="_YweXWVr1EemSce_o1Tqd5Q">
         <bpmn2:targetRef>_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_ModelInputX</bpmn2:targetRef>
         <bpmn2:assignment id="_YweXWlr1EemSce_o1Tqd5Q">
diff --git a/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/resources/org/kie/kogito/examples/onboarding/setupHR.bpmn b/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/resources/org/kie/kogito/examples/onboarding/setupHR.bpmn
index 6197ea0873..5c2388f9d7 100644
--- a/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/resources/org/kie/kogito/examples/onboarding/setupHR.bpmn
+++ b/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/resources/org/kie/kogito/examples/onboarding/setupHR.bpmn
@@ -6,7 +6,7 @@
   <bpmn2:itemDefinition id="__C2C840B8-C669-4134-91DD-81B664982F57_ModelInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__C2C840B8-C669-4134-91DD-81B664982F57_NamespaceInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__C2C840B8-C669-4134-91DD-81B664982F57_employeeInputXItem" structureRef="org.kie.kogito.examples.onboarding.Employee"/>
-  <bpmn2:itemDefinition id="__C2C840B8-C669-4134-91DD-81B664982F57_DecisionInputXItem" structureRef="String"/>
+  <bpmn2:itemDefinition id="__C2C840B8-C669-4134-91DD-81B664982F57_TaskNameInputXItem" structureRef="Object"/>
   <bpmn2:itemDefinition id="__C2C840B8-C669-4134-91DD-81B664982F57_managerOutputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__C2C840B8-C669-4134-91DD-81B664982F57_departmentOutputXItem" structureRef="String"/>
   <bpmn2:process id="onboarding.setupHR" drools:packageName="org.kie.kogito.examples.onboarding" drools:version="1.0" drools:adHoc="false" name="setupHR" isExecutable="true" processType="Private">
@@ -51,15 +51,13 @@
         <bpmn2:dataInput id="_C2C840B8-C669-4134-91DD-81B664982F57_ModelInputX" drools:dtype="String" itemSubjectRef="__C2C840B8-C669-4134-91DD-81B664982F57_ModelInputXItem" name="Model"/>
         <bpmn2:dataInput id="_C2C840B8-C669-4134-91DD-81B664982F57_NamespaceInputX" drools:dtype="String" itemSubjectRef="__C2C840B8-C669-4134-91DD-81B664982F57_NamespaceInputXItem" name="Namespace"/>
         <bpmn2:dataInput id="_C2C840B8-C669-4134-91DD-81B664982F57_employeeInputX" drools:dtype="org.kie.kogito.examples.onboarding.Employee" itemSubjectRef="__C2C840B8-C669-4134-91DD-81B664982F57_employeeInputXItem" name="employee"/>
-        <bpmn2:dataInput id="_C2C840B8-C669-4134-91DD-81B664982F57_DecisionInputX" drools:dtype="String" itemSubjectRef="__C2C840B8-C669-4134-91DD-81B664982F57_DecisionInputXItem" name="Decision"/>
-        <bpmn2:dataInput id="_C2C840B8-C669-4134-91DD-81B664982F57_TaskNameInputX" drools:dtype="Object" itemSubjectRef="__C2C840B8-C669-4134-91DD-81B664982F57_DecisionInputXItem" name="TaskName"/>
+        <bpmn2:dataInput id="_C2C840B8-C669-4134-91DD-81B664982F57_TaskNameInputX" drools:dtype="Object" itemSubjectRef="__C2C840B8-C669-4134-91DD-81B664982F57_TaskNameInputXItem" name="TaskName"/>
         <bpmn2:dataOutput id="_C2C840B8-C669-4134-91DD-81B664982F57_managerOutputX" drools:dtype="String" itemSubjectRef="__C2C840B8-C669-4134-91DD-81B664982F57_managerOutputXItem" name="manager"/>
         <bpmn2:dataOutput id="_C2C840B8-C669-4134-91DD-81B664982F57_departmentOutputX" drools:dtype="String" itemSubjectRef="__C2C840B8-C669-4134-91DD-81B664982F57_departmentOutputXItem" name="department"/>
         <bpmn2:inputSet id="_7gwnglrCEem3t4ZSfERqCw">
           <bpmn2:dataInputRefs>_C2C840B8-C669-4134-91DD-81B664982F57_ModelInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_C2C840B8-C669-4134-91DD-81B664982F57_NamespaceInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_C2C840B8-C669-4134-91DD-81B664982F57_employeeInputX</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_C2C840B8-C669-4134-91DD-81B664982F57_DecisionInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_C2C840B8-C669-4134-91DD-81B664982F57_TaskNameInputX</bpmn2:dataInputRefs>
         </bpmn2:inputSet>
         <bpmn2:outputSet id="_7gwng1rCEem3t4ZSfERqCw">
@@ -85,13 +83,6 @@
         <bpmn2:sourceRef>employee</bpmn2:sourceRef>
         <bpmn2:targetRef>_C2C840B8-C669-4134-91DD-81B664982F57_employeeInputX</bpmn2:targetRef>
       </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="_7gwnjVrCEem3t4ZSfERqCw">
-        <bpmn2:targetRef>_C2C840B8-C669-4134-91DD-81B664982F57_DecisionInputX</bpmn2:targetRef>
-        <bpmn2:assignment id="_7gwnjlrCEem3t4ZSfERqCw">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="_7gwnj1rCEem3t4ZSfERqCw"><![CDATA[department/first]]></bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="_7gwnkFrCEem3t4ZSfERqCw">_C2C840B8-C669-4134-91DD-81B664982F57_DecisionInputX</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
       <bpmn2:dataInputAssociation id="_7gwnkVrCEem3t4ZSfERqCw">
         <bpmn2:targetRef>_C2C840B8-C669-4134-91DD-81B664982F57_TaskNameInputX</bpmn2:targetRef>
         <bpmn2:assignment id="_7gwnklrCEem3t4ZSfERqCw">
diff --git a/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/resources/org/kie/kogito/examples/onboarding/setupPayroll.bpmn b/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/resources/org/kie/kogito/examples/onboarding/setupPayroll.bpmn
index 1b8d288b15..bd2686f604 100644
--- a/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/resources/org/kie/kogito/examples/onboarding/setupPayroll.bpmn
+++ b/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/resources/org/kie/kogito/examples/onboarding/setupPayroll.bpmn
@@ -6,17 +6,14 @@
   <bpmn2:itemDefinition id="_vacationDaysItem" isCollection="false" structureRef="Integer"/>
   <bpmn2:itemDefinition id="_taxRateItem" isCollection="false" structureRef="java.lang.Double"/>
   <bpmn2:itemDefinition id="_paymentDateItem" isCollection="false" structureRef="java.util.Date"/>
-  <bpmn2:itemDefinition id="__D2DE6249-804E-432D-9600-6B0F618B457C_DecisionInputXItem" isCollection="false" structureRef="String"/>
   <bpmn2:itemDefinition id="__D2DE6249-804E-432D-9600-6B0F618B457C_ModelInputXItem" isCollection="false" structureRef="String"/>
   <bpmn2:itemDefinition id="__D2DE6249-804E-432D-9600-6B0F618B457C_NamespaceInputXItem" isCollection="false" structureRef="String"/>
   <bpmn2:itemDefinition id="__D2DE6249-804E-432D-9600-6B0F618B457C_employeeInputXItem" isCollection="false" structureRef="org.kie.kogito.examples.onboarding.Employee"/>
   <bpmn2:itemDefinition id="__D2DE6249-804E-432D-9600-6B0F618B457C_taxRateOutputXItem" isCollection="false" structureRef="java.lang.Double"/>
   <bpmn2:itemDefinition id="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_ModelInputXItem" isCollection="false" structureRef="String"/>
   <bpmn2:itemDefinition id="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_NamespaceInputXItem" isCollection="false" structureRef="String"/>
-  <bpmn2:itemDefinition id="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_DecisionInputXItem" isCollection="false" structureRef="String"/>
   <bpmn2:itemDefinition id="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_employeeInputXItem" isCollection="false" structureRef="org.kie.kogito.examples.onboarding.Employee"/>
   <bpmn2:itemDefinition id="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_vacationDaysOutputXItem" isCollection="false" structureRef="Integer"/>
-  <bpmn2:itemDefinition id="__83EB46B5-7186-4575-8AA0-1A8FCCE1D163_DecisionInputXItem" isCollection="false" structureRef="String"/>
   <bpmn2:itemDefinition id="__83EB46B5-7186-4575-8AA0-1A8FCCE1D163_ModelInputXItem" isCollection="false" structureRef="String"/>
   <bpmn2:itemDefinition id="__83EB46B5-7186-4575-8AA0-1A8FCCE1D163_NamespaceInputXItem" isCollection="false" structureRef="String"/>
   <bpmn2:itemDefinition id="__83EB46B5-7186-4575-8AA0-1A8FCCE1D163_employeeInputXItem" isCollection="false" structureRef="org.kie.kogito.examples.onboarding.Employee"/>
@@ -93,14 +90,12 @@
       <bpmn2:incoming>_B94F71D7-E34E-4513-B06D-33F6EF74C9E6</bpmn2:incoming>
       <bpmn2:outgoing>_344D9BF6-D173-4BEC-943B-5E4394A6B6C7</bpmn2:outgoing>
       <bpmn2:ioSpecification id="_fWl5ZWdbEemTPrcubws9TA">
-        <bpmn2:dataInput id="_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_DecisionInputX" drools:dtype="String" itemSubjectRef="__83EB46B5-7186-4575-8AA0-1A8FCCE1D163_DecisionInputXItem" name="Decision"/>
         <bpmn2:dataInput id="_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_ModelInputX" drools:dtype="String" itemSubjectRef="__83EB46B5-7186-4575-8AA0-1A8FCCE1D163_ModelInputXItem" name="Model"/>
         <bpmn2:dataInput id="_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_NamespaceInputX" drools:dtype="String" itemSubjectRef="__83EB46B5-7186-4575-8AA0-1A8FCCE1D163_NamespaceInputXItem" name="Namespace"/>
         <bpmn2:dataInput id="_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_employeeInputX" drools:dtype="org.kie.kogito.examples.onboarding.Employee" itemSubjectRef="__83EB46B5-7186-4575-8AA0-1A8FCCE1D163_employeeInputXItem" name="employee"/>
         <bpmn2:dataInput id="_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_TaskNameInputX" drools:dtype="Object" name="TaskName"/>
         <bpmn2:dataOutput id="_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_paymentDateOutputX" drools:dtype="java.util.Date" itemSubjectRef="__83EB46B5-7186-4575-8AA0-1A8FCCE1D163_paymentDateOutputXItem" name="paymentDate"/>
         <bpmn2:inputSet id="_fWl5ZmdbEemTPrcubws9TA">
-          <bpmn2:dataInputRefs>_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_DecisionInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_ModelInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_NamespaceInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_employeeInputX</bpmn2:dataInputRefs>
@@ -110,13 +105,6 @@
           <bpmn2:dataOutputRefs>_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_paymentDateOutputX</bpmn2:dataOutputRefs>
         </bpmn2:outputSet>
       </bpmn2:ioSpecification>
-      <bpmn2:dataInputAssociation id="_fWl5aGdbEemTPrcubws9TA">
-        <bpmn2:targetRef>_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_DecisionInputX</bpmn2:targetRef>
-        <bpmn2:assignment id="_fWl5aWdbEemTPrcubws9TA">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="_fWl5amdbEemTPrcubws9TA"><![CDATA[payments/date]]></bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="_fWl5a2dbEemTPrcubws9TA">_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_DecisionInputX</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
       <bpmn2:dataInputAssociation id="_fWl5bGdbEemTPrcubws9TA">
         <bpmn2:targetRef>_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_ModelInputX</bpmn2:targetRef>
         <bpmn2:assignment id="_fWl5bWdbEemTPrcubws9TA">
@@ -171,14 +159,12 @@
       <bpmn2:ioSpecification id="_fWl5e2dbEemTPrcubws9TA">
         <bpmn2:dataInput id="_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_ModelInputX" drools:dtype="String" itemSubjectRef="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_ModelInputXItem" name="Model"/>
         <bpmn2:dataInput id="_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_NamespaceInputX" drools:dtype="String" itemSubjectRef="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_NamespaceInputXItem" name="Namespace"/>
-        <bpmn2:dataInput id="_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_DecisionInputX" drools:dtype="String" itemSubjectRef="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_DecisionInputXItem" name="Decision"/>
         <bpmn2:dataInput id="_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_employeeInputX" drools:dtype="org.kie.kogito.examples.onboarding.Employee" itemSubjectRef="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_employeeInputXItem" name="employee"/>
         <bpmn2:dataInput id="_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_TaskNameInputX" drools:dtype="Object" name="TaskName"/>
         <bpmn2:dataOutput id="_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_vacationDaysOutputX" drools:dtype="Integer" itemSubjectRef="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_vacationDaysOutputXItem" name="vacationDays"/>
         <bpmn2:inputSet id="_fWl5fGdbEemTPrcubws9TA">
           <bpmn2:dataInputRefs>_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_ModelInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_NamespaceInputX</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_DecisionInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_employeeInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_TaskNameInputX</bpmn2:dataInputRefs>
         </bpmn2:inputSet>
@@ -200,13 +186,6 @@
           <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="_fWl5hWdbEemTPrcubws9TA">_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_NamespaceInputX</bpmn2:to>
         </bpmn2:assignment>
       </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="_fWmgcGdbEemTPrcubws9TA">
-        <bpmn2:targetRef>_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_DecisionInputX</bpmn2:targetRef>
-        <bpmn2:assignment id="_fWmgcWdbEemTPrcubws9TA">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="_fWmgcmdbEemTPrcubws9TA"><![CDATA[vacations/days]]></bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="_fWmgc2dbEemTPrcubws9TA">_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_DecisionInputX</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
       <bpmn2:dataInputAssociation id="_fWmgdGdbEemTPrcubws9TA">
         <bpmn2:sourceRef>employee</bpmn2:sourceRef>
         <bpmn2:targetRef>_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_employeeInputX</bpmn2:targetRef>
@@ -240,14 +219,12 @@
       <bpmn2:incoming>_622BF92E-6590-44B6-B83D-10C0D8067D09</bpmn2:incoming>
       <bpmn2:outgoing>_7597C8A1-CC2B-4345-99A2-3F3A71C1FDA1</bpmn2:outgoing>
       <bpmn2:ioSpecification id="_fWmgemdbEemTPrcubws9TA">
-        <bpmn2:dataInput id="_D2DE6249-804E-432D-9600-6B0F618B457C_DecisionInputX" drools:dtype="String" itemSubjectRef="__D2DE6249-804E-432D-9600-6B0F618B457C_DecisionInputXItem" name="Decision"/>
         <bpmn2:dataInput id="_D2DE6249-804E-432D-9600-6B0F618B457C_ModelInputX" drools:dtype="String" itemSubjectRef="__D2DE6249-804E-432D-9600-6B0F618B457C_ModelInputXItem" name="Model"/>
         <bpmn2:dataInput id="_D2DE6249-804E-432D-9600-6B0F618B457C_NamespaceInputX" drools:dtype="String" itemSubjectRef="__D2DE6249-804E-432D-9600-6B0F618B457C_NamespaceInputXItem" name="Namespace"/>
         <bpmn2:dataInput id="_D2DE6249-804E-432D-9600-6B0F618B457C_employeeInputX" drools:dtype="org.kie.kogito.examples.onboarding.Employee" itemSubjectRef="__D2DE6249-804E-432D-9600-6B0F618B457C_employeeInputXItem" name="employee"/>
         <bpmn2:dataInput id="_D2DE6249-804E-432D-9600-6B0F618B457C_TaskNameInputX" drools:dtype="Object" name="TaskName"/>
         <bpmn2:dataOutput id="_D2DE6249-804E-432D-9600-6B0F618B457C_taxRateOutputX" drools:dtype="java.lang.Double" itemSubjectRef="__D2DE6249-804E-432D-9600-6B0F618B457C_taxRateOutputXItem" name="taxRate"/>
         <bpmn2:inputSet id="_fWmge2dbEemTPrcubws9TA">
-          <bpmn2:dataInputRefs>_D2DE6249-804E-432D-9600-6B0F618B457C_DecisionInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_D2DE6249-804E-432D-9600-6B0F618B457C_ModelInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_D2DE6249-804E-432D-9600-6B0F618B457C_NamespaceInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_D2DE6249-804E-432D-9600-6B0F618B457C_employeeInputX</bpmn2:dataInputRefs>
@@ -257,13 +234,6 @@
           <bpmn2:dataOutputRefs>_D2DE6249-804E-432D-9600-6B0F618B457C_taxRateOutputX</bpmn2:dataOutputRefs>
         </bpmn2:outputSet>
       </bpmn2:ioSpecification>
-      <bpmn2:dataInputAssociation id="_fWmgfWdbEemTPrcubws9TA">
-        <bpmn2:targetRef>_D2DE6249-804E-432D-9600-6B0F618B457C_DecisionInputX</bpmn2:targetRef>
-        <bpmn2:assignment id="_fWmgfmdbEemTPrcubws9TA">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="_fWmgf2dbEemTPrcubws9TA"><![CDATA[taxes/rate]]></bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="_fWmggGdbEemTPrcubws9TA">_D2DE6249-804E-432D-9600-6B0F618B457C_DecisionInputX</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
       <bpmn2:dataInputAssociation id="_fWmggWdbEemTPrcubws9TA">
         <bpmn2:targetRef>_D2DE6249-804E-432D-9600-6B0F618B457C_ModelInputX</bpmn2:targetRef>
         <bpmn2:assignment id="_fWmggmdbEemTPrcubws9TA">
diff --git a/kogito-quarkus-examples/process-business-rules-quarkus/src/main/resources/org/acme/travels/persons.bpmn b/kogito-quarkus-examples/process-business-rules-quarkus/src/main/resources/org/acme/travels/persons.bpmn
index e3df8da64a..ea1eaee70e 100644
--- a/kogito-quarkus-examples/process-business-rules-quarkus/src/main/resources/org/acme/travels/persons.bpmn
+++ b/kogito-quarkus-examples/process-business-rules-quarkus/src/main/resources/org/acme/travels/persons.bpmn
@@ -15,7 +15,6 @@
   <bpmn2:itemDefinition id="__D9CFCEE9-BCDF-48D0-8CB4-A55584DF0D9D_personInputXItem" structureRef="org.acme.travels.Person"/>
   <bpmn2:itemDefinition id="__7B8CC121-6F99-464A-93F8-9EAC4BE4601A_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__7B8CC121-6F99-464A-93F8-9EAC4BE4601A_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__7B8CC121-6F99-464A-93F8-9EAC4BE4601A_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__7B8CC121-6F99-464A-93F8-9EAC4BE4601A_personsInputXItem" structureRef="org.amce.travels.Person"/>
   <bpmn2:process id="persons" drools:packageName="org.acme.travels" drools:version="1.0" drools:adHoc="false" name="persons" isExecutable="true">
     <bpmn2:property id="person" itemSubjectRef="_personItem" name="person"/>
diff --git a/kogito-quarkus-examples/process-decisions-quarkus/README.md b/kogito-quarkus-examples/process-decisions-quarkus/README.md
index 8134d0edb8..8a4f9ba703 100644
--- a/kogito-quarkus-examples/process-decisions-quarkus/README.md
+++ b/kogito-quarkus-examples/process-decisions-quarkus/README.md
@@ -73,7 +73,7 @@ Similar to the License Validation Task, but it represents the task to do the cal
 
 <img src="docs/images/traffic-violation-dmn-businessrule.png" width=150/>
 
-The properties to be set are mainly the `Rule Language`that should be set as `DMN` and the `Namespace`, `Decision Name` and `DMN Model Name` must be set with the values defined in in the DMN, in this case [TrafficViolation.dmn](src/main/resources/TrafficViolation.dmn).
+The properties to be set are mainly the `Rule Language`that should be set as `DMN` and the `Namespace` and `DMN Model Name` must be set with the values defined in in the DMN, in this case [TrafficViolation.dmn](src/main/resources/TrafficViolation.dmn).
 
 <img src="docs/images/traffic-violation-dmn-businessrule-properties.png" width=300/>
 
diff --git a/kogito-quarkus-examples/process-decisions-quarkus/docs/images/traffic-violation-dmn-businessrule-properties.png b/kogito-quarkus-examples/process-decisions-quarkus/docs/images/traffic-violation-dmn-businessrule-properties.png
index ee989077e3..ff4251cd52 100644
Binary files a/kogito-quarkus-examples/process-decisions-quarkus/docs/images/traffic-violation-dmn-businessrule-properties.png and b/kogito-quarkus-examples/process-decisions-quarkus/docs/images/traffic-violation-dmn-businessrule-properties.png differ
diff --git a/kogito-quarkus-examples/process-decisions-quarkus/src/main/resources/traffic-rules-dmn.bpmn b/kogito-quarkus-examples/process-decisions-quarkus/src/main/resources/traffic-rules-dmn.bpmn
index 2cc3bd1c29..38126baf68 100644
--- a/kogito-quarkus-examples/process-decisions-quarkus/src/main/resources/traffic-rules-dmn.bpmn
+++ b/kogito-quarkus-examples/process-decisions-quarkus/src/main/resources/traffic-rules-dmn.bpmn
@@ -6,7 +6,6 @@
   <bpmn2:itemDefinition id="_fineItem" structureRef="org.kie.kogito.traffic.Fine"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_ViolationInputXItem" structureRef="org.kie.kogito.traffic.Violation"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_DriverInputXItem" structureRef="org.kie.kogito.traffic.Driver"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_SuspendedOutputXItem" structureRef="String"/>
@@ -15,7 +14,6 @@
   <bpmn2:itemDefinition id="__93FFD317-476E-4624-84EF-994617572560_responseOutputXItem" structureRef="org.kie.kogito.traffic.Driver"/>
   <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_driverInputXItem" structureRef="org.kie.kogito.traffic.Driver"/>
   <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_driverOutputXItem" structureRef="org.kie.kogito.traffic.Driver"/>
   <bpmn2:interface id="_93FFD317-476E-4624-84EF-994617572560_ServiceInterface" name="org.kie.kogito.traffic.DriverService" implementationRef="org.kie.kogito.traffic.DriverService">
@@ -217,7 +215,6 @@ DMN]]></drools:metaValue>
       <bpmn2:outgoing>_B8BD225A-B26C-4C0F-9852-ED3664524A14</bpmn2:outgoing>
       <bpmn2:ioSpecification>
         <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputX" drools:dtype="java.lang.String" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputXItem" name="namespace"/>
-        <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputX" drools:dtype="java.lang.String" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputXItem" name="decision"/>
         <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputX" drools:dtype="java.lang.String" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputXItem" name="model"/>
         <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_ViolationInputX" drools:dtype="org.kie.kogito.traffic.Violation" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_ViolationInputXItem" name="Violation"/>
         <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_DriverInputX" drools:dtype="org.kie.kogito.traffic.Driver" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_DriverInputXItem" name="Driver"/>
@@ -225,7 +222,6 @@ DMN]]></drools:metaValue>
         <bpmn2:dataOutput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_FineOutputX" drools:dtype="org.kie.kogito.traffic.Fine" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_FineOutputXItem" name="Fine"/>
         <bpmn2:inputSet>
           <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputX</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_ViolationInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_DriverInputX</bpmn2:dataInputRefs>
@@ -242,13 +238,6 @@ DMN]]></drools:metaValue>
           <bpmn2:to xsi:type="bpmn2:tFormalExpression"><![CDATA[_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputX]]></bpmn2:to>
         </bpmn2:assignment>
       </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation>
-        <bpmn2:targetRef>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputX</bpmn2:targetRef>
-        <bpmn2:assignment>
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression"><![CDATA[Traffic Violation]]></bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression"><![CDATA[_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputX]]></bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
       <bpmn2:dataInputAssociation>
         <bpmn2:targetRef>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputX</bpmn2:targetRef>
         <bpmn2:assignment>
diff --git a/kogito-quarkus-examples/process-decisions-rules-quarkus/README.md b/kogito-quarkus-examples/process-decisions-rules-quarkus/README.md
index 1d086fb763..c6237aaafd 100644
--- a/kogito-quarkus-examples/process-decisions-rules-quarkus/README.md
+++ b/kogito-quarkus-examples/process-decisions-rules-quarkus/README.md
@@ -73,7 +73,7 @@ Similar to the License Validation Task, but it represents the task to do the cal
 
 <img src="docs/images/traffic-violation-dmn-businessrule.png" width=150/>
 
-The properties to be set are mainly the `Rule Language`that should be set as `DMN` and the `Namespace`, `Decision Name` and `DMN Model Name` must be set with the values defined in in the DMN, in this case [TrafficViolation.dmn](src/main/resources/TrafficViolation.dmn).
+The properties to be set are mainly the `Rule Language`that should be set as `DMN` and the `Namespace` and `DMN Model Name` must be set with the values defined in in the DMN, in this case [TrafficViolation.dmn](src/main/resources/TrafficViolation.dmn).
 
 <img src="docs/images/traffic-violation-dmn-businessrule-properties.png" width=300/>
 
diff --git a/kogito-quarkus-examples/process-decisions-rules-quarkus/docs/images/traffic-violation-dmn-businessrule-properties.png b/kogito-quarkus-examples/process-decisions-rules-quarkus/docs/images/traffic-violation-dmn-businessrule-properties.png
index ee989077e3..ff4251cd52 100644
Binary files a/kogito-quarkus-examples/process-decisions-rules-quarkus/docs/images/traffic-violation-dmn-businessrule-properties.png and b/kogito-quarkus-examples/process-decisions-rules-quarkus/docs/images/traffic-violation-dmn-businessrule-properties.png differ
diff --git a/kogito-quarkus-examples/process-decisions-rules-quarkus/src/main/resources/traffic-rules-dmn.bpmn b/kogito-quarkus-examples/process-decisions-rules-quarkus/src/main/resources/traffic-rules-dmn.bpmn
index bb3c183e1e..1ddb14979f 100644
--- a/kogito-quarkus-examples/process-decisions-rules-quarkus/src/main/resources/traffic-rules-dmn.bpmn
+++ b/kogito-quarkus-examples/process-decisions-rules-quarkus/src/main/resources/traffic-rules-dmn.bpmn
@@ -7,7 +7,6 @@
   <bpmn2:itemDefinition id="_validatedItem" structureRef="org.kie.kogito.traffic.licensevalidated.Validated"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_ViolationInputXItem" structureRef="org.kie.kogito.traffic.Violation"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_DriverInputXItem" structureRef="org.kie.kogito.traffic.licensevalidation.Driver"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_ValidatedOutputXItem" structureRef="org.kie.kogito.traffic.licensevalidated.Validated"/>
@@ -16,12 +15,10 @@
   <bpmn2:itemDefinition id="__93FFD317-476E-4624-84EF-994617572560_responseOutputXItem" structureRef="org.kie.kogito.traffic.licensevalidation.Driver"/>
   <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_driverInputXItem" structureRef="org.kie.kogito.traffic.licensevalidation.Driver"/>
   <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_driverOutputXItem" structureRef="org.kie.kogito.traffic.licensevalidation.Driver"/>
   <bpmn2:itemDefinition id="__3F719C8E-DA3F-46F8-B8F2-5F04DB132E9C_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__3F719C8E-DA3F-46F8-B8F2-5F04DB132E9C_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__3F719C8E-DA3F-46F8-B8F2-5F04DB132E9C_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__3F719C8E-DA3F-46F8-B8F2-5F04DB132E9C_validatedInputXItem" structureRef="org.kie.kogito.traffic.licensevalidated.Validated"/>
   <bpmn2:itemDefinition id="__3F719C8E-DA3F-46F8-B8F2-5F04DB132E9C_validatedOutputXItem" structureRef="org.kie.kogito.traffic.licensevalidated.Validated"/>
   <bpmn2:interface id="_93FFD317-476E-4624-84EF-994617572560_ServiceInterface" name="org.kie.kogito.traffic.DriverService" implementationRef="org.kie.kogito.traffic.DriverService">
@@ -259,7 +256,6 @@ DMN]]></drools:metaValue>
       <bpmn2:outgoing>_BB963FF4-CF17-4CA0-A727-9AFC2BE17C29</bpmn2:outgoing>
       <bpmn2:ioSpecification>
         <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputX" drools:dtype="java.lang.String" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputXItem" name="namespace"/>
-        <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputX" drools:dtype="java.lang.String" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputXItem" name="decision"/>
         <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputX" drools:dtype="java.lang.String" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputXItem" name="model"/>
         <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_ViolationInputX" drools:dtype="org.kie.kogito.traffic.Violation" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_ViolationInputXItem" name="Violation"/>
         <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_DriverInputX" drools:dtype="org.kie.kogito.traffic.licensevalidation.Driver" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_DriverInputXItem" name="Driver"/>
@@ -267,7 +263,6 @@ DMN]]></drools:metaValue>
         <bpmn2:dataOutput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_FineOutputX" drools:dtype="org.kie.kogito.traffic.Fine" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_FineOutputXItem" name="Fine"/>
         <bpmn2:inputSet>
           <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputX</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_ViolationInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_DriverInputX</bpmn2:dataInputRefs>
@@ -284,13 +279,6 @@ DMN]]></drools:metaValue>
           <bpmn2:to xsi:type="bpmn2:tFormalExpression"><![CDATA[_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputX]]></bpmn2:to>
         </bpmn2:assignment>
       </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation>
-        <bpmn2:targetRef>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputX</bpmn2:targetRef>
-        <bpmn2:assignment>
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression"><![CDATA[Traffic Violation]]></bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression"><![CDATA[_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputX]]></bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
       <bpmn2:dataInputAssociation>
         <bpmn2:targetRef>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputX</bpmn2:targetRef>
         <bpmn2:assignment>
diff --git a/kogito-quarkus-examples/process-kafka-avro-multi-quarkus/src/main/resources/handle-travellers.bpmn b/kogito-quarkus-examples/process-kafka-avro-multi-quarkus/src/main/resources/handle-travellers.bpmn
index 5aeaea50cd..2b7f48cf2c 100644
--- a/kogito-quarkus-examples/process-kafka-avro-multi-quarkus/src/main/resources/handle-travellers.bpmn
+++ b/kogito-quarkus-examples/process-kafka-avro-multi-quarkus/src/main/resources/handle-travellers.bpmn
@@ -4,7 +4,6 @@
   <bpmn2:itemDefinition id="processedtravellersType" structureRef="org.acme.travel.Traveller"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_travellerInputXItem" structureRef="org.acme.travel.Traveller"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_travellerOutputXItem" structureRef="org.acme.travel.Traveller"/>
   <bpmn2:itemDefinition id="__8BEA9396-93DE-4D44-8CE2-4A146464264E_eventOutputXItem" structureRef="org.acme.travel.Traveller"/>
diff --git a/kogito-quarkus-examples/process-kafka-multi-quarkus/src/main/resources/handle-travellers.bpmn b/kogito-quarkus-examples/process-kafka-multi-quarkus/src/main/resources/handle-travellers.bpmn
index 5aeaea50cd..2b7f48cf2c 100644
--- a/kogito-quarkus-examples/process-kafka-multi-quarkus/src/main/resources/handle-travellers.bpmn
+++ b/kogito-quarkus-examples/process-kafka-multi-quarkus/src/main/resources/handle-travellers.bpmn
@@ -4,7 +4,6 @@
   <bpmn2:itemDefinition id="processedtravellersType" structureRef="org.acme.travel.Traveller"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_travellerInputXItem" structureRef="org.acme.travel.Traveller"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_travellerOutputXItem" structureRef="org.acme.travel.Traveller"/>
   <bpmn2:itemDefinition id="__8BEA9396-93DE-4D44-8CE2-4A146464264E_eventOutputXItem" structureRef="org.acme.travel.Traveller"/>
diff --git a/kogito-quarkus-examples/process-kafka-quickstart-quarkus/src/main/resources/handle-travellers.bpmn b/kogito-quarkus-examples/process-kafka-quickstart-quarkus/src/main/resources/handle-travellers.bpmn
index 12d61037b4..2660c25b56 100644
--- a/kogito-quarkus-examples/process-kafka-quickstart-quarkus/src/main/resources/handle-travellers.bpmn
+++ b/kogito-quarkus-examples/process-kafka-quickstart-quarkus/src/main/resources/handle-travellers.bpmn
@@ -4,7 +4,6 @@
   <bpmn2:itemDefinition id="processedtravellersType" structureRef="org.acme.travel.Traveller"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_travellerInputXItem" structureRef="org.acme.travel.Traveller"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_travellerOutputXItem" structureRef="org.acme.travel.Traveller"/>
   <bpmn2:itemDefinition id="__8BEA9396-93DE-4D44-8CE2-4A146464264E_eventOutputXItem" structureRef="org.acme.travel.Traveller"/>
diff --git a/kogito-quarkus-examples/process-knative-quickstart-quarkus/src/main/resources/handle-travellers.bpmn b/kogito-quarkus-examples/process-knative-quickstart-quarkus/src/main/resources/handle-travellers.bpmn
index 12d61037b4..2660c25b56 100644
--- a/kogito-quarkus-examples/process-knative-quickstart-quarkus/src/main/resources/handle-travellers.bpmn
+++ b/kogito-quarkus-examples/process-knative-quickstart-quarkus/src/main/resources/handle-travellers.bpmn
@@ -4,7 +4,6 @@
   <bpmn2:itemDefinition id="processedtravellersType" structureRef="org.acme.travel.Traveller"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_travellerInputXItem" structureRef="org.acme.travel.Traveller"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_travellerOutputXItem" structureRef="org.acme.travel.Traveller"/>
   <bpmn2:itemDefinition id="__8BEA9396-93DE-4D44-8CE2-4A146464264E_eventOutputXItem" structureRef="org.acme.travel.Traveller"/>
diff --git a/kogito-quarkus-examples/process-outbox-mongodb-quarkus/src/main/resources/org/kie/kogito/examples/persons.bpmn2 b/kogito-quarkus-examples/process-outbox-mongodb-quarkus/src/main/resources/org/kie/kogito/examples/persons.bpmn2
index 70a41e3cc5..ca5242103c 100644
--- a/kogito-quarkus-examples/process-outbox-mongodb-quarkus/src/main/resources/org/kie/kogito/examples/persons.bpmn2
+++ b/kogito-quarkus-examples/process-outbox-mongodb-quarkus/src/main/resources/org/kie/kogito/examples/persons.bpmn2
@@ -15,7 +15,6 @@
   <bpmn2:itemDefinition id="_UserTask_1_personInputXItem" structureRef="org.kie.kogito.examples.demo.Person"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="_BusinessRuleTask_1_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_personsInputXItem" structureRef="org.kie.kogito.examples.demo.Person"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_personsOutputXItem" structureRef="org.kie.kogito.examples.demo.Person"/>
   <bpmn2:process id="persons" drools:packageName="org.kie.kogito.examples.demo" drools:version="1.0" drools:adHoc="false" name="Person Process" isExecutable="true" processType="Public">
diff --git a/kogito-quarkus-examples/process-quarkus-example/src/main/resources/org/kie/kogito/examples/persons.bpmn2 b/kogito-quarkus-examples/process-quarkus-example/src/main/resources/org/kie/kogito/examples/persons.bpmn2
index 70a41e3cc5..ca5242103c 100644
--- a/kogito-quarkus-examples/process-quarkus-example/src/main/resources/org/kie/kogito/examples/persons.bpmn2
+++ b/kogito-quarkus-examples/process-quarkus-example/src/main/resources/org/kie/kogito/examples/persons.bpmn2
@@ -15,7 +15,6 @@
   <bpmn2:itemDefinition id="_UserTask_1_personInputXItem" structureRef="org.kie.kogito.examples.demo.Person"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="_BusinessRuleTask_1_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_personsInputXItem" structureRef="org.kie.kogito.examples.demo.Person"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_personsOutputXItem" structureRef="org.kie.kogito.examples.demo.Person"/>
   <bpmn2:process id="persons" drools:packageName="org.kie.kogito.examples.demo" drools:version="1.0" drools:adHoc="false" name="Person Process" isExecutable="true" processType="Public">
diff --git a/kogito-springboot-examples/flexible-process-springboot/src/main/resources/service-desk.bpmn b/kogito-springboot-examples/flexible-process-springboot/src/main/resources/service-desk.bpmn
index 264cf721c3..bcc7565ee6 100644
--- a/kogito-springboot-examples/flexible-process-springboot/src/main/resources/service-desk.bpmn
+++ b/kogito-springboot-examples/flexible-process-springboot/src/main/resources/service-desk.bpmn
@@ -83,7 +83,6 @@
   <bpmn2:itemDefinition id="__D17F5E0D-779E-4AF4-9E33-6E37D8F54DA7_supportCaseOutputXItem" structureRef="org.kie.kogito.flexible.example.model.SupportCase"/>
   <bpmn2:itemDefinition id="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_ProductFamilyInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_ProductNameInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_SupportGroupOutputXItem" structureRef="String"/>
@@ -241,14 +240,12 @@
         <bpmn2:outgoing>_4D493B33-AE13-464F-B7F5-4A7A9A9044BA</bpmn2:outgoing>
         <bpmn2:ioSpecification>
           <bpmn2:dataInput id="_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_namespaceInputX" drools:dtype="java.lang.String" itemSubjectRef="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_namespaceInputXItem" name="namespace"/>
-          <bpmn2:dataInput id="_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_decisionInputX" drools:dtype="java.lang.String" itemSubjectRef="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_decisionInputXItem" name="decision"/>
           <bpmn2:dataInput id="_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_modelInputX" drools:dtype="java.lang.String" itemSubjectRef="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_modelInputXItem" name="model"/>
           <bpmn2:dataInput id="_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_ProductFamilyInputX" drools:dtype="String" itemSubjectRef="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_ProductFamilyInputXItem" name="ProductFamily"/>
           <bpmn2:dataInput id="_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_ProductNameInputX" drools:dtype="String" itemSubjectRef="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_ProductNameInputXItem" name="ProductName"/>
           <bpmn2:dataOutput id="_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_SupportGroupOutputX" drools:dtype="String" itemSubjectRef="__D792ADC8-9414-4F1A-9A3C-6339788A4EA3_SupportGroupOutputXItem" name="SupportGroup"/>
           <bpmn2:inputSet>
             <bpmn2:dataInputRefs>_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_namespaceInputX</bpmn2:dataInputRefs>
-            <bpmn2:dataInputRefs>_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_decisionInputX</bpmn2:dataInputRefs>
             <bpmn2:dataInputRefs>_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_modelInputX</bpmn2:dataInputRefs>
             <bpmn2:dataInputRefs>_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_ProductFamilyInputX</bpmn2:dataInputRefs>
             <bpmn2:dataInputRefs>_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_ProductNameInputX</bpmn2:dataInputRefs>
@@ -264,13 +261,6 @@
             <bpmn2:to xsi:type="bpmn2:tFormalExpression"><![CDATA[_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_namespaceInputX]]></bpmn2:to>
           </bpmn2:assignment>
         </bpmn2:dataInputAssociation>
-        <bpmn2:dataInputAssociation>
-          <bpmn2:targetRef>_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_decisionInputX</bpmn2:targetRef>
-          <bpmn2:assignment>
-            <bpmn2:from xsi:type="bpmn2:tFormalExpression"><![CDATA[triage]]></bpmn2:from>
-            <bpmn2:to xsi:type="bpmn2:tFormalExpression"><![CDATA[_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_decisionInputX]]></bpmn2:to>
-          </bpmn2:assignment>
-        </bpmn2:dataInputAssociation>
         <bpmn2:dataInputAssociation>
           <bpmn2:targetRef>_D792ADC8-9414-4F1A-9A3C-6339788A4EA3_modelInputX</bpmn2:targetRef>
           <bpmn2:assignment>
diff --git a/kogito-springboot-examples/onboarding-springboot/src/main/resources/org/kie/kogito/examples/onboarding/onboarding.bpmn b/kogito-springboot-examples/onboarding-springboot/src/main/resources/org/kie/kogito/examples/onboarding/onboarding.bpmn
index c82b0acf00..9509809d2e 100644
--- a/kogito-springboot-examples/onboarding-springboot/src/main/resources/org/kie/kogito/examples/onboarding/onboarding.bpmn
+++ b/kogito-springboot-examples/onboarding-springboot/src/main/resources/org/kie/kogito/examples/onboarding/onboarding.bpmn
@@ -8,14 +8,12 @@
   <bpmn2:itemDefinition id="_messageItem" structureRef="String"/>
   <bpmn2:itemDefinition id="_managerItem" structureRef="String"/>
   <bpmn2:itemDefinition id="_departmentItem" structureRef="String"/>
-  <bpmn2:itemDefinition id="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_DecisionInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_ModelInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_NamespaceInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_emailOutputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_employeeIdOutputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__9D7A4927-BFCB-4F17-A4D4-E3D03B3FBE49_employeeInputXItem" structureRef="org.kie.kogito.examples.onboarding.Employee"/>
   <bpmn2:itemDefinition id="__9D7A4927-BFCB-4F17-A4D4-E3D03B3FBE49_payrollOutputXItem" structureRef="org.kie.kogito.examples.onboarding.Payroll"/>
-  <bpmn2:itemDefinition id="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_DecisionInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_ModelInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_NamespaceInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_employeeInputXItem" structureRef="org.kie.kogito.examples.onboarding.Employee"/>
@@ -245,7 +243,6 @@
       <bpmn2:incoming>_9D72C909-B631-415E-B015-30812A42B8C2</bpmn2:incoming>
       <bpmn2:outgoing>_5A442C9F-BADA-4D95-9ECA-3BD2898C8377</bpmn2:outgoing>
       <bpmn2:ioSpecification id="_YwdwTVr1EemSce_o1Tqd5Q">
-        <bpmn2:dataInput id="_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_DecisionInputX" drools:dtype="String" itemSubjectRef="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_DecisionInputXItem" name="Decision"/>
         <bpmn2:dataInput id="_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_ModelInputX" drools:dtype="String" itemSubjectRef="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_ModelInputXItem" name="Model"/>
         <bpmn2:dataInput id="_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_NamespaceInputX" drools:dtype="String" itemSubjectRef="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_NamespaceInputXItem" name="Namespace"/>
         <bpmn2:dataInput id="_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_employeeInputX" drools:dtype="org.kie.kogito.examples.onboarding.Employee" itemSubjectRef="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_employeeInputXItem" name="employee"/>
@@ -253,7 +250,6 @@
         <bpmn2:dataOutput id="_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_statusOutputX" drools:dtype="String" itemSubjectRef="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_statusOutputXItem" name="status"/>
         <bpmn2:dataOutput id="_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_messageOutputX" drools:dtype="String" itemSubjectRef="__DD24B4AE-8804-4D6E-B90B-98689CF6EF37_messageOutputXItem" name="message"/>
         <bpmn2:inputSet id="_YwdwTlr1EemSce_o1Tqd5Q">
-          <bpmn2:dataInputRefs>_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_DecisionInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_ModelInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_NamespaceInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_employeeInputX</bpmn2:dataInputRefs>
@@ -264,13 +260,6 @@
           <bpmn2:dataOutputRefs>_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_messageOutputX</bpmn2:dataOutputRefs>
         </bpmn2:outputSet>
       </bpmn2:ioSpecification>
-      <bpmn2:dataInputAssociation id="_YwdwUFr1EemSce_o1Tqd5Q">
-        <bpmn2:targetRef>_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_DecisionInputX</bpmn2:targetRef>
-        <bpmn2:assignment id="_YwdwUVr1EemSce_o1Tqd5Q">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="_YwdwUlr1EemSce_o1Tqd5Q"><![CDATA[employee-validation/first]]></bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="_YwdwU1r1EemSce_o1Tqd5Q">_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_DecisionInputX</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
       <bpmn2:dataInputAssociation id="_YwdwVFr1EemSce_o1Tqd5Q">
         <bpmn2:targetRef>_DD24B4AE-8804-4D6E-B90B-98689CF6EF37_ModelInputX</bpmn2:targetRef>
         <bpmn2:assignment id="_YwdwVVr1EemSce_o1Tqd5Q">
@@ -350,7 +339,6 @@
       <bpmn2:incoming>_A65F4850-A93F-4703-B5AA-2EF5F649BC86</bpmn2:incoming>
       <bpmn2:outgoing>_7DF7D2C1-195D-4C19-BC47-CC4462F9062D</bpmn2:outgoing>
       <bpmn2:ioSpecification id="_YweXUlr1EemSce_o1Tqd5Q">
-        <bpmn2:dataInput id="_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_DecisionInputX" drools:dtype="String" itemSubjectRef="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_DecisionInputXItem" name="Decision"/>
         <bpmn2:dataInput id="_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_ModelInputX" drools:dtype="String" itemSubjectRef="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_ModelInputXItem" name="Model"/>
         <bpmn2:dataInput id="_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_NamespaceInputX" drools:dtype="String" itemSubjectRef="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_NamespaceInputXItem" name="Namespace"/>
         <bpmn2:dataInput id="_9D7A4927-BFCB-4F17-A4D4-E3D03B3FBE40_employeeInputX" drools:dtype="org.kie.kogito.examples.onboarding.Employee" itemSubjectRef="__9D7A4927-BFCB-4F17-A4D4-E3D03B3FBE49_employeeInputXItem" name="employee"/>
@@ -358,7 +346,6 @@
         <bpmn2:dataOutput id="_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_emailOutputX" drools:dtype="String" itemSubjectRef="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_emailOutputXItem" name="email"/>
         <bpmn2:dataOutput id="_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_employeeIdOutputX" drools:dtype="String" itemSubjectRef="__16FFBBF8-8373-46D4-A278-F305AFA7F4B1_employeeIdOutputXItem" name="employeeId"/>
         <bpmn2:inputSet id="_YweXU1r1EemSce_o1Tqd5Q">
-          <bpmn2:dataInputRefs>_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_DecisionInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_ModelInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_NamespaceInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_9D7A4927-BFCB-4F17-A4D4-E3D03B3FBE40_employeeInputX</bpmn2:dataInputRefs>
@@ -369,13 +356,6 @@
           <bpmn2:dataOutputRefs>_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_employeeIdOutputX</bpmn2:dataOutputRefs>
         </bpmn2:outputSet>
       </bpmn2:ioSpecification>
-      <bpmn2:dataInputAssociation id="_YweXVVr1EemSce_o1Tqd5Q">
-        <bpmn2:targetRef>_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_DecisionInputX</bpmn2:targetRef>
-        <bpmn2:assignment id="_YweXVlr1EemSce_o1Tqd5Q">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="_YweXV1r1EemSce_o1Tqd5Q"><![CDATA[id]]></bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="_YweXWFr1EemSce_o1Tqd5Q">_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_DecisionInputX</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
       <bpmn2:dataInputAssociation id="_YweXWVr1EemSce_o1Tqd5Q">
         <bpmn2:targetRef>_16FFBBF8-8373-46D4-A278-F305AFA7F4B1_ModelInputX</bpmn2:targetRef>
         <bpmn2:assignment id="_YweXWlr1EemSce_o1Tqd5Q">
diff --git a/kogito-springboot-examples/onboarding-springboot/src/main/resources/org/kie/kogito/examples/onboarding/setupHR.bpmn b/kogito-springboot-examples/onboarding-springboot/src/main/resources/org/kie/kogito/examples/onboarding/setupHR.bpmn
index 6197ea0873..5c2388f9d7 100644
--- a/kogito-springboot-examples/onboarding-springboot/src/main/resources/org/kie/kogito/examples/onboarding/setupHR.bpmn
+++ b/kogito-springboot-examples/onboarding-springboot/src/main/resources/org/kie/kogito/examples/onboarding/setupHR.bpmn
@@ -6,7 +6,7 @@
   <bpmn2:itemDefinition id="__C2C840B8-C669-4134-91DD-81B664982F57_ModelInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__C2C840B8-C669-4134-91DD-81B664982F57_NamespaceInputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__C2C840B8-C669-4134-91DD-81B664982F57_employeeInputXItem" structureRef="org.kie.kogito.examples.onboarding.Employee"/>
-  <bpmn2:itemDefinition id="__C2C840B8-C669-4134-91DD-81B664982F57_DecisionInputXItem" structureRef="String"/>
+  <bpmn2:itemDefinition id="__C2C840B8-C669-4134-91DD-81B664982F57_TaskNameInputXItem" structureRef="Object"/>
   <bpmn2:itemDefinition id="__C2C840B8-C669-4134-91DD-81B664982F57_managerOutputXItem" structureRef="String"/>
   <bpmn2:itemDefinition id="__C2C840B8-C669-4134-91DD-81B664982F57_departmentOutputXItem" structureRef="String"/>
   <bpmn2:process id="onboarding.setupHR" drools:packageName="org.kie.kogito.examples.onboarding" drools:version="1.0" drools:adHoc="false" name="setupHR" isExecutable="true" processType="Private">
@@ -51,15 +51,13 @@
         <bpmn2:dataInput id="_C2C840B8-C669-4134-91DD-81B664982F57_ModelInputX" drools:dtype="String" itemSubjectRef="__C2C840B8-C669-4134-91DD-81B664982F57_ModelInputXItem" name="Model"/>
         <bpmn2:dataInput id="_C2C840B8-C669-4134-91DD-81B664982F57_NamespaceInputX" drools:dtype="String" itemSubjectRef="__C2C840B8-C669-4134-91DD-81B664982F57_NamespaceInputXItem" name="Namespace"/>
         <bpmn2:dataInput id="_C2C840B8-C669-4134-91DD-81B664982F57_employeeInputX" drools:dtype="org.kie.kogito.examples.onboarding.Employee" itemSubjectRef="__C2C840B8-C669-4134-91DD-81B664982F57_employeeInputXItem" name="employee"/>
-        <bpmn2:dataInput id="_C2C840B8-C669-4134-91DD-81B664982F57_DecisionInputX" drools:dtype="String" itemSubjectRef="__C2C840B8-C669-4134-91DD-81B664982F57_DecisionInputXItem" name="Decision"/>
-        <bpmn2:dataInput id="_C2C840B8-C669-4134-91DD-81B664982F57_TaskNameInputX" drools:dtype="Object" itemSubjectRef="__C2C840B8-C669-4134-91DD-81B664982F57_DecisionInputXItem" name="TaskName"/>
+        <bpmn2:dataInput id="_C2C840B8-C669-4134-91DD-81B664982F57_TaskNameInputX" drools:dtype="Object" itemSubjectRef="__C2C840B8-C669-4134-91DD-81B664982F57_TaskNameInputXItem" name="TaskName"/>
         <bpmn2:dataOutput id="_C2C840B8-C669-4134-91DD-81B664982F57_managerOutputX" drools:dtype="String" itemSubjectRef="__C2C840B8-C669-4134-91DD-81B664982F57_managerOutputXItem" name="manager"/>
         <bpmn2:dataOutput id="_C2C840B8-C669-4134-91DD-81B664982F57_departmentOutputX" drools:dtype="String" itemSubjectRef="__C2C840B8-C669-4134-91DD-81B664982F57_departmentOutputXItem" name="department"/>
         <bpmn2:inputSet id="_7gwnglrCEem3t4ZSfERqCw">
           <bpmn2:dataInputRefs>_C2C840B8-C669-4134-91DD-81B664982F57_ModelInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_C2C840B8-C669-4134-91DD-81B664982F57_NamespaceInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_C2C840B8-C669-4134-91DD-81B664982F57_employeeInputX</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_C2C840B8-C669-4134-91DD-81B664982F57_DecisionInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_C2C840B8-C669-4134-91DD-81B664982F57_TaskNameInputX</bpmn2:dataInputRefs>
         </bpmn2:inputSet>
         <bpmn2:outputSet id="_7gwng1rCEem3t4ZSfERqCw">
@@ -85,13 +83,6 @@
         <bpmn2:sourceRef>employee</bpmn2:sourceRef>
         <bpmn2:targetRef>_C2C840B8-C669-4134-91DD-81B664982F57_employeeInputX</bpmn2:targetRef>
       </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="_7gwnjVrCEem3t4ZSfERqCw">
-        <bpmn2:targetRef>_C2C840B8-C669-4134-91DD-81B664982F57_DecisionInputX</bpmn2:targetRef>
-        <bpmn2:assignment id="_7gwnjlrCEem3t4ZSfERqCw">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="_7gwnj1rCEem3t4ZSfERqCw"><![CDATA[department/first]]></bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="_7gwnkFrCEem3t4ZSfERqCw">_C2C840B8-C669-4134-91DD-81B664982F57_DecisionInputX</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
       <bpmn2:dataInputAssociation id="_7gwnkVrCEem3t4ZSfERqCw">
         <bpmn2:targetRef>_C2C840B8-C669-4134-91DD-81B664982F57_TaskNameInputX</bpmn2:targetRef>
         <bpmn2:assignment id="_7gwnklrCEem3t4ZSfERqCw">
diff --git a/kogito-springboot-examples/onboarding-springboot/src/main/resources/org/kie/kogito/examples/onboarding/setupPayroll.bpmn b/kogito-springboot-examples/onboarding-springboot/src/main/resources/org/kie/kogito/examples/onboarding/setupPayroll.bpmn
index 1b8d288b15..bd2686f604 100644
--- a/kogito-springboot-examples/onboarding-springboot/src/main/resources/org/kie/kogito/examples/onboarding/setupPayroll.bpmn
+++ b/kogito-springboot-examples/onboarding-springboot/src/main/resources/org/kie/kogito/examples/onboarding/setupPayroll.bpmn
@@ -6,17 +6,14 @@
   <bpmn2:itemDefinition id="_vacationDaysItem" isCollection="false" structureRef="Integer"/>
   <bpmn2:itemDefinition id="_taxRateItem" isCollection="false" structureRef="java.lang.Double"/>
   <bpmn2:itemDefinition id="_paymentDateItem" isCollection="false" structureRef="java.util.Date"/>
-  <bpmn2:itemDefinition id="__D2DE6249-804E-432D-9600-6B0F618B457C_DecisionInputXItem" isCollection="false" structureRef="String"/>
   <bpmn2:itemDefinition id="__D2DE6249-804E-432D-9600-6B0F618B457C_ModelInputXItem" isCollection="false" structureRef="String"/>
   <bpmn2:itemDefinition id="__D2DE6249-804E-432D-9600-6B0F618B457C_NamespaceInputXItem" isCollection="false" structureRef="String"/>
   <bpmn2:itemDefinition id="__D2DE6249-804E-432D-9600-6B0F618B457C_employeeInputXItem" isCollection="false" structureRef="org.kie.kogito.examples.onboarding.Employee"/>
   <bpmn2:itemDefinition id="__D2DE6249-804E-432D-9600-6B0F618B457C_taxRateOutputXItem" isCollection="false" structureRef="java.lang.Double"/>
   <bpmn2:itemDefinition id="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_ModelInputXItem" isCollection="false" structureRef="String"/>
   <bpmn2:itemDefinition id="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_NamespaceInputXItem" isCollection="false" structureRef="String"/>
-  <bpmn2:itemDefinition id="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_DecisionInputXItem" isCollection="false" structureRef="String"/>
   <bpmn2:itemDefinition id="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_employeeInputXItem" isCollection="false" structureRef="org.kie.kogito.examples.onboarding.Employee"/>
   <bpmn2:itemDefinition id="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_vacationDaysOutputXItem" isCollection="false" structureRef="Integer"/>
-  <bpmn2:itemDefinition id="__83EB46B5-7186-4575-8AA0-1A8FCCE1D163_DecisionInputXItem" isCollection="false" structureRef="String"/>
   <bpmn2:itemDefinition id="__83EB46B5-7186-4575-8AA0-1A8FCCE1D163_ModelInputXItem" isCollection="false" structureRef="String"/>
   <bpmn2:itemDefinition id="__83EB46B5-7186-4575-8AA0-1A8FCCE1D163_NamespaceInputXItem" isCollection="false" structureRef="String"/>
   <bpmn2:itemDefinition id="__83EB46B5-7186-4575-8AA0-1A8FCCE1D163_employeeInputXItem" isCollection="false" structureRef="org.kie.kogito.examples.onboarding.Employee"/>
@@ -93,14 +90,12 @@
       <bpmn2:incoming>_B94F71D7-E34E-4513-B06D-33F6EF74C9E6</bpmn2:incoming>
       <bpmn2:outgoing>_344D9BF6-D173-4BEC-943B-5E4394A6B6C7</bpmn2:outgoing>
       <bpmn2:ioSpecification id="_fWl5ZWdbEemTPrcubws9TA">
-        <bpmn2:dataInput id="_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_DecisionInputX" drools:dtype="String" itemSubjectRef="__83EB46B5-7186-4575-8AA0-1A8FCCE1D163_DecisionInputXItem" name="Decision"/>
         <bpmn2:dataInput id="_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_ModelInputX" drools:dtype="String" itemSubjectRef="__83EB46B5-7186-4575-8AA0-1A8FCCE1D163_ModelInputXItem" name="Model"/>
         <bpmn2:dataInput id="_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_NamespaceInputX" drools:dtype="String" itemSubjectRef="__83EB46B5-7186-4575-8AA0-1A8FCCE1D163_NamespaceInputXItem" name="Namespace"/>
         <bpmn2:dataInput id="_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_employeeInputX" drools:dtype="org.kie.kogito.examples.onboarding.Employee" itemSubjectRef="__83EB46B5-7186-4575-8AA0-1A8FCCE1D163_employeeInputXItem" name="employee"/>
         <bpmn2:dataInput id="_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_TaskNameInputX" drools:dtype="Object" name="TaskName"/>
         <bpmn2:dataOutput id="_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_paymentDateOutputX" drools:dtype="java.util.Date" itemSubjectRef="__83EB46B5-7186-4575-8AA0-1A8FCCE1D163_paymentDateOutputXItem" name="paymentDate"/>
         <bpmn2:inputSet id="_fWl5ZmdbEemTPrcubws9TA">
-          <bpmn2:dataInputRefs>_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_DecisionInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_ModelInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_NamespaceInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_employeeInputX</bpmn2:dataInputRefs>
@@ -110,13 +105,6 @@
           <bpmn2:dataOutputRefs>_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_paymentDateOutputX</bpmn2:dataOutputRefs>
         </bpmn2:outputSet>
       </bpmn2:ioSpecification>
-      <bpmn2:dataInputAssociation id="_fWl5aGdbEemTPrcubws9TA">
-        <bpmn2:targetRef>_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_DecisionInputX</bpmn2:targetRef>
-        <bpmn2:assignment id="_fWl5aWdbEemTPrcubws9TA">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="_fWl5amdbEemTPrcubws9TA"><![CDATA[payments/date]]></bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="_fWl5a2dbEemTPrcubws9TA">_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_DecisionInputX</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
       <bpmn2:dataInputAssociation id="_fWl5bGdbEemTPrcubws9TA">
         <bpmn2:targetRef>_83EB46B5-7186-4575-8AA0-1A8FCCE1D163_ModelInputX</bpmn2:targetRef>
         <bpmn2:assignment id="_fWl5bWdbEemTPrcubws9TA">
@@ -171,14 +159,12 @@
       <bpmn2:ioSpecification id="_fWl5e2dbEemTPrcubws9TA">
         <bpmn2:dataInput id="_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_ModelInputX" drools:dtype="String" itemSubjectRef="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_ModelInputXItem" name="Model"/>
         <bpmn2:dataInput id="_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_NamespaceInputX" drools:dtype="String" itemSubjectRef="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_NamespaceInputXItem" name="Namespace"/>
-        <bpmn2:dataInput id="_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_DecisionInputX" drools:dtype="String" itemSubjectRef="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_DecisionInputXItem" name="Decision"/>
         <bpmn2:dataInput id="_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_employeeInputX" drools:dtype="org.kie.kogito.examples.onboarding.Employee" itemSubjectRef="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_employeeInputXItem" name="employee"/>
         <bpmn2:dataInput id="_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_TaskNameInputX" drools:dtype="Object" name="TaskName"/>
         <bpmn2:dataOutput id="_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_vacationDaysOutputX" drools:dtype="Integer" itemSubjectRef="__AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_vacationDaysOutputXItem" name="vacationDays"/>
         <bpmn2:inputSet id="_fWl5fGdbEemTPrcubws9TA">
           <bpmn2:dataInputRefs>_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_ModelInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_NamespaceInputX</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_DecisionInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_employeeInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_TaskNameInputX</bpmn2:dataInputRefs>
         </bpmn2:inputSet>
@@ -200,13 +186,6 @@
           <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="_fWl5hWdbEemTPrcubws9TA">_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_NamespaceInputX</bpmn2:to>
         </bpmn2:assignment>
       </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="_fWmgcGdbEemTPrcubws9TA">
-        <bpmn2:targetRef>_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_DecisionInputX</bpmn2:targetRef>
-        <bpmn2:assignment id="_fWmgcWdbEemTPrcubws9TA">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="_fWmgcmdbEemTPrcubws9TA"><![CDATA[vacations/days]]></bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="_fWmgc2dbEemTPrcubws9TA">_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_DecisionInputX</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
       <bpmn2:dataInputAssociation id="_fWmgdGdbEemTPrcubws9TA">
         <bpmn2:sourceRef>employee</bpmn2:sourceRef>
         <bpmn2:targetRef>_AE1BFAA6-7AFD-455F-95B4-FA619A2095CF_employeeInputX</bpmn2:targetRef>
@@ -240,14 +219,12 @@
       <bpmn2:incoming>_622BF92E-6590-44B6-B83D-10C0D8067D09</bpmn2:incoming>
       <bpmn2:outgoing>_7597C8A1-CC2B-4345-99A2-3F3A71C1FDA1</bpmn2:outgoing>
       <bpmn2:ioSpecification id="_fWmgemdbEemTPrcubws9TA">
-        <bpmn2:dataInput id="_D2DE6249-804E-432D-9600-6B0F618B457C_DecisionInputX" drools:dtype="String" itemSubjectRef="__D2DE6249-804E-432D-9600-6B0F618B457C_DecisionInputXItem" name="Decision"/>
         <bpmn2:dataInput id="_D2DE6249-804E-432D-9600-6B0F618B457C_ModelInputX" drools:dtype="String" itemSubjectRef="__D2DE6249-804E-432D-9600-6B0F618B457C_ModelInputXItem" name="Model"/>
         <bpmn2:dataInput id="_D2DE6249-804E-432D-9600-6B0F618B457C_NamespaceInputX" drools:dtype="String" itemSubjectRef="__D2DE6249-804E-432D-9600-6B0F618B457C_NamespaceInputXItem" name="Namespace"/>
         <bpmn2:dataInput id="_D2DE6249-804E-432D-9600-6B0F618B457C_employeeInputX" drools:dtype="org.kie.kogito.examples.onboarding.Employee" itemSubjectRef="__D2DE6249-804E-432D-9600-6B0F618B457C_employeeInputXItem" name="employee"/>
         <bpmn2:dataInput id="_D2DE6249-804E-432D-9600-6B0F618B457C_TaskNameInputX" drools:dtype="Object" name="TaskName"/>
         <bpmn2:dataOutput id="_D2DE6249-804E-432D-9600-6B0F618B457C_taxRateOutputX" drools:dtype="java.lang.Double" itemSubjectRef="__D2DE6249-804E-432D-9600-6B0F618B457C_taxRateOutputXItem" name="taxRate"/>
         <bpmn2:inputSet id="_fWmge2dbEemTPrcubws9TA">
-          <bpmn2:dataInputRefs>_D2DE6249-804E-432D-9600-6B0F618B457C_DecisionInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_D2DE6249-804E-432D-9600-6B0F618B457C_ModelInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_D2DE6249-804E-432D-9600-6B0F618B457C_NamespaceInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_D2DE6249-804E-432D-9600-6B0F618B457C_employeeInputX</bpmn2:dataInputRefs>
@@ -257,13 +234,6 @@
           <bpmn2:dataOutputRefs>_D2DE6249-804E-432D-9600-6B0F618B457C_taxRateOutputX</bpmn2:dataOutputRefs>
         </bpmn2:outputSet>
       </bpmn2:ioSpecification>
-      <bpmn2:dataInputAssociation id="_fWmgfWdbEemTPrcubws9TA">
-        <bpmn2:targetRef>_D2DE6249-804E-432D-9600-6B0F618B457C_DecisionInputX</bpmn2:targetRef>
-        <bpmn2:assignment id="_fWmgfmdbEemTPrcubws9TA">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="_fWmgf2dbEemTPrcubws9TA"><![CDATA[taxes/rate]]></bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="_fWmggGdbEemTPrcubws9TA">_D2DE6249-804E-432D-9600-6B0F618B457C_DecisionInputX</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
       <bpmn2:dataInputAssociation id="_fWmggWdbEemTPrcubws9TA">
         <bpmn2:targetRef>_D2DE6249-804E-432D-9600-6B0F618B457C_ModelInputX</bpmn2:targetRef>
         <bpmn2:assignment id="_fWmggmdbEemTPrcubws9TA">
diff --git a/kogito-springboot-examples/process-business-rules-springboot/src/main/resources/org/acme/travels/persons.bpmn b/kogito-springboot-examples/process-business-rules-springboot/src/main/resources/org/acme/travels/persons.bpmn
index 318d125800..72117980f5 100644
--- a/kogito-springboot-examples/process-business-rules-springboot/src/main/resources/org/acme/travels/persons.bpmn
+++ b/kogito-springboot-examples/process-business-rules-springboot/src/main/resources/org/acme/travels/persons.bpmn
@@ -16,7 +16,6 @@
   <bpmn2:itemDefinition id="__D9CFCEE9-BCDF-48D0-8CB4-A55584DF0D9D_personInputXItem" structureRef="org.acme.travels.Person"/>
   <bpmn2:itemDefinition id="__7B8CC121-6F99-464A-93F8-9EAC4BE4601A_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__7B8CC121-6F99-464A-93F8-9EAC4BE4601A_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__7B8CC121-6F99-464A-93F8-9EAC4BE4601A_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__7B8CC121-6F99-464A-93F8-9EAC4BE4601A_personInputXItem" structureRef="org.acme.travels.Person"/>
   <bpmn2:itemDefinition id="__7B8CC121-6F99-464A-93F8-9EAC4BE4601A_personOutputXItem" structureRef="org.acme.travels.Person"/>
   <bpmn2:process id="persons" drools:packageName="org.acme.travels" drools:version="1.0" drools:adHoc="false" name="persons" isExecutable="true">
diff --git a/kogito-springboot-examples/process-decisions-rules-springboot/README.md b/kogito-springboot-examples/process-decisions-rules-springboot/README.md
index 20354bf578..7bfbe4baac 100644
--- a/kogito-springboot-examples/process-decisions-rules-springboot/README.md
+++ b/kogito-springboot-examples/process-decisions-rules-springboot/README.md
@@ -73,7 +73,7 @@ Similar to the License Validation Task, but it represents the task to do the cal
 
 <img src="docs/images/traffic-violation-dmn-businessrule.png" width=150/>
 
-The properties to be set are mainly the `Rule Language`that should be set as `DMN` and the `Namespace`, `Decision Name` and `DMN Model Name` must be set with the values defined in in the DMN, in this case [TrafficViolation.dmn](src/main/resources/TrafficViolation.dmn).
+The properties to be set are mainly the `Rule Language`that should be set as `DMN` and the `Namespace` and `DMN Model Name` must be set with the values defined in in the DMN, in this case [TrafficViolation.dmn](src/main/resources/TrafficViolation.dmn).
 
 <img src="docs/images/traffic-violation-dmn-businessrule-properties.png" width=300/>
 
diff --git a/kogito-springboot-examples/process-decisions-rules-springboot/docs/images/traffic-violation-dmn-businessrule-properties.png b/kogito-springboot-examples/process-decisions-rules-springboot/docs/images/traffic-violation-dmn-businessrule-properties.png
index ee989077e3..ff4251cd52 100644
Binary files a/kogito-springboot-examples/process-decisions-rules-springboot/docs/images/traffic-violation-dmn-businessrule-properties.png and b/kogito-springboot-examples/process-decisions-rules-springboot/docs/images/traffic-violation-dmn-businessrule-properties.png differ
diff --git a/kogito-springboot-examples/process-decisions-rules-springboot/src/main/resources/traffic-rules-dmn.bpmn b/kogito-springboot-examples/process-decisions-rules-springboot/src/main/resources/traffic-rules-dmn.bpmn
index bb3c183e1e..1ddb14979f 100644
--- a/kogito-springboot-examples/process-decisions-rules-springboot/src/main/resources/traffic-rules-dmn.bpmn
+++ b/kogito-springboot-examples/process-decisions-rules-springboot/src/main/resources/traffic-rules-dmn.bpmn
@@ -7,7 +7,6 @@
   <bpmn2:itemDefinition id="_validatedItem" structureRef="org.kie.kogito.traffic.licensevalidated.Validated"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_ViolationInputXItem" structureRef="org.kie.kogito.traffic.Violation"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_DriverInputXItem" structureRef="org.kie.kogito.traffic.licensevalidation.Driver"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_ValidatedOutputXItem" structureRef="org.kie.kogito.traffic.licensevalidated.Validated"/>
@@ -16,12 +15,10 @@
   <bpmn2:itemDefinition id="__93FFD317-476E-4624-84EF-994617572560_responseOutputXItem" structureRef="org.kie.kogito.traffic.licensevalidation.Driver"/>
   <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_driverInputXItem" structureRef="org.kie.kogito.traffic.licensevalidation.Driver"/>
   <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_driverOutputXItem" structureRef="org.kie.kogito.traffic.licensevalidation.Driver"/>
   <bpmn2:itemDefinition id="__3F719C8E-DA3F-46F8-B8F2-5F04DB132E9C_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__3F719C8E-DA3F-46F8-B8F2-5F04DB132E9C_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__3F719C8E-DA3F-46F8-B8F2-5F04DB132E9C_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__3F719C8E-DA3F-46F8-B8F2-5F04DB132E9C_validatedInputXItem" structureRef="org.kie.kogito.traffic.licensevalidated.Validated"/>
   <bpmn2:itemDefinition id="__3F719C8E-DA3F-46F8-B8F2-5F04DB132E9C_validatedOutputXItem" structureRef="org.kie.kogito.traffic.licensevalidated.Validated"/>
   <bpmn2:interface id="_93FFD317-476E-4624-84EF-994617572560_ServiceInterface" name="org.kie.kogito.traffic.DriverService" implementationRef="org.kie.kogito.traffic.DriverService">
@@ -259,7 +256,6 @@ DMN]]></drools:metaValue>
       <bpmn2:outgoing>_BB963FF4-CF17-4CA0-A727-9AFC2BE17C29</bpmn2:outgoing>
       <bpmn2:ioSpecification>
         <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputX" drools:dtype="java.lang.String" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputXItem" name="namespace"/>
-        <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputX" drools:dtype="java.lang.String" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputXItem" name="decision"/>
         <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputX" drools:dtype="java.lang.String" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputXItem" name="model"/>
         <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_ViolationInputX" drools:dtype="org.kie.kogito.traffic.Violation" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_ViolationInputXItem" name="Violation"/>
         <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_DriverInputX" drools:dtype="org.kie.kogito.traffic.licensevalidation.Driver" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_DriverInputXItem" name="Driver"/>
@@ -267,7 +263,6 @@ DMN]]></drools:metaValue>
         <bpmn2:dataOutput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_FineOutputX" drools:dtype="org.kie.kogito.traffic.Fine" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_FineOutputXItem" name="Fine"/>
         <bpmn2:inputSet>
           <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputX</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_ViolationInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_DriverInputX</bpmn2:dataInputRefs>
@@ -284,13 +279,6 @@ DMN]]></drools:metaValue>
           <bpmn2:to xsi:type="bpmn2:tFormalExpression"><![CDATA[_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputX]]></bpmn2:to>
         </bpmn2:assignment>
       </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation>
-        <bpmn2:targetRef>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputX</bpmn2:targetRef>
-        <bpmn2:assignment>
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression"><![CDATA[Traffic Violation]]></bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression"><![CDATA[_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputX]]></bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
       <bpmn2:dataInputAssociation>
         <bpmn2:targetRef>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputX</bpmn2:targetRef>
         <bpmn2:assignment>
diff --git a/kogito-springboot-examples/process-decisions-springboot/README.md b/kogito-springboot-examples/process-decisions-springboot/README.md
index 340100da45..d133298689 100644
--- a/kogito-springboot-examples/process-decisions-springboot/README.md
+++ b/kogito-springboot-examples/process-decisions-springboot/README.md
@@ -73,7 +73,7 @@ Similar to the License Validation Task, but it represents the task to do the cal
 
 <img src="docs/images/traffic-violation-dmn-businessrule.png" width=150/>
 
-The properties to be set are mainly the `Rule Language`that should be set as `DMN` and the `Namespace`, `Decision Name` and `DMN Model Name` must be set with the values defined in in the DMN, in this case [TrafficViolation.dmn](src/main/resources/TrafficViolation.dmn).
+The properties to be set are mainly the `Rule Language`that should be set as `DMN` and the `Namespace` and `DMN Model Name` must be set with the values defined in in the DMN, in this case [TrafficViolation.dmn](src/main/resources/TrafficViolation.dmn).
 
 <img src="docs/images/traffic-violation-dmn-businessrule-properties.png" width=300/>
 
diff --git a/kogito-springboot-examples/process-decisions-springboot/docs/images/traffic-violation-dmn-businessrule-properties.png b/kogito-springboot-examples/process-decisions-springboot/docs/images/traffic-violation-dmn-businessrule-properties.png
index ee989077e3..ff4251cd52 100644
Binary files a/kogito-springboot-examples/process-decisions-springboot/docs/images/traffic-violation-dmn-businessrule-properties.png and b/kogito-springboot-examples/process-decisions-springboot/docs/images/traffic-violation-dmn-businessrule-properties.png differ
diff --git a/kogito-springboot-examples/process-decisions-springboot/src/main/resources/traffic-rules-dmn.bpmn b/kogito-springboot-examples/process-decisions-springboot/src/main/resources/traffic-rules-dmn.bpmn
index 2cc3bd1c29..38126baf68 100644
--- a/kogito-springboot-examples/process-decisions-springboot/src/main/resources/traffic-rules-dmn.bpmn
+++ b/kogito-springboot-examples/process-decisions-springboot/src/main/resources/traffic-rules-dmn.bpmn
@@ -6,7 +6,6 @@
   <bpmn2:itemDefinition id="_fineItem" structureRef="org.kie.kogito.traffic.Fine"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_ViolationInputXItem" structureRef="org.kie.kogito.traffic.Violation"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_DriverInputXItem" structureRef="org.kie.kogito.traffic.Driver"/>
   <bpmn2:itemDefinition id="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_SuspendedOutputXItem" structureRef="String"/>
@@ -15,7 +14,6 @@
   <bpmn2:itemDefinition id="__93FFD317-476E-4624-84EF-994617572560_responseOutputXItem" structureRef="org.kie.kogito.traffic.Driver"/>
   <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_driverInputXItem" structureRef="org.kie.kogito.traffic.Driver"/>
   <bpmn2:itemDefinition id="__95EFED1F-73F8-47E7-9604-A81EFE5DE8F5_driverOutputXItem" structureRef="org.kie.kogito.traffic.Driver"/>
   <bpmn2:interface id="_93FFD317-476E-4624-84EF-994617572560_ServiceInterface" name="org.kie.kogito.traffic.DriverService" implementationRef="org.kie.kogito.traffic.DriverService">
@@ -217,7 +215,6 @@ DMN]]></drools:metaValue>
       <bpmn2:outgoing>_B8BD225A-B26C-4C0F-9852-ED3664524A14</bpmn2:outgoing>
       <bpmn2:ioSpecification>
         <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputX" drools:dtype="java.lang.String" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputXItem" name="namespace"/>
-        <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputX" drools:dtype="java.lang.String" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputXItem" name="decision"/>
         <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputX" drools:dtype="java.lang.String" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputXItem" name="model"/>
         <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_ViolationInputX" drools:dtype="org.kie.kogito.traffic.Violation" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_ViolationInputXItem" name="Violation"/>
         <bpmn2:dataInput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_DriverInputX" drools:dtype="org.kie.kogito.traffic.Driver" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_DriverInputXItem" name="Driver"/>
@@ -225,7 +222,6 @@ DMN]]></drools:metaValue>
         <bpmn2:dataOutput id="_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_FineOutputX" drools:dtype="org.kie.kogito.traffic.Fine" itemSubjectRef="__B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_FineOutputXItem" name="Fine"/>
         <bpmn2:inputSet>
           <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputX</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_ViolationInputX</bpmn2:dataInputRefs>
           <bpmn2:dataInputRefs>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_DriverInputX</bpmn2:dataInputRefs>
@@ -242,13 +238,6 @@ DMN]]></drools:metaValue>
           <bpmn2:to xsi:type="bpmn2:tFormalExpression"><![CDATA[_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_namespaceInputX]]></bpmn2:to>
         </bpmn2:assignment>
       </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation>
-        <bpmn2:targetRef>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputX</bpmn2:targetRef>
-        <bpmn2:assignment>
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression"><![CDATA[Traffic Violation]]></bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression"><![CDATA[_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_decisionInputX]]></bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
       <bpmn2:dataInputAssociation>
         <bpmn2:targetRef>_B076DF7E-91A5-47C7-B3FC-2C2EC06E5941_modelInputX</bpmn2:targetRef>
         <bpmn2:assignment>
diff --git a/kogito-springboot-examples/process-kafka-multi-springboot/src/main/resources/handle-travellers.bpmn b/kogito-springboot-examples/process-kafka-multi-springboot/src/main/resources/handle-travellers.bpmn
index 34f29f09e2..97602c6c58 100644
--- a/kogito-springboot-examples/process-kafka-multi-springboot/src/main/resources/handle-travellers.bpmn
+++ b/kogito-springboot-examples/process-kafka-multi-springboot/src/main/resources/handle-travellers.bpmn
@@ -4,7 +4,6 @@
   <bpmn2:itemDefinition id="processedtravellersType" structureRef="org.acme.travel.Traveller"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_travellerInputXItem" structureRef="org.acme.travel.Traveller"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_travellerOutputXItem" structureRef="org.acme.travel.Traveller"/>
   <bpmn2:itemDefinition id="__8BEA9396-93DE-4D44-8CE2-4A146464264E_eventOutputXItem" structureRef="org.acme.travel.Traveller"/>
diff --git a/kogito-springboot-examples/process-kafka-quickstart-springboot/src/main/resources/handle-travellers.bpmn b/kogito-springboot-examples/process-kafka-quickstart-springboot/src/main/resources/handle-travellers.bpmn
index 4a34cf65a5..3a90052686 100644
--- a/kogito-springboot-examples/process-kafka-quickstart-springboot/src/main/resources/handle-travellers.bpmn
+++ b/kogito-springboot-examples/process-kafka-quickstart-springboot/src/main/resources/handle-travellers.bpmn
@@ -4,7 +4,6 @@
   <bpmn2:itemDefinition id="processedtravellersType" structureRef="org.acme.travel.Traveller"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_travellerInputXItem" structureRef="org.acme.travel.Traveller"/>
   <bpmn2:itemDefinition id="__60FA6326-76DC-4DB2-AB06-DB8AC8EE8DC8_travellerOutputXItem" structureRef="org.acme.travel.Traveller"/>
   <bpmn2:itemDefinition id="__8BEA9396-93DE-4D44-8CE2-4A146464264E_eventOutputXItem" structureRef="org.acme.travel.Traveller"/>
diff --git a/kogito-springboot-examples/process-outbox-mongodb-springboot/src/main/resources/org/kie/kogito/examples/persons.bpmn2 b/kogito-springboot-examples/process-outbox-mongodb-springboot/src/main/resources/org/kie/kogito/examples/persons.bpmn2
index 70a41e3cc5..ca5242103c 100644
--- a/kogito-springboot-examples/process-outbox-mongodb-springboot/src/main/resources/org/kie/kogito/examples/persons.bpmn2
+++ b/kogito-springboot-examples/process-outbox-mongodb-springboot/src/main/resources/org/kie/kogito/examples/persons.bpmn2
@@ -15,7 +15,6 @@
   <bpmn2:itemDefinition id="_UserTask_1_personInputXItem" structureRef="org.kie.kogito.examples.demo.Person"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="_BusinessRuleTask_1_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_personsInputXItem" structureRef="org.kie.kogito.examples.demo.Person"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_personsOutputXItem" structureRef="org.kie.kogito.examples.demo.Person"/>
   <bpmn2:process id="persons" drools:packageName="org.kie.kogito.examples.demo" drools:version="1.0" drools:adHoc="false" name="Person Process" isExecutable="true" processType="Public">
diff --git a/kogito-springboot-examples/process-springboot-example/src/main/resources/org/kie/kogito/examples/persons.bpmn2 b/kogito-springboot-examples/process-springboot-example/src/main/resources/org/kie/kogito/examples/persons.bpmn2
index 70a41e3cc5..ca5242103c 100644
--- a/kogito-springboot-examples/process-springboot-example/src/main/resources/org/kie/kogito/examples/persons.bpmn2
+++ b/kogito-springboot-examples/process-springboot-example/src/main/resources/org/kie/kogito/examples/persons.bpmn2
@@ -15,7 +15,6 @@
   <bpmn2:itemDefinition id="_UserTask_1_personInputXItem" structureRef="org.kie.kogito.examples.demo.Person"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_namespaceInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_modelInputXItem" structureRef="java.lang.String"/>
-  <bpmn2:itemDefinition id="_BusinessRuleTask_1_decisionInputXItem" structureRef="java.lang.String"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_personsInputXItem" structureRef="org.kie.kogito.examples.demo.Person"/>
   <bpmn2:itemDefinition id="_BusinessRuleTask_1_personsOutputXItem" structureRef="org.kie.kogito.examples.demo.Person"/>
   <bpmn2:process id="persons" drools:packageName="org.kie.kogito.examples.demo" drools:version="1.0" drools:adHoc="false" name="Person Process" isExecutable="true" processType="Public">