diff --git a/patchday.yml b/patchday.yml
index 370fe0c..fe1702b 100644
--- a/patchday.yml
+++ b/patchday.yml
@@ -382,7 +382,7 @@
         - name: "Check SMA-portal if reachable"
           become: no
           uri:
-            url: "https://{{ stage }}-management-01-connect.{{ domain }}:{{ admin_port_service }}/management/prometheus"
+            url: "{{ shared_service_url_management }}:{{ admin_port_service }}/management/prometheus"
             method: GET
             status_code: [200]
           register: sma_portal_avail
diff --git a/pmci-tenant-create.yml b/pmci-tenant-create.yml
index ec714fb..416c03f 100644
--- a/pmci-tenant-create.yml
+++ b/pmci-tenant-create.yml
@@ -50,12 +50,6 @@
       tags:
         - always
 
-    - name: "Setting default variables pre-tasks"
-      import_tasks: tasks/pmci_set_default_variables.yml
-      become: false
-      tags:
-        - always
-
   tasks:
     - name: "Creating keycloak realm <{{ tenant.key }}>"
       include_role:
diff --git a/pmci-tenant-delete.yml b/pmci-tenant-delete.yml
index 4159689..f85d1f0 100644
--- a/pmci-tenant-delete.yml
+++ b/pmci-tenant-delete.yml
@@ -50,12 +50,6 @@
       tags:
         - always
 
-    - name: "Setting default variables pre-tasks"
-      import_tasks: tasks/pmci_set_default_variables.yml
-      become: false
-      tags:
-        - always
-
   tasks:
     - name: "Delete keycloak realm <{{ tenant.key }}>"
       include_role:
diff --git a/roles/pmci/tenant/sync/tasks/main.yml b/roles/pmci/tenant/sync/tasks/main.yml
index 1229db9..a6d75ed 100644
--- a/roles/pmci/tenant/sync/tasks/main.yml
+++ b/roles/pmci/tenant/sync/tasks/main.yml
@@ -17,18 +17,18 @@
   set_fact:
     smardigo_auth_token_value: "{{ smardigo_user_token_result.token }}"
 
-- name: "Reading all pmci users from <{{ management_base_url }}>"
+- name: "Reading all pmci users from <{{ shared_service_hostname_management }}>"
   delegate_to: 127.0.0.1
   become: false
   uri:
-    url: "{{ http_s }}://{{ management_base_url }}/api/v1/scopes/{{ sma_management_scope_id }}/groups/workflow/members?roleIds={{ sma_management_role_id }}"
+    url: "{{ shared_service_url_management }}/api/v1/scopes/{{ sma_management_scope_id }}/groups/workflow/members?roleIds={{ sma_management_role_id }}"
     method: GET
     headers:
       "Smardigo-User-Token": "{{ smardigo_auth_token_value }}"
     status_code: [200,201]
   register: pmci_users_results
 
-- name: "Reading users from <{{ management_base_url }}>"
+- name: "Reading users from <{{ shared_service_hostname_management }}>"
   delegate_to: 127.0.0.1
   become: false
   set_fact:
@@ -37,11 +37,11 @@
     querystr1: "[*].id"
     querystr2: "[]"
 
-- name: "Reading tenants from <{{ management_base_url }}>"
+- name: "Reading tenants from <{{ shared_service_hostname_management }}>"
   delegate_to: 127.0.0.1
   become: false
   uri:
-    url: "{{ http_s }}://{{ management_base_url }}/api/v1/scopes/pmci/tags/latest/datasources/data-entity-tenants/query"
+    url: "{{ shared_service_url_management }}/api/v1/scopes/pmci/tags/latest/datasources/data-entity-tenants/query"
     method: GET
     headers:
       "Smardigo-User-Token": "{{ smardigo_auth_token_value }}"
diff --git a/smardigo/backup/process-variable-declaration/primary-process.json b/smardigo/backup/process-variable-declaration/primary-process.json
index ce612f4..faa3834 100644
--- a/smardigo/backup/process-variable-declaration/primary-process.json
+++ b/smardigo/backup/process-variable-declaration/primary-process.json
@@ -3,21 +3,54 @@
   "configKey" : "primary-process",
   "configType" : "process-variable-declaration",
   "variableDeclarations" : {
+    "candidateGroups" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Gruppen",
+      "tags" : [ ]
+    },
     "creation_date" : {
       "type" : "date",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Erstelldatum",
+      "tags" : [ ]
     },
     "creation_user_id" : {
       "type" : "userId",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Ersteller",
+      "tags" : [ ]
+    },
+    "id" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Id",
+      "tags" : [ ]
+    },
+    "process_definition_key" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Process",
+      "tags" : [ ]
     },
     "vorgang_status" : {
       "type" : "string",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "searchable" : false,
+      "label" : "Status",
+      "tags" : [ ]
     },
     "vorgang_status_text" : {
       "type" : "string",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Statustext",
+      "tags" : [ ]
     }
   }
 }
\ No newline at end of file
diff --git a/smardigo/backup/script/create-teams-message.groovy b/smardigo/backup/script/create-teams-message.groovy
index 404dabe..08daa60 100644
--- a/smardigo/backup/script/create-teams-message.groovy
+++ b/smardigo/backup/script/create-teams-message.groovy
@@ -1,4 +1,4 @@
-def smardigoUrl = "https://" + cluster.stage + "-management-01-connect.smardigo.digital/api/redirect/process/" + contextScopeId + "/dossier/simple-connect/" + contextProcessId
+def smardigoUrl = "https://" + managementHostname + "/api/redirect/process/" + contextScopeId + "/dossier/simple-connect/" + contextProcessId
 
 def message = [:]
 message["@type"] = "MessageCard"
diff --git a/smardigo/pmci/process-variable-declaration/service-change.json b/smardigo/pmci/process-variable-declaration/service-change.json
index 3fcfc77..f3ca0e2 100644
--- a/smardigo/pmci/process-variable-declaration/service-change.json
+++ b/smardigo/pmci/process-variable-declaration/service-change.json
@@ -7,61 +7,84 @@
       "type" : "date",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Erstelldatum"
+      "label" : "Erstelldatum",
+      "tags" : [ ]
     },
     "creation_user_id" : {
       "type" : "userId",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "creation_user_id"
+      "label" : "Ersteller",
+      "tags" : [ ]
     },
     "filterTenantId" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "TenantId"
+      "label" : "TenantId",
+      "tags" : [ ]
+    },
+    "id" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Id",
+      "tags" : [ ]
     },
     "jobs" : {
       "type" : "object",
       "classification" : "PRIVATE",
-      "label" : "jobs"
+      "label" : "jobs",
+      "tags" : [ ]
     },
     "keycloakHostname" : {
       "type" : "string",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "tags" : [ ]
     },
     "kibanaHostname" : {
       "type" : "string",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "tags" : [ ]
     },
     "maintenance_topic" : {
       "type" : "string",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "tags" : [ ]
     },
     "managementHostname" : {
       "type" : "string",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "tags" : [ ]
     },
     "process_definition_key" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Prozess"
+      "label" : "Prozess",
+      "tags" : [ ]
     },
     "progress_current" : {
-      "type" : "integer",
+      "type" : "long",
       "classification" : "PRIVATE",
-      "label" : "progress_current"
+      "label" : "progress_current",
+      "tags" : [ ]
     },
     "progress_max" : {
-      "type" : "integer",
+      "type" : "long",
       "classification" : "PRIVATE",
-      "label" : "progress_max"
+      "label" : "progress_max",
+      "tags" : [ ]
     },
     "service" : {
       "type" : "object",
       "classification" : "PRIVATE",
       "fields" : {
+        "connect_features" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "tags" : [ ]
+        },
         "cluster" : {
           "type" : "object",
           "classification" : "PRIVATE",
@@ -71,40 +94,88 @@
               "type" : "string",
               "classification" : "PRIVATE",
               "searchable" : true,
-              "label" : "Cluster Name"
+              "label" : "Cluster Name",
+              "tags" : [ ]
+            },
+            "service" : {
+              "type" : "string",
+              "classification" : "PRIVATE",
+              "searchable" : true,
+              "label" : "Cluster Service",
+              "tags" : [ ]
+            },
+            "size" : {
+              "type" : "integer",
+              "classification" : "PRIVATE",
+              "searchable" : true,
+              "label" : "Cluster Größe",
+              "tags" : [ ]
+            },
+            "stage" : {
+              "type" : "string",
+              "classification" : "PRIVATE",
+              "searchable" : true,
+              "label" : "Cluster Stage",
+              "tags" : [ ]
             }
-          }
+          },
+          "tags" : [ ]
         },
         "connect_version" : {
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Version"
+          "label" : "Version",
+          "tags" : [ ]
         },
         "name" : {
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Cluster Name"
+          "label" : "Cluster Name",
+          "tags" : [ ]
+        },
+        "id" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "searchable" : true,
+          "label" : "Id",
+          "tags" : [ ]
         },
         "tenant_key" : {
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Tenant Schlüssel"
+          "label" : "Tenant Schlüssel",
+          "tags" : [ ]
+        },
+        "link" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "searchable" : true,
+          "label" : "Link",
+          "tags" : [ ]
+        },
+        "tenant_id" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "tags" : [ ]
         }
-      }
+      },
+      "tags" : [ ]
     },
     "simulation" : {
       "type" : "boolean",
       "classification" : "PRIVATE",
-      "label" : "simulation"
+      "label" : "simulation",
+      "tags" : [ ]
     },
     "stage" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Stage"
+      "label" : "Stage",
+      "tags" : [ ]
     },
     "tenant" : {
       "type" : "object",
@@ -115,21 +186,37 @@
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Tenant Schlüssel"
+          "label" : "Tenant Schlüssel",
+          "tags" : [ ]
         }
-      }
+      },
+      "tags" : [ ]
     },
-    "vorgang_status" : {
+    "tenant_id" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "tags" : [ ]
+    },
+    "tenant_key" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Status num"
+      "label" : "Tenant Schlüssel",
+      "tags" : [ ]
+    },
+    "vorgang_status" : {
+      "type" : "long",
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Status",
+      "tags" : [ ]
     },
     "vorgang_status_text" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Status"
+      "label" : "Statustext",
+      "tags" : [ ]
     }
   }
 }
\ No newline at end of file
diff --git a/smardigo/pmci/process-variable-declaration/service-create.json b/smardigo/pmci/process-variable-declaration/service-create.json
index 6053464..07c2c6b 100644
--- a/smardigo/pmci/process-variable-declaration/service-create.json
+++ b/smardigo/pmci/process-variable-declaration/service-create.json
@@ -9,74 +9,89 @@
       "fields" : {
         "username" : {
           "type" : "string",
-          "classification" : "PRIVATE"
+          "classification" : "PRIVATE",
+          "tags" : [ ]
         },
         "password" : {
           "type" : "string",
-          "classification" : "PRIVATE"
+          "classification" : "PRIVATE",
+          "tags" : [ ]
         }
-      }
+      },
+      "tags" : [ ]
     },
     "creation_date" : {
       "type" : "date",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Erstelldatum"
+      "label" : "Erstelldatum",
+      "tags" : [ ]
     },
     "creation_user_id" : {
       "type" : "userId",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Ersteller"
+      "label" : "Ersteller",
+      "tags" : [ ]
     },
     "filterTenantId" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "TenantId"
+      "label" : "TenantId",
+      "tags" : [ ]
     },
     "jobs" : {
       "type" : "object",
       "classification" : "PRIVATE",
-      "label" : "jobs"
+      "label" : "jobs",
+      "tags" : [ ]
     },
     "keycloakHostname" : {
       "type" : "string",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "tags" : [ ]
     },
     "kibanaHostname" : {
       "type" : "string",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "tags" : [ ]
     },
     "managementHostname" : {
       "type" : "string",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "tags" : [ ]
     },
     "process_definition_key" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Prozess"
+      "label" : "Prozess",
+      "tags" : [ ]
     },
     "progress_current" : {
       "type" : "long",
       "classification" : "PRIVATE",
-      "label" : "progress_current"
+      "label" : "progress_current",
+      "tags" : [ ]
     },
     "progress_max" : {
       "type" : "long",
       "classification" : "PRIVATE",
-      "label" : "progress_max"
+      "label" : "progress_max",
+      "tags" : [ ]
     },
     "pruefer_id" : {
       "type" : "string",
       "classification" : "PRIVATE",
-      "label" : "pruefer_id"
+      "label" : "pruefer_id",
+      "tags" : [ ]
     },
     "request_decision" : {
       "type" : "string",
       "classification" : "PRIVATE",
-      "label" : "request_decision"
+      "label" : "request_decision",
+      "tags" : [ ]
     },
     "service" : {
       "type" : "object",
@@ -91,40 +106,48 @@
               "type" : "string",
               "classification" : "PRIVATE",
               "searchable" : true,
-              "label" : "Cluster Name"
+              "label" : "Cluster Name",
+              "tags" : [ ]
             }
-          }
+          },
+          "tags" : [ ]
         },
         "connect_version" : {
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Version"
+          "label" : "Version",
+          "tags" : [ ]
         },
         "name" : {
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Cluster Name"
+          "label" : "Cluster Name",
+          "tags" : [ ]
         },
         "tenant_key" : {
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Tenant Schlüssel"
+          "label" : "Tenant Schlüssel",
+          "tags" : [ ]
         }
-      }
+      },
+      "tags" : [ ]
     },
     "simulation" : {
       "type" : "boolean",
       "classification" : "PRIVATE",
-      "label" : "simulation"
+      "label" : "simulation",
+      "tags" : [ ]
     },
     "stage" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Stage"
+      "label" : "Stage",
+      "tags" : [ ]
     },
     "tenant" : {
       "type" : "object",
@@ -135,21 +158,25 @@
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Tenant Schlüssel"
+          "label" : "Tenant Schlüssel",
+          "tags" : [ ]
         }
-      }
+      },
+      "tags" : [ ]
     },
     "vorgang_status" : {
       "type" : "long",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Status"
+      "label" : "Status",
+      "tags" : [ ]
     },
     "vorgang_status_text" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Statustext"
+      "label" : "Statustext",
+      "tags" : [ ]
     },
     "wordpress_admin" : {
       "type" : "object",
@@ -158,13 +185,16 @@
       "fields" : {
         "username" : {
           "type" : "string",
-          "classification" : "PRIVATE"
+          "classification" : "PRIVATE",
+          "tags" : [ ]
         },
         "password" : {
           "type" : "string",
-          "classification" : "PRIVATE"
+          "classification" : "PRIVATE",
+          "tags" : [ ]
         }
-      }
+      },
+      "tags" : [ ]
     }
   }
 }
\ No newline at end of file
diff --git a/smardigo/pmci/process-variable-declaration/service-delete.json b/smardigo/pmci/process-variable-declaration/service-delete.json
index dfa5bd6..c92ec45 100644
--- a/smardigo/pmci/process-variable-declaration/service-delete.json
+++ b/smardigo/pmci/process-variable-declaration/service-delete.json
@@ -7,57 +7,84 @@
       "type" : "date",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Erstelldatum"
+      "label" : "Erstelldatum",
+      "tags" : [ ]
     },
     "creation_user_id" : {
       "type" : "userId",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Ersteller"
+      "label" : "Ersteller",
+      "tags" : [ ]
     },
     "filterTenantId" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "TenantId"
+      "label" : "TenantId",
+      "tags" : [ ]
+    },
+    "id" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Id",
+      "tags" : [ ]
     },
     "jobs" : {
       "type" : "object",
       "classification" : "PRIVATE",
-      "label" : "jobs"
+      "label" : "jobs",
+      "tags" : [ ]
     },
     "keycloakHostname" : {
       "type" : "string",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "tags" : [ ]
     },
     "kibanaHostname" : {
       "type" : "string",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "tags" : [ ]
+    },
+    "maintenance_topic" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "tags" : [ ]
     },
     "managementHostname" : {
       "type" : "string",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "tags" : [ ]
     },
     "process_definition_key" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Prozess"
+      "label" : "Prozess",
+      "tags" : [ ]
     },
     "progress_current" : {
       "type" : "long",
       "classification" : "PRIVATE",
-      "label" : "progress_current"
+      "label" : "progress_current",
+      "tags" : [ ]
     },
     "progress_max" : {
       "type" : "long",
       "classification" : "PRIVATE",
-      "label" : "progress_max"
+      "label" : "progress_max",
+      "tags" : [ ]
     },
     "service" : {
       "type" : "object",
       "classification" : "PRIVATE",
       "fields" : {
+        "connect_features" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "tags" : [ ]
+        },
         "cluster" : {
           "type" : "object",
           "classification" : "PRIVATE",
@@ -67,40 +94,88 @@
               "type" : "string",
               "classification" : "PRIVATE",
               "searchable" : true,
-              "label" : "Cluster Name"
+              "label" : "Cluster Name",
+              "tags" : [ ]
+            },
+            "service" : {
+              "type" : "string",
+              "classification" : "PRIVATE",
+              "searchable" : true,
+              "label" : "Cluster Service",
+              "tags" : [ ]
+            },
+            "size" : {
+              "type" : "integer",
+              "classification" : "PRIVATE",
+              "searchable" : true,
+              "label" : "Cluster Größe",
+              "tags" : [ ]
+            },
+            "stage" : {
+              "type" : "string",
+              "classification" : "PRIVATE",
+              "searchable" : true,
+              "label" : "Cluster Stage",
+              "tags" : [ ]
             }
-          }
+          },
+          "tags" : [ ]
         },
         "connect_version" : {
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Version"
+          "label" : "Version",
+          "tags" : [ ]
         },
         "name" : {
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Cluster Name"
+          "label" : "Cluster Name",
+          "tags" : [ ]
+        },
+        "id" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "searchable" : true,
+          "label" : "Id",
+          "tags" : [ ]
         },
         "tenant_key" : {
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Tenant Schlüssel"
+          "label" : "Tenant Schlüssel",
+          "tags" : [ ]
+        },
+        "link" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "searchable" : true,
+          "label" : "Link",
+          "tags" : [ ]
+        },
+        "tenant_id" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "tags" : [ ]
         }
-      }
+      },
+      "tags" : [ ]
     },
     "simulation" : {
       "type" : "boolean",
       "classification" : "PRIVATE",
-      "label" : "simulation"
+      "label" : "simulation",
+      "tags" : [ ]
     },
     "stage" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Stage"
+      "label" : "Stage",
+      "tags" : [ ]
     },
     "tenant" : {
       "type" : "object",
@@ -111,21 +186,37 @@
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Tenant Schlüssel"
+          "label" : "Tenant Schlüssel",
+          "tags" : [ ]
         }
-      }
+      },
+      "tags" : [ ]
+    },
+    "tenant_id" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "tags" : [ ]
+    },
+    "tenant_key" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Tenant Schlüssel",
+      "tags" : [ ]
     },
     "vorgang_status" : {
       "type" : "long",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Status"
+      "label" : "Status",
+      "tags" : [ ]
     },
     "vorgang_status_text" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Statustext"
+      "label" : "Statustext",
+      "tags" : [ ]
     }
   }
 }
\ No newline at end of file
diff --git a/smardigo/pmci/process-variable-declaration/service-replay-setup.json b/smardigo/pmci/process-variable-declaration/service-replay-setup.json
index ebe5e6a..61bcf19 100644
--- a/smardigo/pmci/process-variable-declaration/service-replay-setup.json
+++ b/smardigo/pmci/process-variable-declaration/service-replay-setup.json
@@ -9,79 +9,106 @@
       "fields" : {
         "username" : {
           "type" : "string",
-          "classification" : "PRIVATE"
+          "classification" : "PRIVATE",
+          "tags" : [ ]
         },
         "password" : {
           "type" : "string",
-          "classification" : "PRIVATE"
+          "classification" : "PRIVATE",
+          "tags" : [ ]
         }
-      }
+      },
+      "tags" : [ ]
     },
     "creation_date" : {
       "type" : "date",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Erstelldatum"
+      "label" : "Erstelldatum",
+      "tags" : [ ]
     },
     "creation_user_id" : {
       "type" : "userId",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Ersteller"
+      "label" : "Ersteller",
+      "tags" : [ ]
     },
     "filterTenantId" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "TenantId"
+      "label" : "TenantId",
+      "tags" : [ ]
+    },
+    "id" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Id",
+      "tags" : [ ]
     },
     "jobs" : {
       "type" : "object",
       "classification" : "PRIVATE",
-      "label" : "jobs"
+      "label" : "jobs",
+      "tags" : [ ]
     },
     "keycloakHostname" : {
       "type" : "string",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "tags" : [ ]
     },
     "kibanaHostname" : {
       "type" : "string",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "tags" : [ ]
     },
     "managementHostname" : {
       "type" : "string",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "tags" : [ ]
     },
     "process_definition_key" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Prozess"
+      "label" : "Prozess",
+      "tags" : [ ]
     },
     "progress_current" : {
       "type" : "long",
       "classification" : "PRIVATE",
-      "label" : "progress_current"
+      "label" : "progress_current",
+      "tags" : [ ]
     },
     "progress_max" : {
       "type" : "long",
       "classification" : "PRIVATE",
-      "label" : "progress_max"
+      "label" : "progress_max",
+      "tags" : [ ]
     },
     "pruefer_id" : {
       "type" : "string",
       "classification" : "PRIVATE",
-      "label" : "pruefer_id"
+      "label" : "pruefer_id",
+      "tags" : [ ]
     },
     "request_decision" : {
       "type" : "string",
       "classification" : "PRIVATE",
-      "label" : "request_decision"
+      "label" : "request_decision",
+      "tags" : [ ]
     },
     "service" : {
       "type" : "object",
       "classification" : "PRIVATE",
       "fields" : {
+        "connect_features" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "tags" : [ ]
+        },
         "cluster" : {
           "type" : "object",
           "classification" : "PRIVATE",
@@ -91,40 +118,88 @@
               "type" : "string",
               "classification" : "PRIVATE",
               "searchable" : true,
-              "label" : "Cluster Name"
+              "label" : "Cluster Name",
+              "tags" : [ ]
+            },
+            "service" : {
+              "type" : "string",
+              "classification" : "PRIVATE",
+              "searchable" : true,
+              "label" : "Cluster Service",
+              "tags" : [ ]
+            },
+            "size" : {
+              "type" : "integer",
+              "classification" : "PRIVATE",
+              "searchable" : true,
+              "label" : "Cluster Größe",
+              "tags" : [ ]
+            },
+            "stage" : {
+              "type" : "string",
+              "classification" : "PRIVATE",
+              "searchable" : true,
+              "label" : "Cluster Stage",
+              "tags" : [ ]
             }
-          }
+          },
+          "tags" : [ ]
         },
         "connect_version" : {
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Version"
+          "label" : "Version",
+          "tags" : [ ]
         },
         "name" : {
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Cluster Name"
+          "label" : "Cluster Name",
+          "tags" : [ ]
+        },
+        "id" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "searchable" : true,
+          "label" : "Id",
+          "tags" : [ ]
         },
         "tenant_key" : {
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Tenant Schlüssel"
+          "label" : "Tenant Schlüssel",
+          "tags" : [ ]
+        },
+        "link" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "searchable" : true,
+          "label" : "Link",
+          "tags" : [ ]
+        },
+        "tenant_id" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "tags" : [ ]
         }
-      }
+      },
+      "tags" : [ ]
     },
     "simulation" : {
       "type" : "boolean",
       "classification" : "PRIVATE",
-      "label" : "simulation"
+      "label" : "simulation",
+      "tags" : [ ]
     },
     "stage" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Stage"
+      "label" : "Stage",
+      "tags" : [ ]
     },
     "tenant" : {
       "type" : "object",
@@ -135,21 +210,37 @@
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Tenant Schlüssel"
+          "label" : "Tenant Schlüssel",
+          "tags" : [ ]
         }
-      }
+      },
+      "tags" : [ ]
+    },
+    "tenant_id" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "tags" : [ ]
+    },
+    "tenant_key" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Tenant Schlüssel",
+      "tags" : [ ]
     },
     "vorgang_status" : {
       "type" : "long",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Status"
+      "label" : "Status",
+      "tags" : [ ]
     },
     "vorgang_status_text" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Statustext"
+      "label" : "Statustext",
+      "tags" : [ ]
     },
     "wordpress_admin" : {
       "type" : "object",
@@ -158,13 +249,16 @@
       "fields" : {
         "username" : {
           "type" : "string",
-          "classification" : "PRIVATE"
+          "classification" : "PRIVATE",
+          "tags" : [ ]
         },
         "password" : {
           "type" : "string",
-          "classification" : "PRIVATE"
+          "classification" : "PRIVATE",
+          "tags" : [ ]
         }
-      }
+      },
+      "tags" : [ ]
     }
   }
 }
\ No newline at end of file
diff --git a/smardigo/pmci/process-variable-declaration/service-setup.json b/smardigo/pmci/process-variable-declaration/service-setup.json
index 2b22f2e..f152e72 100644
--- a/smardigo/pmci/process-variable-declaration/service-setup.json
+++ b/smardigo/pmci/process-variable-declaration/service-setup.json
@@ -9,78 +9,244 @@
       "fields" : {
         "username" : {
           "type" : "string",
-          "classification" : "PRIVATE"
+          "classification" : "PRIVATE",
+          "tags" : [ ]
         },
         "password" : {
           "type" : "string",
-          "classification" : "PRIVATE"
+          "classification" : "PRIVATE",
+          "tags" : [ ]
         }
-      }
+      },
+      "tags" : [ ]
     },
     "creation_date" : {
       "type" : "date",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Erstelldatum"
+      "label" : "Erstelldatum",
+      "tags" : [ ]
     },
     "creation_user_id" : {
       "type" : "userId",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "creation_user_id"
+      "label" : "Ersteller",
+      "tags" : [ ]
     },
     "filterTenantId" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "TenantId"
+      "label" : "TenantId",
+      "tags" : [ ]
+    },
+    "id" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Id",
+      "tags" : [ ]
     },
     "in_data" : {
       "type" : "object",
       "classification" : "PRIVATE",
-      "label" : "in_data"
+      "label" : "in_data",
+      "tags" : [ ]
     },
     "jobs" : {
       "type" : "object",
       "classification" : "PRIVATE",
-      "label" : "jobs"
+      "label" : "jobs",
+      "tags" : [ ]
     },
     "keycloakHostname" : {
       "type" : "string",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "tags" : [ ]
     },
     "kibanaHostname" : {
       "type" : "string",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "tags" : [ ]
     },
     "managementHostname" : {
       "type" : "string",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "tags" : [ ]
+    },
+    "process_definition_key" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Prozess",
+      "tags" : [ ]
     },
     "progress_current" : {
-      "type" : "integer",
+      "type" : "long",
       "classification" : "PRIVATE",
-      "label" : "progress_current"
+      "label" : "progress_current",
+      "tags" : [ ]
     },
     "progress_max" : {
-      "type" : "integer",
+      "type" : "long",
+      "classification" : "PRIVATE",
+      "label" : "progress_max",
+      "tags" : [ ]
+    },
+    "pruefer_id" : {
+      "type" : "string",
       "classification" : "PRIVATE",
-      "label" : "progress_max"
+      "label" : "pruefer_id",
+      "tags" : [ ]
+    },
+    "request_decision" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "label" : "request_decision",
+      "tags" : [ ]
     },
     "service" : {
       "type" : "object",
       "classification" : "PRIVATE",
-      "label" : "service"
+      "fields" : {
+        "connect_features" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "tags" : [ ]
+        },
+        "cluster" : {
+          "type" : "object",
+          "classification" : "PRIVATE",
+          "label" : "Cluster",
+          "fields" : {
+            "key" : {
+              "type" : "string",
+              "classification" : "PRIVATE",
+              "searchable" : true,
+              "label" : "Cluster Name",
+              "tags" : [ ]
+            },
+            "service" : {
+              "type" : "string",
+              "classification" : "PRIVATE",
+              "searchable" : true,
+              "label" : "Cluster Service",
+              "tags" : [ ]
+            },
+            "size" : {
+              "type" : "integer",
+              "classification" : "PRIVATE",
+              "searchable" : true,
+              "label" : "Cluster Größe",
+              "tags" : [ ]
+            },
+            "stage" : {
+              "type" : "string",
+              "classification" : "PRIVATE",
+              "searchable" : true,
+              "label" : "Cluster Stage",
+              "tags" : [ ]
+            }
+          },
+          "tags" : [ ]
+        },
+        "connect_version" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "searchable" : true,
+          "label" : "Version",
+          "tags" : [ ]
+        },
+        "name" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "searchable" : true,
+          "label" : "Cluster Name",
+          "tags" : [ ]
+        },
+        "id" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "searchable" : true,
+          "label" : "Id",
+          "tags" : [ ]
+        },
+        "tenant_key" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "searchable" : true,
+          "label" : "Tenant Schlüssel",
+          "tags" : [ ]
+        },
+        "link" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "searchable" : true,
+          "label" : "Link",
+          "tags" : [ ]
+        },
+        "tenant_id" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "tags" : [ ]
+        }
+      },
+      "tags" : [ ]
+    },
+    "simulation" : {
+      "type" : "boolean",
+      "classification" : "PRIVATE",
+      "label" : "simulation",
+      "tags" : [ ]
     },
     "stage" : {
       "type" : "string",
       "classification" : "PRIVATE",
-      "label" : "stage"
+      "searchable" : true,
+      "label" : "Stage",
+      "tags" : [ ]
     },
     "tenant" : {
       "type" : "object",
       "classification" : "PRIVATE",
-      "label" : "tenant"
+      "label" : "Tenant",
+      "fields" : {
+        "key" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "searchable" : true,
+          "label" : "Tenant Schlüssel",
+          "tags" : [ ]
+        }
+      },
+      "tags" : [ ]
+    },
+    "tenant_id" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "tags" : [ ]
+    },
+    "tenant_key" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Tenant Schlüssel",
+      "tags" : [ ]
+    },
+    "vorgang_status" : {
+      "type" : "long",
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Status",
+      "tags" : [ ]
+    },
+    "vorgang_status_text" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Statustext",
+      "tags" : [ ]
     },
     "wordpress_admin" : {
       "type" : "object",
@@ -89,13 +255,16 @@
       "fields" : {
         "username" : {
           "type" : "string",
-          "classification" : "PRIVATE"
+          "classification" : "PRIVATE",
+          "tags" : [ ]
         },
         "password" : {
           "type" : "string",
-          "classification" : "PRIVATE"
+          "classification" : "PRIVATE",
+          "tags" : [ ]
         }
-      }
+      },
+      "tags" : [ ]
     }
   }
 }
\ No newline at end of file
diff --git a/smardigo/pmci/process-variable-declaration/simulation.json b/smardigo/pmci/process-variable-declaration/simulation.json
index bf20e38..926c48e 100644
--- a/smardigo/pmci/process-variable-declaration/simulation.json
+++ b/smardigo/pmci/process-variable-declaration/simulation.json
@@ -5,16 +5,19 @@
   "variableDeclarations" : {
     "creation_date" : {
       "type" : "date",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "tags" : [ ]
     },
     "creation_user_id" : {
       "type" : "userId",
-      "classification" : "PRIVATE"
+      "classification" : "PRIVATE",
+      "tags" : [ ]
     },
     "simulation" : {
       "type" : "boolean",
       "classification" : "PRIVATE",
-      "label" : "simulation"
+      "label" : "simulation",
+      "tags" : [ ]
     }
   }
 }
\ No newline at end of file
diff --git a/smardigo/pmci/process-variable-declaration/tenant-change.json b/smardigo/pmci/process-variable-declaration/tenant-change.json
index fe009af..cb3b59a 100644
--- a/smardigo/pmci/process-variable-declaration/tenant-change.json
+++ b/smardigo/pmci/process-variable-declaration/tenant-change.json
@@ -7,39 +7,53 @@
       "type" : "date",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Erstelldatum"
+      "label" : "Erstelldatum",
+      "tags" : [ ]
     },
     "creation_user_id" : {
       "type" : "userId",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Ersteller"
+      "label" : "Ersteller",
+      "tags" : [ ]
     },
     "former_tenant" : {
       "type" : "object",
       "classification" : "PRIVATE",
-      "label" : "former_tenant"
+      "label" : "former_tenant",
+      "tags" : [ ]
+    },
+    "id" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Id",
+      "tags" : [ ]
     },
     "keycloak_admin" : {
       "type" : "object",
       "classification" : "PRIVATE",
-      "label" : "Keycloak Administrator"
+      "label" : "Keycloak Administrator",
+      "tags" : [ ]
     },
     "process_definition_key" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "HIDDEN process_definition_key"
+      "label" : "HIDDEN process_definition_key",
+      "tags" : [ ]
     },
     "simulation" : {
-      "type" : "string",
+      "type" : "boolean",
       "classification" : "PRIVATE",
-      "label" : "simulation"
+      "label" : "simulation",
+      "tags" : [ ]
     },
     "stage" : {
       "type" : "string",
       "classification" : "PRIVATE",
-      "label" : "Stage"
+      "label" : "Stage",
+      "tags" : [ ]
     },
     "tenant" : {
       "type" : "object",
@@ -50,27 +64,74 @@
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Mandantenschlüssel"
+          "label" : "Mandantenschlüssel",
+          "tags" : [ ]
+        },
+        "id" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "searchable" : true,
+          "label" : "Id",
+          "tags" : [ ]
         },
         "name" : {
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Mandantenname"
+          "label" : "Mandantenname",
+          "tags" : [ ]
+        },
+        "stage" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "searchable" : true,
+          "label" : "Cluster Stage",
+          "tags" : [ ]
+        },
+        "user_ids" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "tags" : [ ]
+        },
+        "admin" : {
+          "type" : "object",
+          "classification" : "PRIVATE",
+          "label" : "Admin",
+          "fields" : {
+            "email" : {
+              "type" : "string",
+              "classification" : "PRIVATE",
+              "tags" : [ ]
+            },
+            "first_name" : {
+              "type" : "string",
+              "classification" : "PRIVATE",
+              "tags" : [ ]
+            },
+            "last_name" : {
+              "type" : "string",
+              "classification" : "PRIVATE",
+              "tags" : [ ]
+            }
+          },
+          "tags" : [ ]
         }
-      }
+      },
+      "tags" : [ ]
     },
     "vorgang_status" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Status"
+      "label" : "Status",
+      "tags" : [ ]
     },
     "vorgang_status_text" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Statustext"
+      "label" : "Statustext",
+      "tags" : [ ]
     }
   }
 }
\ No newline at end of file
diff --git a/smardigo/pmci/process-variable-declaration/tenant-create.json b/smardigo/pmci/process-variable-declaration/tenant-create.json
index 0ca7046..ca85500 100644
--- a/smardigo/pmci/process-variable-declaration/tenant-create.json
+++ b/smardigo/pmci/process-variable-declaration/tenant-create.json
@@ -7,34 +7,40 @@
       "type" : "date",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Erstelldatum"
+      "label" : "Erstelldatum",
+      "tags" : [ ]
     },
     "creation_user_id" : {
       "type" : "userId",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Ersteller"
+      "label" : "Ersteller",
+      "tags" : [ ]
     },
     "keycloak_admin" : {
       "type" : "object",
       "classification" : "PRIVATE",
-      "label" : "Keycloak Administrator"
+      "label" : "Keycloak Administrator",
+      "tags" : [ ]
     },
     "process_definition_key" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "HIDDEN process_definition_key"
+      "label" : "HIDDEN process_definition_key",
+      "tags" : [ ]
     },
     "simulation" : {
       "type" : "boolean",
       "classification" : "PRIVATE",
-      "label" : "simulation"
+      "label" : "simulation",
+      "tags" : [ ]
     },
     "stage" : {
       "type" : "string",
       "classification" : "PRIVATE",
-      "label" : "Stage"
+      "label" : "Stage",
+      "tags" : [ ]
     },
     "tenant" : {
       "type" : "object",
@@ -45,27 +51,32 @@
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Mandantenschlüssel"
+          "label" : "Mandantenschlüssel",
+          "tags" : [ ]
         },
         "name" : {
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Mandantenname"
+          "label" : "Mandantenname",
+          "tags" : [ ]
         }
-      }
+      },
+      "tags" : [ ]
     },
     "vorgang_status" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Status"
+      "label" : "Status",
+      "tags" : [ ]
     },
     "vorgang_status_text" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Statustext"
+      "label" : "Statustext",
+      "tags" : [ ]
     }
   }
 }
\ No newline at end of file
diff --git a/smardigo/pmci/process-variable-declaration/tenant-delete.json b/smardigo/pmci/process-variable-declaration/tenant-delete.json
index 68dae71..8e043bb 100644
--- a/smardigo/pmci/process-variable-declaration/tenant-delete.json
+++ b/smardigo/pmci/process-variable-declaration/tenant-delete.json
@@ -7,29 +7,53 @@
       "type" : "date",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Erstelldatum"
+      "label" : "Erstelldatum",
+      "tags" : [ ]
     },
     "creation_user_id" : {
       "type" : "userId",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Ersteller"
+      "label" : "Ersteller",
+      "tags" : [ ]
+    },
+    "former_tenant" : {
+      "type" : "object",
+      "classification" : "PRIVATE",
+      "label" : "former_tenant",
+      "tags" : [ ]
+    },
+    "id" : {
+      "type" : "string",
+      "classification" : "PRIVATE",
+      "searchable" : true,
+      "label" : "Id",
+      "tags" : [ ]
+    },
+    "keycloak_admin" : {
+      "type" : "object",
+      "classification" : "PRIVATE",
+      "label" : "Keycloak Administrator",
+      "tags" : [ ]
     },
     "process_definition_key" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "HIDDEN process_definition_key"
+      "label" : "HIDDEN process_definition_key",
+      "tags" : [ ]
     },
     "simulation" : {
       "type" : "boolean",
       "classification" : "PRIVATE",
-      "label" : "simulation"
+      "label" : "simulation",
+      "tags" : [ ]
     },
     "stage" : {
       "type" : "string",
       "classification" : "PRIVATE",
-      "label" : "Stage"
+      "label" : "Stage",
+      "tags" : [ ]
     },
     "tenant" : {
       "type" : "object",
@@ -40,27 +64,74 @@
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Mandantenschlüssel"
+          "label" : "Mandantenschlüssel",
+          "tags" : [ ]
+        },
+        "id" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "searchable" : true,
+          "label" : "Id",
+          "tags" : [ ]
         },
         "name" : {
           "type" : "string",
           "classification" : "PRIVATE",
           "searchable" : true,
-          "label" : "Mandantenname"
+          "label" : "Mandantenname",
+          "tags" : [ ]
+        },
+        "stage" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "searchable" : true,
+          "label" : "Cluster Stage",
+          "tags" : [ ]
+        },
+        "user_ids" : {
+          "type" : "string",
+          "classification" : "PRIVATE",
+          "tags" : [ ]
+        },
+        "admin" : {
+          "type" : "object",
+          "classification" : "PRIVATE",
+          "label" : "Admin",
+          "fields" : {
+            "email" : {
+              "type" : "string",
+              "classification" : "PRIVATE",
+              "tags" : [ ]
+            },
+            "first_name" : {
+              "type" : "string",
+              "classification" : "PRIVATE",
+              "tags" : [ ]
+            },
+            "last_name" : {
+              "type" : "string",
+              "classification" : "PRIVATE",
+              "tags" : [ ]
+            }
+          },
+          "tags" : [ ]
         }
-      }
+      },
+      "tags" : [ ]
     },
     "vorgang_status" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Status"
+      "label" : "Status",
+      "tags" : [ ]
     },
     "vorgang_status_text" : {
       "type" : "string",
       "classification" : "PRIVATE",
       "searchable" : true,
-      "label" : "Statustext"
+      "label" : "Statustext",
+      "tags" : [ ]
     }
   }
 }
\ No newline at end of file
diff --git a/tasks/pmci_set_default_variables.yml b/tasks/pmci_set_default_variables.yml
index bb726be..ff96984 100644
--- a/tasks/pmci_set_default_variables.yml
+++ b/tasks/pmci_set_default_variables.yml
@@ -5,7 +5,6 @@
     tenant_id: "{{ tenant.key }}" # legacy paramater, backwards compatibility
     cluster_name: "{{ cluster.key }}" # legacy paramater, backwards compatibility
     current_realm_name: "{{ tenant.key }}" # legacy paramater, backwards compatibility
-    management_base_url: "{{ stage }}-management-01-connect.{{ domain }}"
 
 - name: "Setting pmci connect variables"
   ansible.builtin.set_fact: