diff --git a/smardigo/pmci/process/service-change.bpmn b/smardigo/pmci/process/service-change.bpmn
index e3975ab..9598f15 100644
--- a/smardigo/pmci/process/service-change.bpmn
+++ b/smardigo/pmci/process/service-change.bpmn
@@ -121,10 +121,10 @@
       <bpmn2:extensionElements>
         <camunda:inputOutput>
           <camunda:outputParameter name="stage">${envStage}</camunda:outputParameter>
-          <camunda:outputParameter name="managementHostname">${envManagementHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
           <camunda:outputParameter name="kibanaHostname">${envKibanaHostname}</camunda:outputParameter>
           <camunda:outputParameter name="keycloakHostname">${envKeycloakHostname}</camunda:outputParameter>
-          <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
+          <camunda:outputParameter name="managementHostname">${envManagementHostname}</camunda:outputParameter>
           <camunda:outputParameter name="progress_current">${0}</camunda:outputParameter>
           <camunda:outputParameter name="progress_max">${1}</camunda:outputParameter>
           <camunda:outputParameter name="jobs">
diff --git a/smardigo/pmci/process/service-create.bpmn b/smardigo/pmci/process/service-create.bpmn
index f57c697..c947f72 100644
--- a/smardigo/pmci/process/service-create.bpmn
+++ b/smardigo/pmci/process/service-create.bpmn
@@ -45,10 +45,10 @@
             </camunda:map>
           </camunda:inputParameter>
           <camunda:outputParameter name="stage">${envStage}</camunda:outputParameter>
-          <camunda:outputParameter name="managementHostname">${envManagementHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
           <camunda:outputParameter name="kibanaHostname">${envKibanaHostname}</camunda:outputParameter>
           <camunda:outputParameter name="keycloakHostname">${envKeycloakHostname}</camunda:outputParameter>
-          <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
+          <camunda:outputParameter name="managementHostname">${envManagementHostname}</camunda:outputParameter>
           <camunda:outputParameter name="service">
             <camunda:map>
               <camunda:entry key="connect_features">${in_connect_features}</camunda:entry>
diff --git a/smardigo/pmci/process/service-delete.bpmn b/smardigo/pmci/process/service-delete.bpmn
index 4ff80ae..5e70941 100644
--- a/smardigo/pmci/process/service-delete.bpmn
+++ b/smardigo/pmci/process/service-delete.bpmn
@@ -61,10 +61,10 @@
       <bpmn2:extensionElements>
         <camunda:inputOutput>
           <camunda:outputParameter name="stage">${envStage}</camunda:outputParameter>
-          <camunda:outputParameter name="managementHostname">${envManagementHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
           <camunda:outputParameter name="kibanaHostname">${envKibanaHostname}</camunda:outputParameter>
           <camunda:outputParameter name="keycloakHostname">${envKeycloakHostname}</camunda:outputParameter>
-          <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
+          <camunda:outputParameter name="managementHostname">${envManagementHostname}</camunda:outputParameter>
           <camunda:outputParameter name="progress_current">${0}</camunda:outputParameter>
           <camunda:outputParameter name="progress_max">${1}</camunda:outputParameter>
           <camunda:outputParameter name="jobs">
diff --git a/smardigo/pmci/process/service-replay-setup.bpmn b/smardigo/pmci/process/service-replay-setup.bpmn
index 9ff7b1c..37a2e57 100644
--- a/smardigo/pmci/process/service-replay-setup.bpmn
+++ b/smardigo/pmci/process/service-replay-setup.bpmn
@@ -32,10 +32,10 @@
       <bpmn2:extensionElements>
         <camunda:inputOutput>
           <camunda:outputParameter name="stage">${envStage}</camunda:outputParameter>
-          <camunda:outputParameter name="managementHostname">${envManagementHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
           <camunda:outputParameter name="kibanaHostname">${envKibanaHostname}</camunda:outputParameter>
           <camunda:outputParameter name="keycloakHostname">${envKeycloakHostname}</camunda:outputParameter>
-          <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
+          <camunda:outputParameter name="managementHostname">${envManagementHostname}</camunda:outputParameter>
           <camunda:inputParameter name="in_tenant">
             <camunda:map>
               <camunda:entry key="id">${service.tenant_id}</camunda:entry>
diff --git a/smardigo/pmci/process/service-setup.bpmn b/smardigo/pmci/process/service-setup.bpmn
index aae741e..bc04cd6 100644
--- a/smardigo/pmci/process/service-setup.bpmn
+++ b/smardigo/pmci/process/service-setup.bpmn
@@ -23,9 +23,9 @@
             </camunda:map>
           </camunda:inputParameter>
           <camunda:outputParameter name="stage">${envStage}</camunda:outputParameter>
-          <camunda:outputParameter name="managementHostname">${envManagementHostname}</camunda:outputParameter>
           <camunda:outputParameter name="kibanaHostname">${envKibanaHostname}</camunda:outputParameter>
           <camunda:outputParameter name="keycloakHostname">${envKeycloakHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="managementHostname">${envManagementHostname}</camunda:outputParameter>
           <camunda:outputParameter name="jobs">
             <camunda:list />
           </camunda:outputParameter>
diff --git a/smardigo/pmci/process/tenant-change.bpmn b/smardigo/pmci/process/tenant-change.bpmn
index 227b53c..173520b 100644
--- a/smardigo/pmci/process/tenant-change.bpmn
+++ b/smardigo/pmci/process/tenant-change.bpmn
@@ -15,8 +15,11 @@
       <bpmn2:extensionElements>
         <camunda:inputOutput>
           <camunda:outputParameter name="stage">${envStage}</camunda:outputParameter>
-          <camunda:outputParameter name="former_tenant">${tenant}</camunda:outputParameter>
           <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
+          <camunda:outputParameter name="kibanaHostname">${envKibanaHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="keycloakHostname">${envKeycloakHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="managementHostname">${envManagementHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="former_tenant">${tenant}</camunda:outputParameter>
         </camunda:inputOutput>
       </bpmn2:extensionElements>
       <bpmn2:incoming>Flow_1a8vxf0</bpmn2:incoming>
diff --git a/smardigo/pmci/process/tenant-create.bpmn b/smardigo/pmci/process/tenant-create.bpmn
index a9cf16d..89dfcc6 100644
--- a/smardigo/pmci/process/tenant-create.bpmn
+++ b/smardigo/pmci/process/tenant-create.bpmn
@@ -53,6 +53,9 @@
           </camunda:inputParameter>
           <camunda:outputParameter name="stage">${envStage}</camunda:outputParameter>
           <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
+          <camunda:outputParameter name="kibanaHostname">${envKibanaHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="keycloakHostname">${envKeycloakHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="managementHostname">${envManagementHostname}</camunda:outputParameter>
           <camunda:outputParameter name="tenant">
             <camunda:map>
               <camunda:entry key="admin">${initial_admin}</camunda:entry>
diff --git a/smardigo/pmci/process/tenant-delete.bpmn b/smardigo/pmci/process/tenant-delete.bpmn
index 5e35e5e..fecbc23 100644
--- a/smardigo/pmci/process/tenant-delete.bpmn
+++ b/smardigo/pmci/process/tenant-delete.bpmn
@@ -147,6 +147,9 @@
         <camunda:inputOutput>
           <camunda:outputParameter name="stage">${envStage}</camunda:outputParameter>
           <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
+          <camunda:outputParameter name="kibanaHostname">${envKibanaHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="keycloakHostname">${envKeycloakHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="managementHostname">${envManagementHostname}</camunda:outputParameter>
         </camunda:inputOutput>
       </bpmn2:extensionElements>
       <bpmn2:incoming>Flow_0qd4h04</bpmn2:incoming>