diff --git a/helmfile/apps/nubus/values-nubus.yaml.gotmpl b/helmfile/apps/nubus/values-nubus.yaml.gotmpl
index 8ee8c03f..138b8c7e 100644
--- a/helmfile/apps/nubus/values-nubus.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-nubus.yaml.gotmpl
@@ -163,7 +163,7 @@ nubusKeycloakBootstrap:
   bootstrap:
     twoFactorAuthentication:
       enabled: true
-      group: "not2fa-users"
+      group: "2fa-users"
 
 # Credential secrets for accessing customer supplied services
 extraSecrets:
diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml
index 07022bc2..ac275738 100644
--- a/helmfile/environments/default/charts.yaml
+++ b/helmfile/environments/default/charts.yaml
@@ -242,18 +242,6 @@ charts:
     name: "nginx"
     version: "15.9.3"
     verify: true
-  # ums:
-  #   # providerCategory: "Supplier"
-  #   # providerResponsible: "Univention"
-  #   # upstreamRegistry: "https://artifacts.software-univention.de"
-  #   # upstreamRepository: "nubus/charts/ums"
-  #   # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
-  #   # upstreamMirrorStartFrom: ["0", "12", "0"]
-  #   registry: "registry.opencode.de"
-  #   repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
-  #   name: "ums"
-  #   version: "0.16.0"
-  #   verify: true
   nubus:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -402,18 +390,6 @@ charts:
     name: "opendesk-synapse-web"
     version: "3.3.0"
     verify: true
-  # umsKeycloakBootstrap:
-  #   # providerCategory: "Supplier"
-  #   # providerResponsible: "Univention"
-  #   # upstreamRegistry: "https://artifacts.software-univention.de"
-  #   # upstreamRepository: "nubus/charts/keycloak-bootstrap"
-  #   # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
-  #   # upstreamMirrorStartFrom: ["0", "1", "0"]
-  #   registry: "registry.opencode.de"
-  #   repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
-  #   name: "keycloak-bootstrap"
-  #   version: "0.1.0"
-  #   verify: true
   xwiki:
     # providerCategory: "Supplier"
     # providerResponsible: "XWiki"