diff --git a/.renovate/config.yaml b/.renovate/config.yaml
index 48bb56ec..df50f9d2 100644
--- a/.renovate/config.yaml
+++ b/.renovate/config.yaml
@@ -32,7 +32,7 @@ repositories:
     # Commit type to use if Semantic Commits are enabled (default: "chore")
     semanticCommitType: "chore"
     # Enable dependency dashboard
-    dependencyDashboard: true
+    dependencyDashboard: false
     # Include package files only within these defined paths
     includePaths:
       - "helmfile/environments/default/images.yaml.gotmpl"
@@ -59,30 +59,47 @@ repositories:
       - matchDatasources: [ "docker" ]
         matchDepTypes: [ "openDesk" ]
         groupName: "Platform"
+        groupSlug: "platform"
+        branchTopic: "platform"
       - matchDatasources: [ "docker" ]
         matchDepTypes: [ "Collabora" ]
         groupName: "Collabora"
+        groupSlug: "collabora"
+        branchTopic: "collabora"
       - matchDatasources: [ "docker" ]
         matchDepTypes: [ "Element" ]
         groupName: "Element"
+        groupSlug: "element"
+        branchTopic: "element"
       - matchDatasources: [ "docker" ]
         matchDepTypes: [ "Nordeck" ]
         groupName: "Nordeck"
+        groupSlug: "nordeck"
+        branchTopic: "nordeck"
       - matchDatasources: [ "docker" ]
         matchDepTypes: [ "Open-Xchange" ]
         groupName: "Open-Xchange"
+        groupSlug: "openxchange"
+        branchTopic: "openxchang"
       - matchDatasources: [ "docker" ]
         matchDepTypes: [ "OpenProject" ]
         groupName: "OpenProject"
+        groupSlug: "openproject"
+        branchTopic: "openproject"
       - matchDatasources: [ "docker" ]
-        matchDepTypes: [ "OpenProject" ]
-        groupName: "OpenProject"
+        matchDepTypes: [ "Nextcloud" ]
+        groupName: "nextcloud"
+        branchTopic: "nextcloud"
       - matchDatasources: [ "docker" ]
         matchDepTypes: [ "Univention" ]
         groupName: "Univention"
+        groupSlug: "univention"
+        branchTopic: "univention"
       - matchDatasources: [ "docker" ]
         matchDepTypes: [ "XWiki" ]
         groupName: "XWiki"
+        groupSlug: "xwiki"
+        branchTopic: "xwiki"
     # Add merge request labels
     labels:
       - "renovate"
diff --git a/helmfile/apps/element/values-synapse.yaml.gotmpl b/helmfile/apps/element/values-synapse.yaml.gotmpl
index 4270786f..eccaa25c 100644
--- a/helmfile/apps/element/values-synapse.yaml.gotmpl
+++ b/helmfile/apps/element/values-synapse.yaml.gotmpl
@@ -208,6 +208,8 @@ extraVolumeMounts:
 
 federation:
   enabled: {{ .Values.functional.externalServices.matrix.federation.enabled }}
+  domainAllowList:
+    {{ .Values.functional.externalServices.matrix.federation.domainAllowList | toYaml | nindent 4 }}
   ingress:
     host: "{{ .Values.global.hosts.synapseFederation }}.{{ .Values.global.domain }}"
     enabled: {{ .Values.ingress.enabled }}
diff --git a/helmfile/environments/default/charts.yaml.gotmpl b/helmfile/environments/default/charts.yaml.gotmpl
index b148acfb..36f0ad2f 100644
--- a/helmfile/environments/default/charts.yaml.gotmpl
+++ b/helmfile/environments/default/charts.yaml.gotmpl
@@ -109,7 +109,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-element"
-    version: "6.0.2"
+    version: "6.1.0"
     verify: true
   elementWellKnown:
     # providerCategory: "Platform"
@@ -119,7 +119,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-well-known"
-    version: "6.0.2"
+    version: "6.1.0"
     verify: true
   home:
     # providerCategory: "Platform"
@@ -211,7 +211,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-matrix-user-verification-service"
-    version: "6.0.2"
+    version: "6.1.0"
     verify: true
   memcached:
     # providerCategory: "Community"
@@ -449,7 +449,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-synapse"
-    version: "6.0.2"
+    version: "6.1.0"
     verify: true
   synapseAdmin:
     # Enterprise Component
@@ -477,7 +477,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-synapse-create-account"
-    version: "6.0.2"
+    version: "6.1.0"
     verify: true
   synapseGroupsync:
     # Enterprise Component
@@ -505,7 +505,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-synapse-web"
-    version: "6.0.2"
+    version: "6.1.0"
     verify: true
   xwiki:
     # providerCategory: "Supplier"
diff --git a/helmfile/environments/default/functional.yaml.gotmpl b/helmfile/environments/default/functional.yaml.gotmpl
index ab7314a6..a15ef53b 100644
--- a/helmfile/environments/default/functional.yaml.gotmpl
+++ b/helmfile/environments/default/functional.yaml.gotmpl
@@ -34,6 +34,8 @@ functional:
       federation:
         # Disable to not support Matrix federation with your installation.
         enabled: true
+        # List of matrix homeserver domains you want to allow federation with
+        domainAllowList: []
 
   filestore:
     quota:
diff --git a/helmfile/environments/default/replicas.yaml.gotmpl b/helmfile/environments/default/replicas.yaml.gotmpl
index 67f198a2..161f115a 100644
--- a/helmfile/environments/default/replicas.yaml.gotmpl
+++ b/helmfile/environments/default/replicas.yaml.gotmpl
@@ -84,8 +84,6 @@ replicas:
   umsGuardianManagementUi: 1
   # -- scalable: tbd
   umsGuardianOpenPolicyAgent: 1
-  # -- scalable: tbd
-  umsKeycloak: 1
   # -- scalable: false
   # -- comment: Should not be scaled, is an async process.
   umsKeycloakExtensionsHandler: 1