From 924c247f9b6d0edc89de1a7ac3f35822f69739ca Mon Sep 17 00:00:00 2001
From: Yavor16 <yavoruzbg@gmail.com>
Date: Thu, 8 Oct 2026 14:11:31 +0300
Subject: [PATCH 1/2] Remove inherit variables in Flowable for
 createServiceKeySubProcess

---
 .../controller/process/recreate-service-keys.bpmn    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/recreate-service-keys.bpmn b/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/recreate-service-keys.bpmn
index 6811f0846d..c2c4df34e8 100644
--- a/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/recreate-service-keys.bpmn
+++ b/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/recreate-service-keys.bpmn
@@ -25,7 +25,17 @@
         </extensionElements>
       <multiInstanceLoopCharacteristics isSequential="false" flowable:collection="cloudServiceKeysToDelete" flowable:elementVariable="serviceKeyToProcess"></multiInstanceLoopCharacteristics>
     </callActivity>
-    <callActivity id="createServiceKeySubProcess" name="Create Service Keys Sub Process" flowable:async="true" flowable:exclusive="false" calledElement="createServiceKeySubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
+    <callActivity id="createServiceKeySubProcess" name="Create Service Keys Sub Process" flowable:async="true" flowable:exclusive="false" calledElement="createServiceKeySubProcess" flowable:calledElementType="key" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
+        <extensionElements>
+            <flowable:in source="serviceKeyToProcess" target="serviceKeyToProcess"/>
+            <flowable:in source="correlationId" target="correlationId"/>
+            <flowable:in source="__SPACE_ID" target="__SPACE_ID"/>
+            <flowable:in source="userGuid" target="userGuid"/>
+            <flowable:in source="isSecurityEnabled" target="isSecurityEnabled"/>
+            <flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"/>
+            <flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"/>
+            <flowable:in source="serviceToProcess" target="serviceToProcess"/>
+        </extensionElements>
       <multiInstanceLoopCharacteristics isSequential="false" flowable:collection="cloudServiceKeysToCreate" flowable:elementVariable="serviceKeyToProcess"></multiInstanceLoopCharacteristics>
     </callActivity>
     <sequenceFlow id="sid-89ED7A30-8EB3-4766-96EF-30FCAE58640E" sourceRef="deleteServiceKeySubProcess" targetRef="createServiceKeySubProcess"></sequenceFlow>

From f1ca05e9e7be2d82baf8561857d84ce4353148c4 Mon Sep 17 00:00:00 2001
From: Yavor16 <yavoruzbg@gmail.com>
Date: Thu, 8 Oct 2026 15:58:58 +0300
Subject: [PATCH 2/2] Fix comments

---
 .../multiapps/controller/process/recreate-service-keys.bpmn     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/recreate-service-keys.bpmn b/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/recreate-service-keys.bpmn
index c2c4df34e8..1dd609cd06 100644
--- a/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/recreate-service-keys.bpmn
+++ b/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/recreate-service-keys.bpmn
@@ -25,7 +25,7 @@
         </extensionElements>
       <multiInstanceLoopCharacteristics isSequential="false" flowable:collection="cloudServiceKeysToDelete" flowable:elementVariable="serviceKeyToProcess"></multiInstanceLoopCharacteristics>
     </callActivity>
-    <callActivity id="createServiceKeySubProcess" name="Create Service Keys Sub Process" flowable:async="true" flowable:exclusive="false" calledElement="createServiceKeySubProcess" flowable:calledElementType="key" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
+    <callActivity id="createServiceKeySubProcess" name="Create Service Keys Sub Process" flowable:async="true" flowable:inheritVariables="false" flowable:exclusive="false" calledElement="createServiceKeySubProcess" flowable:calledElementType="key" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
         <extensionElements>
             <flowable:in source="serviceKeyToProcess" target="serviceKeyToProcess"/>
             <flowable:in source="correlationId" target="correlationId"/>