diff --git a/smardigo/pmci/datasource-action/tenant-management.json b/smardigo/pmci/datasource-action/tenant-management.json
index 4ad55cb..f2e87fa 100644
--- a/smardigo/pmci/datasource-action/tenant-management.json
+++ b/smardigo/pmci/datasource-action/tenant-management.json
@@ -13,6 +13,10 @@
     "key" : "id",
     "name" : "ID",
     "width" : 100
+  }, {
+    "key" : "stage",
+    "name" : "Stage",
+    "width" : 100
   }, {
     "key" : "key",
     "name" : "Mandantenschlüssel",
@@ -48,6 +52,6 @@
     "type" : "open-link",
     "icon" : "manage_accounts",
     "name" : "Benutzerverwaltung öffnen...",
-    "link" : "https://devnso-keycloak-01.smardigo.digital/auth/admin/{{ key }}/console/"
+    "link" : "https://{{ cluster.stage }}-keycloak-01.smardigo.digital/auth/admin/{{ tenant_key }}/console/"
   } ]
 }
\ No newline at end of file
diff --git a/smardigo/pmci/form/tenant.json b/smardigo/pmci/form/tenant.json
index e5cecaa..6631756 100644
--- a/smardigo/pmci/form/tenant.json
+++ b/smardigo/pmci/form/tenant.json
@@ -51,6 +51,83 @@
       "json" : ""
     },
     "components" : [ {
+      "label" : "Columns",
+      "columns" : [ {
+        "components" : [ {
+          "label" : "Stage",
+          "description" : "Automatisch generiert",
+          "allowMultipleMasks" : false,
+          "showWordCount" : false,
+          "showCharCount" : false,
+          "disabled" : true,
+          "tableView" : true,
+          "alwaysEnabled" : false,
+          "type" : "textfield",
+          "input" : true,
+          "key" : "stage",
+          "defaultValue" : "",
+          "validate" : {
+            "customMessage" : "",
+            "json" : ""
+          },
+          "conditional" : {
+            "show" : "",
+            "when" : "",
+            "json" : ""
+          },
+          "tabs" : null,
+          "properties" : { },
+          "inputFormat" : "plain",
+          "encrypted" : false,
+          "tags" : [ ],
+          "customConditional" : "",
+          "logic" : [ ],
+          "widget" : {
+            "type" : ""
+          },
+          "reorder" : false
+        } ],
+        "width" : 6,
+        "offset" : 0,
+        "push" : 0,
+        "pull" : 0,
+        "type" : "column",
+        "input" : false,
+        "hideOnChildrenHidden" : false,
+        "key" : "column",
+        "tableView" : true,
+        "label" : "Column"
+      }, {
+        "components" : [ ],
+        "width" : 6,
+        "offset" : 0,
+        "push" : 0,
+        "pull" : 0,
+        "type" : "column",
+        "input" : false,
+        "hideOnChildrenHidden" : false,
+        "key" : "column",
+        "tableView" : true,
+        "label" : "Column"
+      } ],
+      "mask" : false,
+      "tableView" : false,
+      "alwaysEnabled" : false,
+      "type" : "columns",
+      "input" : false,
+      "key" : "columns4",
+      "conditional" : {
+        "show" : "",
+        "when" : "",
+        "json" : ""
+      },
+      "tabs" : null,
+      "reorder" : false,
+      "properties" : { },
+      "tags" : null,
+      "customConditional" : "",
+      "logic" : [ ]
+    }, {
       "label" : "Columns",
       "columns" : [ {
         "components" : [ {
@@ -79,7 +156,7 @@
           "properties" : { },
           "inputFormat" : "plain",
           "encrypted" : false,
-          "tags" : null,
+          "tags" : [ ],
           "customConditional" : "",
           "logic" : [ ],
           "widget" : {
@@ -115,7 +192,7 @@
       "alwaysEnabled" : false,
       "type" : "columns",
       "input" : false,
-      "key" : "columns4",
+      "key" : "columns3",
       "conditional" : {
         "show" : "",
         "when" : "",
@@ -267,40 +344,7 @@
         "key" : "column",
         "tableView" : true,
         "label" : "Column"
-      } ],
-      "mask" : false,
-      "tableView" : false,
-      "alwaysEnabled" : false,
-      "type" : "columns",
-      "input" : false,
-      "key" : "columns3",
-      "conditional" : {
-        "show" : "",
-        "when" : "",
-        "json" : ""
-      },
-      "tabs" : null,
-      "reorder" : false,
-      "properties" : { },
-      "tags" : null,
-      "customConditional" : "",
-      "logic" : [ ]
-    }, {
-      "label" : "Columns",
-      "columns" : [ {
-        "components" : [ ],
-        "width" : 6,
-        "offset" : 0,
-        "push" : 0,
-        "pull" : 0,
-        "type" : "column",
-        "input" : false,
-        "hideOnChildrenHidden" : false,
-        "key" : "column",
-        "tableView" : true,
-        "label" : "Column"
       }, {
-        "components" : [ ],
         "width" : 6,
         "offset" : 0,
         "push" : 0,
@@ -310,7 +354,8 @@
         "hideOnChildrenHidden" : false,
         "key" : "column",
         "tableView" : true,
-        "label" : "Column"
+        "label" : "Column",
+        "components" : [ ]
       } ],
       "mask" : false,
       "tableView" : false,
@@ -324,11 +369,11 @@
         "json" : ""
       },
       "tabs" : null,
-      "reorder" : false,
       "properties" : { },
       "tags" : null,
       "customConditional" : "",
-      "logic" : [ ]
+      "logic" : [ ],
+      "reorder" : false
     }, {
       "label" : "Admin",
       "hideLabel" : true,
diff --git a/smardigo/pmci/process/tenant-create.bpmn b/smardigo/pmci/process/tenant-create.bpmn
index 89dfcc6..cce92cf 100644
--- a/smardigo/pmci/process/tenant-create.bpmn
+++ b/smardigo/pmci/process/tenant-create.bpmn
@@ -63,6 +63,7 @@
               <camunda:entry key="key" />
               <camunda:entry key="name" />
               <camunda:entry key="user_ids">${initial_user_ids}</camunda:entry>
+              <camunda:entry key="stage">${envStage}</camunda:entry>
             </camunda:map>
           </camunda:outputParameter>
         </camunda:inputOutput>
@@ -378,10 +379,6 @@
         <di:waypoint x="206" y="720" />
         <di:waypoint x="272" y="720" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_01w1452_di" bpmnElement="Flow_01w1452">
-        <di:waypoint x="308" y="720" />
-        <di:waypoint x="380" y="720" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_00n1r2j_di" bpmnElement="Flow_00n1r2j">
         <di:waypoint x="480" y="720" />
         <di:waypoint x="572" y="720" />
@@ -389,6 +386,10 @@
           <dc:Bounds x="504" y="702" width="45" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_01w1452_di" bpmnElement="Flow_01w1452">
+        <di:waypoint x="308" y="720" />
+        <di:waypoint x="380" y="720" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="Event_0twmkxv_di" bpmnElement="Event_0asnmja">
         <dc:Bounds x="572" y="482" width="36" height="36" />
       </bpmndi:BPMNShape>