feat(open-xchange): Enable ACLs and support logins different from local part

Enable the Mail Login Resolver to properly resolve UUIDs to OX users and vice versa. Switch IMAP auth from emails to login names, since that's the only field present in authentication tokens. Due to an issue with retrieving operationsl LDAP attributes (see OX issue /appsuite/platform/core#251), entryUUID does not work currently. As a work-around, users need to have their UUIDs in the field departmentNumber. Migrating to UUIDs (WP#1236) would also work. Maybe we should just make that field configurable.
ci: Ensure "DEPLOY" options are grouped together
2025-12-06 15:31:38 +01:00 · 2025-04-13 17:25:32 +02:00 · 2025-04-11 13:05:07 +02:00 · 2025-04-11 13:05:04 +02:00 · 2025-04-11 08:54:33 +02:00 · 2025-04-10 09:46:01 +02:00
76 changed files with 413 additions and 2240 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@
 ---
 include:
  - project: "${PROJECT_PATH_GITLAB_CONFIG_TOOLING}"
-    ref: "v2.4.9"
+    ref: "v2.4.8"
    file:
      - "ci/common/lint.yml"
      - "ci/release-automation/semantic-release.yml"
@@ -232,8 +232,8 @@ variables:
  extends: ".environments"
  environment:
    name: "${NAMESPACE}"
-  image: "registry.opencode.de/bmi/opendesk/components/platform-development/images/helm:1.3.1\
+  image: "registry.opencode.de/bmi/opendesk/components/platform-development/images/helm:1.1.0\
-          @sha256:de527f493044f06009045c369be831ababbc8dd74adaa378613c5acb1e654959"
+          @sha256:74f349066ac5d20e3afaa6abd28781b4c8dc086f67e3d3c1b8345e4a9c3371b1"
  script:
    - "cd ${CI_PROJECT_DIR}/helmfile/apps/${COMPONENT}"
    # MASTER_PASSWORD_WEB_VAR as precedence for MASTER_PASSWORD
@@ -769,17 +769,6 @@ avscan-prepare:
        stage: "scan"
        image: "registry.opencode.de/bmi/opendesk/components/platform-development/images/clamav-imagescan:1.0.0"
        before_script:
          - "mkdir -p ~/.docker"
          - |
            cat << EOF > ~/.docker/config.json
            {
              "auths": {
                "$CI_REGISTRY": {
                  "auth": "$(printf %s:%s ${CI_REGISTRY_USER} ${CI_REGISTRY_PASSWORD} | base64 | tr -d '\n')"
                }
              }
            }
            EOF
          - "sed -i \"/^DatabaseMirror .*$/c DatabaseMirror ${DATABASE_MIRROR}\" /etc/clamav/freshclam.conf"
          - "freshclam"
          - "mkdir /scan"
--- a/.opencode/openDesk-logo-rgb-color.svg
+++ b/.opencode/openDesk-logo-rgb-color.svg
@@ -1,28 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="Ebene_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 693.25 214.02">
  <defs>
    <style>
      .cls-1 {
        fill: #571efa;
      }
      .cls-2 {
        fill: #927afa;
      }
    </style>
  </defs>
  <g>
    <path class="cls-2" d="M126.14,140.32v2.13c0,8.99-7.31,16.3-16.3,16.3h-38.26c-8.99,0-16.3-7.31-16.3-16.3v-38.26c0-8.99,7.31-16.3,16.3-16.3h2.13v52.44h52.44Z"/>
    <path class="cls-1" d="M126.85,127.56h-40.39v-44.65c0-15.24,12.4-27.64,27.64-27.64h12.76c17.58,0,31.89,14.31,31.89,31.89v8.5c0,17.58-14.31,31.89-31.89,31.89ZM104.88,109.13h21.97c7.42,0,13.46-6.04,13.46-13.46v-8.5c0-7.42-6.04-13.46-13.46-13.46h-12.76c-5.08,0-9.21,4.13-9.21,9.21v26.22Z"/>
  </g>
  <g>
    <path d="M210.82,90.76c14.85,0,24.34,10.9,24.34,24.25s-9.49,24.25-24.34,24.25-24.44-10.9-24.44-24.25,9.49-24.25,24.44-24.25ZM210.82,133.34c11.37,0,17.39-8.46,17.39-18.33s-6.02-18.33-17.39-18.33-17.48,8.46-17.48,18.33,6.01,18.33,17.48,18.33Z"/>
    <path d="M244.19,91.7h6.96v11.84c3.29-7.8,10.25-12.78,20.4-12.78,13.07,0,21.9,9.87,21.9,24.34s-8.83,24.16-21.9,24.16c-10.34,0-17.2-5.17-20.4-12.78v28.95h-6.96v-63.73ZM269.38,133.34c9.4,0,17.11-5.83,17.11-18.24s-7.71-18.42-17.11-18.42-17.95,6.11-17.95,18.42,8.65,18.24,17.95,18.24Z"/>
    <path d="M322.96,90.76c13.35,0,22.28,8.37,22.28,22.65v2.82h-37.5c.28,9.78,5.26,17.29,15.6,17.29,8.55,0,13.54-4.51,15.23-11.47h6.86c-1.97,8.27-7.61,17.2-21.9,17.2-15.13,0-22.46-11.28-22.46-24.91,0-15.04,8.74-23.59,21.9-23.59ZM338.37,110.78c-.66-9.12-6.77-14.29-15.51-14.29-8.18,0-14.29,5.26-15.04,14.29h30.55Z"/>
    <path d="M355.01,91.7h6.96v12.97c2.54-8.65,9.12-13.91,19.36-13.91s16.73,6.77,16.73,18.99v28.57h-7.05v-28.01c0-9.68-3.76-13.63-12.03-13.63-10.53,0-17.01,8.84-17.01,21.34v20.3h-6.96v-46.62Z"/>
    <path d="M409.81,72.05h24.35c6.89,0,12.97.85,18.24,2.54,5.26,1.69,9.57,4.98,12.92,9.87,3.35,4.89,5.03,11.78,5.03,20.68s-1.68,15.89-5.03,20.77c-3.35,4.89-7.66,8.18-12.92,9.87-5.27,1.69-11.34,2.54-18.24,2.54h-24.35v-66.27ZM434.16,125.07c4.76,0,8.57-.38,11.42-1.13s5.17-2.55,6.96-5.41c1.79-2.85,2.68-7.32,2.68-13.39s-.91-10.46-2.72-13.35c-1.82-2.88-4.14-4.7-6.96-5.45s-6.61-1.13-11.37-1.13h-9.31v39.86h9.31Z"/>
    <path d="M480.17,101.33c2.1-3.67,5.01-6.47,8.74-8.41s8.01-2.91,12.83-2.91c7.9,0,14.07,2.1,18.52,6.3,4.45,4.2,6.67,10,6.67,17.39v3.95h-35.53c.25,3.38,1.32,6.03,3.2,7.94,1.88,1.91,4.45,2.87,7.71,2.87,2.82,0,5.15-.59,7-1.79,1.85-1.19,3.02-2.88,3.53-5.08h14.19c-.75,5.26-3.28,9.53-7.57,12.78-4.29,3.26-9.98,4.89-17.06,4.89-5.2,0-9.71-1.05-13.54-3.15-3.82-2.1-6.75-5.03-8.79-8.79-2.04-3.76-3.05-8.08-3.05-12.97s1.05-9.35,3.15-13.02ZM513.02,109.93c-.25-3.01-1.36-5.33-3.34-6.96-1.97-1.63-4.53-2.44-7.66-2.44s-5.56.82-7.47,2.44c-1.91,1.63-2.99,3.95-3.24,6.96h21.71Z"/>
    <path d="M539.62,134.65c-4.14-3.07-6.21-7.58-6.21-13.54h14.29c0,2.7.85,4.69,2.54,5.97,1.69,1.29,4.29,1.93,7.8,1.93,2.57,0,4.43-.33,5.59-.99,1.16-.66,1.74-1.71,1.74-3.15,0-1-.34-1.82-1.03-2.44-.69-.63-1.79-1.16-3.29-1.6l-14.48-3.95c-3.2-.81-5.95-2.27-8.27-4.37-2.32-2.1-3.48-5-3.48-8.7,0-4.45,1.83-7.86,5.5-10.25,3.67-2.38,8.79-3.57,15.37-3.57,7.27,0,12.94,1.46,17.01,4.37s6.11,7.13,6.11,12.64h-14.29c0-4.57-2.91-6.86-8.74-6.86-2.07,0-3.7.35-4.89,1.03-1.19.69-1.79,1.6-1.79,2.73,0,1.94,1.72,3.35,5.17,4.23l11.09,2.73c4.32,1.07,7.79,2.71,10.39,4.94,2.6,2.22,3.9,5.34,3.9,9.35,0,4.58-1.83,8.07-5.5,10.48-3.67,2.41-9.1,3.62-16.31,3.62-8.02,0-14.1-1.54-18.24-4.61Z"/>
    <path d="M587.56,69.23h14.29v40.04l18.89-18.33h17.48l-23.59,23.03,23.5,24.35h-17.39l-18.89-19.93v19.93h-14.29v-69.09Z"/>
  </g>
 </svg>
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,44 +1,3 @@
 ## [1.3.2](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.3.1...v1.3.2) (2025-05-06)
 ### Bug Fixes
 * **dovecot:** Update Helm chart to fix migration mode ([7ba84b9](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/7ba84b99caf61e5a4a35b71d875e9ede0f71423e))
 * **helmfile:** Explicitly template auth-modules in OX App Suite; Streamline name of OX App Suite EE image ([6cbb6b6](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/6cbb6b6922864467ca365bcc9b1cfa49182df050))
 ## [1.3.1](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.3.0...v1.3.1) (2025-04-24)
 ### Bug Fixes
 * **ci:** Update Helm to v3.17.3 ([9446faa](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/9446faaa597777e9fb15d33953e02fdbfef646b2))
 * **ci:** Update Helm to v3.17.3 ([d794a20](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/d794a2036ed6543bf89a0b661cc8a4c8a383a5f0))
 * **docs:** Update "Ingress controller" section and add footnote on volume provisioner in `requirements.md` ([17efbd7](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/17efbd79f177f635885735823696a6e50b919d3e))
 * **helmfile:** Conditional templating of additional annotations in selected components to unblock openDesk deployment despite a bug in Helm 3.17 (https://github.com/helm/helm/issues/30587) ([861b84b](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/861b84b14de9fb42c483f3ddb9e083305750d137))
 * **postfix:** Disable unauthenticated relaying of mails in `postfix-ox` ([7414f05](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/7414f05005e019f2121e8458fe63e795819fe92c))
 # [1.3.0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.2.1...v1.3.0) (2025-04-22)
 ### Bug Fixes
 * **helmfile:** Fix Kyverno lint issues for EE components ([46b3834](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/46b38342d3cb6789e1734cd6eba412bc726c834b))
 * **helmfile:** Remove no longer used `secrets.nubus.defaultAccounts.*` ([6e6d155](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/6e6d15552e87a77870755db3b48f2af686916c1f))
 * **helmfile:** Support for Keycloak session settings via `functional.authentication.realmSettings.*` ([3fcfa00](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/3fcfa00503854f752a3885321b16b3f3597cb09a))
 * **migrations:** Optional delete of `ums-minio-rewrites` Ingress, as it is non-existing in deployments with external object storage ([6932953](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/693295391bb02892b537a48513c9e0c2824ed466))
 * **ox-connector:** Update to v0.19.0 ([fe664a7](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/fe664a7f8d696fea53b6abadec5a0cb5db751f43))
 * **xwiki:** Update Helm chart to v1.4.4 to fix the problem with XWiki not starting when secrets contained specific (XML interpreted) characters ([67a1df0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/67a1df0f80dc598287174a8dd6bda3f477227f0d))
 ### Features
 * **collabora:** Update to 24.04.13 ([8f12208](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/8f12208074b2947ec65ebc3c21920d4f775e0c6e))
 * **helmfile:** Add template support for annotations ([9cde57d](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/9cde57d74b8cfdd09e4f6b82cf45f1b1a686e035))
 * **helmfile:** Support for SSO federation; see `ssoFederation` section in `functional.yaml.gotmpl` for details ([79975a5](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/79975a58e3a4f50e59d1d790045c22a32ab49372))
 * **nubus:** Show openDesk version to all users (instead of admin users only) ([393ee31](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/393ee311630630fd1aae8354ead90bcaaf5e4dba))
 * **nubus:** Update to 1.8.0 ([90c49f6](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/90c49f6f83df0b34b86c17164eaa4e137d0cd9be))
 * **openproject:** Update to 15.5.0 ([7f1cfc5](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/7f1cfc55551f608603e0401dfef24bbb9cc334e5))
 ## [1.2.1](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.2.0...v1.2.1) (2025-03-28)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,7 +9,7 @@ Please read the [project's entire CONTRIBUTING.md](https://gitlab.opencode.de/bm
 # How to contribute?
-Please also read the [project's workflow documentation](./docs/developer/workflow.md) for more details on standards like commit
+Please also read the [project's workflow documentation](./docs/workflow.md) for more details on standards like commit
 messages and branching convention.
 ## Helm vs. Operators vs. Manifests
--- a/README-EE.md
+++ b/README-EE.md
@@ -25,7 +25,7 @@ openDesk Enterprise Edition is recommended for production use. It receives suppo
 This document refers to the openDesk Community Edition as "oD CE" and the openDesk Enterprise Edition as "oD EE".
-Please contact [ZenDiS](mailto:opendesk@zendis.de) to get openDesk Enterprise, either as a SaaS offering or for your on-premises installation.
+Please contact [ZenDiS](mailto:opendesk@zendis.de) to get openDesk Enterprise, either as a SaaS offering or for you on-premise installation.
 # Enabling the Enterprise deployment
@@ -123,7 +123,7 @@ When a repository path starts with `/zendis`, the artifact is only available in
 - Collabora Online (COOL) container image: Is build from the same public source code as Collabora Development Edition (CODE), only the build configurations might differ. COOL includes a brand package that is not public and its license is not open source.
 - COOL Controller container image and Helm chart: Source code and chart are using Mozilla Public License Version 2.0, but the source code is not public. It is provided to customers upon request.
-openDesk updates Collabora once a COOL image based on the version pattern `<major>.<minor>.<patch>.3+.<build>` was made available. This happens usually at the same time the CODE image with `<major>.<minor>.<patch>.2+.<build>` is made available.
+openDesk updates Collabora once a COOL image based on the version pattern `<major>.<minor>.<patch>.3` is available, at the same time the CODE image will be updated to `<major>.<minor>.<patch>.2`.
 ### Element
--- a/README.md
+++ b/README.md
@@ -40,10 +40,10 @@ openDesk currently features the following functional main components:
 | File management      | Nextcloud                   | [30.0.6](https://nextcloud.com/de/changelog/#30-0-6)                                                                          | [Nextcloud 30](https://docs.nextcloud.com/)                                                                                           |
 | Groupware            | OX App Suite                | [8.35](https://documentation.open-xchange.com/appsuite/releases/8.35/)                                                        | Online documentation available from within the installed application; [Additional resources](https://documentation.open-xchange.com/) |
 | Knowledge management | XWiki                       | [16.10.5](https://www.xwiki.org/xwiki/bin/view/ReleaseNotes/Data/XWiki/16.10.5/)                                              | [For the most recent release](https://www.xwiki.org/xwiki/bin/view/Documentation)                                                     |
-| Portal & IAM         | Nubus                       | [1.9.1](https://docs.software-univention.de/nubus-kubernetes-release-notes/latest/en/changelog.html#version-1-9-1-2025-05-07) | [Univention's documentation website](https://docs.software-univention.de/n/en/nubus.html)                                             |
+| Portal & IAM         | Nubus                       | [1.7.0](https://docs.software-univention.de/nubus-kubernetes-release-notes/latest/en/changelog.html#version-1-7-0-2025-02-23) | [Univention's documentation website](https://docs.software-univention.de/n/en/nubus.html)                                             |
-| Project management   | OpenProject                 | [15.5.1](https://www.openproject.org/docs/release-notes/15-5-1/)                                                              | [For the most recent release](https://www.openproject.org/docs/user-guide/)                                                           |
+| Project management   | OpenProject                 | [15.4.2](https://www.openproject.org/docs/release-notes/15-4-2/)                                                              | [For the most recent release](https://www.openproject.org/docs/user-guide/)                                                           |
 | Videoconferencing    | Jitsi                       | [2.0.9955](https://github.com/jitsi/jitsi-meet/releases/tag/stable%2Fjitsi-meet_9955)                                         | [For the most recent  release](https://jitsi.github.io/handbook/docs/category/user-guide/)                                            |
-| Weboffice            | Collabora                   | [24.04.13](https://www.collaboraoffice.com/code-24-04-release-notes/)                                                         | Online documentation available from within the installed application; [Additional resources](https://sdk.collaboraonline.com/)        |
+| Weboffice            | Collabora                   | [24.04.12.4](https://www.collaboraoffice.com/code-24-04-release-notes/)                                                       | Online documentation available from within the installed application; [Additional resources](https://sdk.collaboraonline.com/)        |
 While not all components are perfectly designed for the execution inside containers, one of the project's objectives is to
 align the applications with best practices regarding container design and operations.
@@ -104,7 +104,7 @@ in the files from the release's git-tag:
 - `./helmfile/environments/default/images.yaml.gotmpl`
 - `./helmfile/environments/default/charts.yaml.gotmpl`
-Find more information in our [Workflow documentation](./docs/developer/workflow.md).
+Find more information in our [Workflow documentation](./docs/workflow.md).
 # Data Storage
@@ -123,7 +123,7 @@ If you want to address other topics, please check the section
 # Development
-If you want to join or contribute to the development of openDesk please read the [Development guide](./docs/developer/development.md).
+If you want to join or contribute to the development of openDesk please read the [Development guide](./docs/development.md).
 # License
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -23,11 +23,6 @@ path = "docs/architecture/apis_images/*"
 SPDX-FileCopyrightText = "2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH"
 SPDX-License-Identifier = "Apache-2.0"
 [[annotations]]
 path = ".opencode/openDesk-logo-rgb-color.svg"
 SPDX-FileCopyrightText = "2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH"
 SPDX-License-Identifier = "CC-BY-SA-4.0"
 [[annotations]]
 path = ".opencode/screenshots/*"
 SPDX-FileCopyrightText = "2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH"
--- a/docs/baseline-requirements.md
+++ b/docs/baseline-requirements.md
@@ -119,7 +119,7 @@ openDesk should be compliant with the "Deutsche Verwaltungscloud Strategie" (DVS
 ## IT-Grundschutz
-The IT-Grundschutz catalog knowns a lot of modules ("Bausteine"), but not all of them apply to all components, as there are some related to hardware or some just relevant for the operator while openDesk is "just" the software platform. The first step for an IT-Grundschutz evaluation of a component (or the platform as a whole) requires defining which modules are applicable. Other modules apply to all components e.g. [APP.4.4 Kubernetes](https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Grundschutz/IT-GS-Kompendium_Einzel_PDFs_2023/06_APP_Anwendungen/APP_4_4_Kubernetes_Edition_2023.pdf), [SYS.1.6 Containerisierung](https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Grundschutz/IT-GS-Kompendium_Einzel_PDFs_2023/07_SYS_IT_Systeme/SYS_1_6_Containerisierung_Edition_2023.pdf) and [CON.2 Datenschutz](https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Grundschutz/IT-GS-Kompendium_Einzel_PDFs_2023/03_CON_Konzepte_und_Vorgehensweisen/CON_2_Datenschutz_Edition_2023.pdf).
+The IT-Grundschutz catalog knowns a lot of modules ("Bausteine"), but not all of them apply to all components, as there are some related to hardware or some just relevant for the operator while openDesk is "just" the software platform. The first step for an IT-Grundschutz evaluation of a component (or the platform as a whole) requires defining which modules are applicable. Other modules apply to all components e.g. [APP.4.4 Kubernetes](https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Grundschutz/IT-GS-Kompendium_Einzel_PDFs_2023/06_APP_Anwendungen/APP_4_4_Kubernetes_Edition_2023.pdf), [SYS.1.6 Containerisierung](https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Grundschutz/IT-GS-Kompendium_Einzel_PDFs_2023/07_SYS_IT_Systeme/SYS_1_6_Containerisierung_Edition_2023.pdf) and [CON 2 Datenschutz](https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Grundschutz/IT-GS-Kompendium_Einzel_PDFs_2023/03_CON_Konzepte_und_Vorgehensweisen/CON_2_Datenschutz_Edition_2023.pdf).
 Within each module are multiple requirements ("Anforderungen") that are usually composed of multiple partial requirements ("Teilanforderungen"). Each requirement has a given category:
 - B for basic ("Basis") - the requirement must be fulfilled.
@@ -133,7 +133,7 @@ Different requirements address different roles in IT-Grundschutz.
 - Operator: processes & product (service)
 - Customer: processes.
-As a supplier of an openDesk component, you will focus on the "Supplier" requirements, while the outcome (your product) must enable the Provider to fulfill the requirements that lay with its responsibility for the openDesk platform. Operators use openDesk to provide a service, therefore the openDesk platform must enable an Operator to fulfill the related requirements. Finally, the service must enable the customer to align with the scope of the IT-Grundschutz catalog. So it will happen that a requirement from e.g. the customer level needs a specific capability by the product (Supplier's responsibility), a defined core configuration from the platform (Provider's responsibility), or a certain service setup from the Operator.
+As a supplier of an openDesk component, you will focus on the "Supplier" requirements, while the outcome (your product) must enable the Provider to fulfill the requirements that lay with its responsibility for the openDesk platform. Operators use openDesk to provide a service, therefore the openDesk platform must enable an Operator to fulfill the related requirements. Finally, the service must enable the customer to align with the scope of the IT Grundschutz catalog. So it will happen that a requirement from e.g. the customer level needs a specific capability by the product (Supplier's responsibility), a defined core configuration from the platform (Provider's responsibility), or a certain service setup from the Operator.
 We are aware that IT-Grundschutz is a complex topic and are working towards a streamlined process to reduce overhead as much as possible and ensure to maximize the use of synergies.
@@ -167,7 +167,7 @@ Each component must be able to operate according to the [EU's General Data Prote
 While this can be answered by each component that will be in the spotlight for the suppliers, we also need an aligned overall picture for openDesk that at least has the platform-specific user lifecycle and cross-application interfaces in focus.
-Note: The topics of availability, integrity, and confidentiality of personal data are also being addressed by the IT-Grundschutz module "CON.2". It has to be ensured that it is not in contradiction to what is being done in the general area of data protection.
+Note: The topics of availability, integrity, and confidentiality of personal data are also being addressed by the IT-Grundschutz module "CON 2". It has to be ensured that it is not in contradiction to what is being done in the general area of data protection.
 **Reference:** https://gitlab.opencode.de/bmi/opendesk/documentation/datenschutz
@@ -185,8 +185,7 @@ With a central Identity- and Access Management (IAM) also the user lifecycle (UL
 The focus is to have all the account information in all applications including the account's state, profile picture ([reference](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/issues/27)) and - where required - the user's group memberships. This cannot be done purely by pushing that data through OIDC claims when a user logs in to an application therefore two ways of managing an account are applicable and described in the following subchapters.
-> **Note**<br>
+Note: Allowing ad hoc updates of account data through OIDC claims during login is still encouraged.
 > Allowing ad hoc updates of account data through OIDC claims during login is still encouraged.
 ### Pull: LDAP
--- a/docs/developer/ci.md
+++ b/docs/developer/ci.md
--- a/docs/developer/development.md
+++ b/docs/developer/development.md
@@ -60,7 +60,7 @@ Before you investigate any app-specific configuration, it is recommended that yo
 The `main` branch is configured to be the default branch, as visitors to the project on openCode should see that
 branch by default.
-Please use the `develop` branch to diverge your branch(es) from. See the [workflow guide](./docs/developer/workflow.md)
+Please use the `develop` branch to diverge your branch(es) from. See the [workflow guide](./docs/workflow.md)
 for more details on naming conventions.
 # External artifacts - `charts.yaml.gotmpl` and `images.yaml.gotmpl`
@@ -159,3 +159,4 @@ for Helm charts.
 You may also want to make use of our [standard CI](https://gitlab.opencode.de/bmi/opendesk/tooling/gitlab-config) to
 quickly get Helm charts and container images that are signed, linted, scanned, and released.
 Check out the `.gitlab-ci.yaml` files in the project's [Charts](https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts) or [Images](https://gitlab.opencode.de/bmi/opendesk/components/platform-development/images) to get an idea just how little you need to do by yourself.
 components
--- a/docs/enhanced-configuration/groupware-migration.md
+++ b/docs/enhanced-configuration/groupware-migration.md
@@ -17,8 +17,6 @@ SPDX-License-Identifier: Apache-2.0
    * [Add multiple user accounts via CSV file](#add-multiple-user-accounts-via-csv-file)
  * [Start the migration](#start-the-migration)
  * [Monitor migration status](#monitor-migration-status)
 * [Appendix](#appendix)
  * [Validating master authentication](#validating-master-authentication)
 <!-- TOC -->
 Most organizations already have email accounts on various platforms that need to be migrated to openDesk. This document describes the migration from M365 accounts to openDesk using the [audriga Migration Service](https://www.audriga.com) in combination with the master authentication option in openDesk. Other source platforms are also supported, and their migrations work in a similar manner.
@@ -72,7 +70,7 @@ In openDesk, you have to have all user accounts with mailboxes pre-defined befor
 ## Deploy openDesk with master authentication
-With openDesk 1.0 Enterprise, you can set openDesk's email components (OX AppSuite and OX Dovecot) to master authentication mode to run the migration as described in this document using the following two settings for your deployment. This is NOT available in openDesk Community deployments:
+With openDesk 1.0 Enterprise, you can set openDesk's email components (OX AppSuite and OX Dovecot) to master authentication mode to run the migration as described in this document using the following two settings for your deployment:
 ```
 secrets:
@@ -87,12 +85,10 @@ functional:
 1. You must specify a master password, it will be referenced later in this document.
 2. You need to enable the actual master authentication mode.
 To validate the master authentication mode please read the appendix section at the end of the document.
 Updating your deployment with these settings will allow you to continue with the migration scenario. Once the migration is completed, you can remove `secrets.oxAppSuite.adminPassword` and need to turn off the migration mode by setting `functional.migration.oxAppSuite.enabled` to `false` or removing that setting, as `false` is the default before you update your deployment once again.
 > **Note**<br>
-> For the changes to take effect, it is sufficient to re-deploy the `open-xchange` component alone. But you have to restart the Dovecot Pod(s) manually when switching to/from the master authentication mode for the changes to take effect.
+> For the changes to take effect, it is sufficient to re-deploy the `open-xchange` component alone.
 > **Note**<br>
 > While in master authentication mode, regular users cannot log in to the webmail module of openDesk or access the mail using IMAP, as it is not recommended that users interact with the target mail infrastructure during the migration scenario described in this document.
@@ -186,39 +182,3 @@ Click on "Details" to get further information about the migration.
 You can access a detailed log for each account by clicking "Protocol" on the right-hand side. Here, you can see detected duplicates or encountered errors (e.g., if emails cannot be transferred due to your provider's size limitations).
 You will receive status emails for the migration job's submission and start, as well as when the migration job is finished. The emails are sent to the email address you have entered during the configuration. Those emails include a link to the status website so you can easily track and monitor your migration. Once the migration has been started, you can safely close the status website and shut down your computer; the migration will continue. You can re-open the status website anytime.
 # Appendix
 ## Validating master authentication
 Below are details in case you want to verify master authentication for Dovecot and OX AppSuite.
 Set a few variables first:
 ```shell
 export MIG_DOMAIN=your-opendesk-domain.tld
 export MIG_WEBMAIL_HOST=webmail
 export MIG_USERNAME=eva
 export MIG_MASTER_PASSWORD=YourMasterPassword
 export MIG_IMAP_PORT=31123
 ```
 Ensure that you have defined a (your) default context for the migration where the account (in this example `eva`) can be found. The following should be executed in OX App Suite's `open-xchange-core-mw-default-0` container, in the example we set the default context to `1`:
 ```shell
 /opt/open-xchange/sbin/changecontext -c 1 -L defaultcontext -A $MASTER_ADMIN_USER -P $MASTER_ADMIN_PW
 ```
 With the preparation from above you should be able to successfully authenticate to both components:
 **OX App Suite**
 ```shell
 curl -X POST -d "name=${MIG_USERNAME}&password=${MIG_MASTER_PASSWORD}" "https://${MIG_WEBMAIL_HOST}.${MIG_DOMAIN}/appsuite/api/login?action=login"
 ```
 **Dovecot**
 ```shell
 echo "a001 LOGIN ${MIG_USERNAME} ${MIG_MASTER_PASSWORD}" | openssl s_client -ign_eof -connect ${MIG_DOMAIN}:${MIG_IMAP_PORT}
 ```
--- a/docs/enhanced-configuration/idp-federation.md
+++ b/docs/enhanced-configuration/idp-federation.md
@@ -82,8 +82,8 @@ The following values are used in this example documentation. Please ensure when
 - `id.opendesk.tld`: hostname for the openDesk IdP, so openDesk is deployed at `opendesk.tld`.
 - `fed-test-idp-realm`: realm name for your organization's IdP.
 - `opendesk-federation-client`: OIDC client for the openDesk federation defined in your organization's IdP.
- `sso-federation-idp`: Identifier of your organization IdP's configuration within the openDesk Keycloak.
+- `auto-federate-idp`: Identifier of your organization IdP's configuration within the openDesk Keycloak.
- `sso-federation-flow`: Identifier of the required additional login flow to be created and referenced in the openDesk Keycloak.
+- `auto-federate-flow`: Identifier of the required additional login flow to be created and referenced in the openDesk Keycloak.
 ## Keycloak admin console access
@@ -125,7 +125,7 @@ If you just created the `fed-test-idp-realm`, you are already in the admin scree
      - `Standard flow`
      - `Direct access grants`
  - Client create wizard page 3:
-    - *Valid Redirect URLs*: `https://id.opendesk.tld/realms/opendesk/broker/sso-federation-idp/endpoint`
+    - *Valid Redirect URLs*: `https://id.opendesk.tld/realms/opendesk/broker/auto-federate-idp/endpoint`
  - When completed with *Save*, you get to the detailed client configuration that also needs some updates:
    - Tab *Settings* > Section *Logout settings*
      - *Front channel logout*: `Off`
@@ -135,21 +135,17 @@ If you just created the `fed-test-idp-realm`, you are already in the admin scree
 ## openDesk IdP
 > **Note**
 > While manual configuration is possible, an SSO federation can also be configured as part of the deployment.
 > Check `functional.authentication.ssoFederation` section from the `functional.yaml.gotmpl` for details.
 The following configuration is taking place in the Keycloak realm `opendesk`.
 - *Authentication* > *Create flow*
-  - *Name*: `sso-federation-flow`
+  - *Name*: `auto-federate-flow`
  - *Flow type*: `Basic flow`
  - *Create*
  - *Add execution*: Add `Detect existing broker user` and set it to `Required`
  - *Add step*: `Automatically set existing user` and set it to `Required`
 - *Identity providers* > *User-defined* > *OpenID Connect 1.0*
-  - *Alias*: `sso-federation-idp` (used in our example)
+  - *Alias*: `auto-federate-idp` (used in our example)
  - *Display Name*: A descriptive Name, in case you do not forcefully redirect the user to the IdP, that name is shown on the login screen for manual selection.
  - *Use discovery endpoint*: `On` (default)
  - *Discovery endpoint*: `https://idp.organization.tld/realms/fed-test-idp-realm/.well-known/openid-configuration` - this URL may look different if you do not use Keycloak or a different Keycloak version as IdP in your organization
@@ -159,11 +155,11 @@ The following configuration is taking place in the Keycloak realm `opendesk`.
  - *Client ID*: Use the client ID you took from your organization's IdP config (`opendesk-federation-client` in this example)
  - *Client Secret*: Use the secret you took from your organization's IdP config
  - When completed with *Add*, you get to the detailed IdP configuration which at least needs the following update:
-    - *First login flow override*: `sso-federation-flow`
+    - *First login flow override*: `auto-federate-flow`
    - Depending on your organizations IdP and process preferences, additional configuration may be required
 - In case you want to forcefully redirect all users to your organization's IdP (disabling login with local openDesk accounts):
  - *Authentication* > `2fa-browser`
    - Click on the cogwheel next to the *Identity Provider Re-director*
-      - *Alias*: `sso-federation-idp`
+      - *Alias*: `auto-federate-idp`
-      - *Default Identity Provider*: `sso-federation-idp`
+      - *Default Identity Provider*: `auto-federate-idp`
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -73,7 +73,7 @@ For your convenience, we recommend creating a `*.domain.tld` A-Record for your c
 ## Domain
-A list of all subdomains can be found in `helmfile/environments/default/global.yaml.gotmpl`.
+A list of all subdomains can be found in `helmfile/environments/default/global.gotmpl`.
 All subdomains can be customized. For example, _Nextcloud_ can be changed to `files.domain.tld` in `dev` environment:
@@ -99,7 +99,7 @@ export DOMAIN=domain.tld
 ### Apps
 Depending on your ideal openDesk deployment, you may wish to disable or enable certain apps.
-All available apps and their default values are located in `helmfile/environments/default/opendesk_main.yaml.gotmpl`.
+All available apps and their default values are located in `helmfile/environments/default/opendesk_main.gotmpl`.
 | Component            | Name                        | Default | Description                    |
 | -------------------- | --------------------------- | ------- | ------------------------------ |
@@ -182,7 +182,7 @@ global:
 Some apps, like Jitsi and Dovecot, require HTTP and external TCP connections.
 These apps create a Kubernetes service object.
-You can configure whether `NodePort` (for on-premises), `LoadBalancer` (for cloud), or `ClusterIP` (to disable) should be
+You can configure whether `NodePort` (for on-premise), `LoadBalancer` (for cloud), or `ClusterIP` (to disable) should be
 used:
 ```yaml
@@ -231,7 +231,7 @@ ingress:
 ```
 Currently, the only supported ingress controller is `ingress-nginx` (see
-[requirements.md](./docs/requirements.md) for reference).
+[requirements.md](./docs/requirements.md)) for reference).
 ### Container runtime
@@ -272,8 +272,7 @@ While openDesk configures the applications with meaningful defaults, you can che
 ### Ports
-> **Note**<br>
+**Note:** If you use `NodePort` for service exposure, you must check your deployment for the actual ports and ensure they are opened where necessary.
 > If you use `NodePort` for service exposure, you must check your deployment for the actual ports and ensure they are opened where necessary.
 #### Web-based user interface
--- a/docs/migrations.md
+++ b/docs/migrations.md
@@ -1,5 +1,5 @@
 <!--
-SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
 SPDX-License-Identifier: Apache-2.0
 -->
@@ -9,22 +9,18 @@ SPDX-License-Identifier: Apache-2.0
 * [Disclaimer](#disclaimer)
 * [Automated migrations - Overview and mandatory upgrade path](#automated-migrations---overview-and-mandatory-upgrade-path)
 * [Manual checks/actions](#manual-checksactions)
-  * [v1.4.0+](#v140)
+  * [From v1.1.2](#from-v112)
    * [Pre-upgrade to v1.4.0+](#pre-upgrade-to-v140)
      * [Helmfile cleanup: `global.additionalMailDomains` as list](#helmfile-cleanup-globaladditionalmaildomains-as-list)
  * [v1.2.0+](#v120)
    * [Pre-upgrade to v1.2.0+](#pre-upgrade-to-v120)
      * [Helmfile cleanup: Do not configure OX provisioning when no OX installed](#helmfile-cleanup-do-not-configure-ox-provisioning-when-no-ox-installed)
      * [Helmfile new default: PostgreSQL for XWiki and Nextcloud](#helmfile-new-default-postgresql-for-xwiki-and-nextcloud)
-  * [v1.1.2+](#v112)
+  * [From v1.1.1](#from-v111)
-    * [Pre-upgrade to v1.1.2+](#pre-upgrade-to-v112)
+    * [Pre-upgrade from v1.1.1](#pre-upgrade-from-v111)
      * [Helmfile feature update: App settings wrapped in `apps.` element](#helmfile-feature-update-app-settings-wrapped-in-apps-element)
-  * [v1.1.1+](#v111)
+  * [From v1.1.0](#from-v110)
-    * [Pre-upgrade to v1.1.1](#pre-upgrade-to-v111)
+    * [Pre-upgrade from v1.1.0](#pre-upgrade-from-v110)
      * [Helmfile feature update: Component specific `storageClassName`](#helmfile-feature-update-component-specific-storageclassname)
      * [Helmfile new secret: `secrets.nubus.masterpassword`](#helmfile-new-secret-secretsnubusmasterpassword)
-  * [v1.1.0+](#v110)
+  * [From v1.0.0](#from-v100)
-    * [Pre-upgrade to v1.1.0](#pre-upgrade-to-v110)
+    * [Pre-upgrade from v1.0.0](#pre-upgrade-from-v100)
      * [Helmfile cleanup: Restructured `/helmfile/files/theme` folder](#helmfile-cleanup-restructured-helmfilefilestheme-folder)
      * [Helmfile cleanup: Consistent use of `*.yaml.gotmpl`](#helmfile-cleanup-consistent-use-of-yamlgotmpl)
      * [Helmfile cleanup: Prefixing certain app directories with `opendesk-`](#helmfile-cleanup-prefixing-certain-app-directories-with-opendesk-)
@@ -34,10 +30,10 @@ SPDX-License-Identifier: Apache-2.0
      * [openDesk defaults (new): Enforce login](#opendesk-defaults-new-enforce-login)
      * [openDesk defaults (changed): Jitsi room history enabled](#opendesk-defaults-changed-jitsi-room-history-enabled)
      * [External requirements: Redis 7.4](#external-requirements-redis-74)
-    * [Post-upgrade to v1.1.0+](#post-upgrade-to-v110)
+    * [Post-upgrade from v1.0.0](#post-upgrade-from-v100)
      * [XWiki fix-ups](#xwiki-fix-ups)
-  * [v1.1.0](#v110-1)
+  * [From v0.9.0](#from-v090)
-    * [Pre-upgrade to v1.1.0](#pre-upgrade-to-v110-1)
+    * [Pre-upgrade from v0.9.0](#pre-upgrade-from-v090)
      * [Configuration Cleanup: Removal of unnecessary OX-Profiles in Nubus](#configuration-cleanup-removal-of-unnecessary-ox-profiles-in-nubus)
      * [Configuration Cleanup: Updated `global.imagePullSecrets`](#configuration-cleanup-updated-globalimagepullsecrets)
      * [Changed openDesk defaults: Matrix presence status disabled](#changed-opendesk-defaults-matrix-presence-status-disabled)
@@ -45,20 +41,20 @@ SPDX-License-Identifier: Apache-2.0
      * [Changed openDesk defaults: File-share configurability](#changed-opendesk-defaults-file-share-configurability)
      * [Changed openDesk defaults: Updated default subdomains in `global.hosts`](#changed-opendesk-defaults-updated-default-subdomains-in-globalhosts)
      * [Changed openDesk defaults: Dedicated group for access to the UDM REST API](#changed-opendesk-defaults-dedicated-group-for-access-to-the-udm-rest-api)
-    * [Post-upgrade to v1.0.0+](#post-upgrade-to-v100)
+    * [Post-upgrade from v0.9.0](#post-upgrade-from-v090)
      * [Configuration Improvement: Separate user permission for using Video Conference component](#configuration-improvement-separate-user-permission-for-using-video-conference-component)
      * [Optional Cleanup](#optional-cleanup)
-  * [v0.9.0](#v090)
+  * [From v0.8.1](#from-v081)
-    * [Pre-upgrade to v0.9.0](#pre-upgrade-to-v090)
+    * [Pre-upgrade from v0.8.1](#pre-upgrade-from-v081)
      * [Updated `cluster.networking.cidr`](#updated-clusternetworkingcidr)
      * [Updated customizable template attributes](#updated-customizable-template-attributes)
      * [`migrations` S3 bucket](#migrations-s3-bucket)
 * [Automated migrations - Details](#automated-migrations---details)
-  * [v1.2.0+ (automated)](#v120-automated)
+  * [From v1.1.2 (automated)](#from-v112-automated)
    * [migrations-pre](#migrations-pre)
    * [migrations-post](#migrations-post)
-  * [v1.1.0+ (automated)](#v110-automated)
+  * [From v1.0.0 (automated)](#from-v100-automated)
-  * [v1.0.0+ (automated)](#v100-automated)
+  * [From v0.9.0 (automated)](#from-v090-automated)
  * [Related components and artifacts](#related-components-and-artifacts)
  * [Development](#development)
 <!-- TOC -->
@@ -87,7 +83,7 @@ To upgrade existing deployments, you cannot skip any version mentioned in the co
 | Mandatory version |
 | ----------------- |
-<!--| v1.2+             | add the entry to the table as soon as we get new migration requiring the set version (range) to be deployed first -->
+| v1.2.x            |
 | v1.1.x            |
 | v1.0.0            |
 | v0.9.0            |
@@ -100,35 +96,9 @@ If you would like more details about the automated migrations, please read secti
 # Manual checks/actions
-## v1.4.0+
+Be sure you check all the sections for the releases you are going to update your current deployment from.
-### Pre-upgrade to v1.4.0+
+## From v1.1.2
 #### Helmfile cleanup: `global.additionalMailDomains` as list
 **Target group:** Installations that have set `global.additionalMailDomains`.
 The `additionalMailDomains` had to be defined as a comma separated string. That now needs to change into a list of domains.
 For example the following config:
 ```yaml
 global:
  additionalMailDomains: "sub1.maildomain.de,sub2.maildomain.de"
 ```
 Needs to change to:
 ```yaml
 global:
  additionalMailDomains:
    - "sub1.maildomain.de"
    - "sub2.maildomain.de"
 ```
 ## v1.2.0+
 ### Pre-upgrade to v1.2.0+
 #### Helmfile cleanup: Do not configure OX provisioning when no OX installed
@@ -138,7 +108,7 @@ With openDesk 1.2.0 the OX provisioning consumer will not be registered when the
 We do not remove the consumer for existing installations, if you want to do that for your existing installation please perform the following steps:
-```shell
+```
 export NAMESPACE=<your_namespace>
 kubectl -n ${NAMESPACE} exec -it ums-provisioning-nats-0 -c nats-box -- sh -c 'nats consumer rm stream:ox-connector durable_name:ox-connector --user=admin --password=${NATS_PASSWORD} --force'
 kubectl -n ${NAMESPACE} exec -it ums-provisioning-nats-0 -c nats-box -- sh -c 'nats stream rm stream:ox-connector --user=admin --password=${NATS_PASSWORD} --force'
@@ -189,9 +159,9 @@ In case you are planning to migrate an existing instance from MariaDB to Postgre
  - https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/Backup#HUsingtheXWikiExportfeature
  - https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/ImportExport
-## v1.1.2+
+## From v1.1.1
-### Pre-upgrade to v1.1.2+
+### Pre-upgrade from v1.1.1
 #### Helmfile feature update: App settings wrapped in `apps.` element
@@ -203,7 +173,7 @@ If you have a deployment where you specify settings found in the aforementioned
 The following configuration:
-```yaml
+```
 certificates:
  enabled: false
 notes:
@@ -212,7 +182,7 @@ notes:
 Needs to be changed to:
-```yaml
+```
 apps:
  certificates:
    enabled: false
@@ -220,9 +190,9 @@ apps:
    enabled: true
 ```
-## v1.1.1+
+## From v1.1.0
-### Pre-upgrade to v1.1.1
+### Pre-upgrade from v1.1.0
 #### Helmfile feature update: Component specific `storageClassName`
@@ -275,9 +245,9 @@ persistence:
 A not yet templated secret was discovered in the Nubus deployment. It is now declared in [`secrets.yaml.gotmpl`](../helmfile/environments/default/theme.yaml.gotmpl) and can be defined using: `secrets.nubus.masterpassword`. If you define your own secrets, please be sure this new secret is set to the same value as the `MASTER_PASSWORD` environment variable used in your deployment.
-## v1.1.0+
+## From v1.0.0
-### Pre-upgrade to v1.1.0
+### Pre-upgrade from v1.0.0
 #### Helmfile cleanup: Restructured `/helmfile/files/theme` folder
@@ -440,7 +410,7 @@ The update from openDesk v1.0.0 contains Redis 7.4.1, like the other openDesk bu
 Please ensure the Redis you are using is updated to at least version 7.4 to support the requirement of OX App Suite.
-### Post-upgrade to v1.1.0+
+### Post-upgrade from v1.0.0
 #### XWiki fix-ups
@@ -466,9 +436,9 @@ Unfortunately XWiki does not upgrade itself as expected. The bug has been report
 You should have now a fully functional XWiki instance with single sign-on and full-text search.
-## v1.1.0
+## From v0.9.0
-### Pre-upgrade to v1.1.0
+### Pre-upgrade from v0.9.0
 #### Configuration Cleanup: Removal of unnecessary OX-Profiles in Nubus
@@ -650,7 +620,7 @@ The IAM admin account `Administrator` is the only member of this group by defaul
 If you need other accounts to use the API, please assign them to the aforementioned group.
-### Post-upgrade to v1.0.0+
+### Post-upgrade from v0.9.0
 #### Configuration Improvement: Separate user permission for using Video Conference component
@@ -680,9 +650,9 @@ kubectl -n ${NAMESPACE} delete pvc shared-run-ums-ldap-server-0
 kubectl -n ${NAMESPACE} delete pvc ox-connector-ox-contexts-ox-connector-0
 ```
-## v0.9.0
+## From v0.8.1
-### Pre-upgrade to v0.9.0
+### Pre-upgrade from v0.8.1
 #### Updated `cluster.networking.cidr`
@@ -705,7 +675,7 @@ kubectl -n ${NAMESPACE} delete pvc ox-connector-ox-contexts-ox-connector-0
 # Automated migrations - Details
-## v1.2.0+ (automated)
+## From v1.1.2 (automated)
 > **Note**<br>
 > Details can be found in [run_4.py](https://gitlab.opencode.de/bmi/opendesk/components/platform-development/images/opendesk-migrations/-/blob/main/odmigs-python/odmigs_runs/run_4.py).
@@ -719,7 +689,7 @@ kubectl -n ${NAMESPACE} delete pvc ox-connector-ox-contexts-ox-connector-0
 - Restarting Deployment `ums-provisioning-udm-transformer` and StatefulSet `ums-provisioning-udm-listener` as well as deleting the Nubus Provisioning consumer `durable_name:incoming` on stream `stream:incoming`: Due to a bug in Nubus 1.7.0 the `incoming` stream was blocked after the upgrade, the aforementioned measures unblock the stream.
-## v1.1.0+ (automated)
+## From v1.0.0 (automated)
 With openDesk v1.1.0 the IAM stack supports HA LDAP primary as well as scalable LDAP secondary pods.
@@ -730,7 +700,7 @@ creating the config map with the mentioned label.
 > **Note**<br>
 > Details can be found in [run_3.py](https://gitlab.opencode.de/bmi/opendesk/components/platform-development/images/opendesk-migrations/-/blob/main/odmigs-python/odmigs_runs/run_3.py).
-## v1.0.0+ (automated)
+## From v0.9.0 (automated)
 The `migrations-pre` and `migrations-post` jobs in the openDesk deployment address the automated migration tasks.
--- a/docs/requirements.md
+++ b/docs/requirements.md
@@ -1,5 +1,4 @@
 <!--
 SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
 SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
 SPDX-License-Identifier: Apache-2.0
 -->
@@ -13,8 +12,6 @@ This section covers the internal system requirements and external service requir
 * [Hardware](#hardware)
 * [Kubernetes](#kubernetes)
 * [Ingress controller](#ingress-controller)
  * [Supported controllers](#supported-controllers)
  * [Minimal configuration](#minimal-configuration)
 * [Volume provisioner](#volume-provisioner)
 * [Certificate management](#certificate-management)
 * [External services](#external-services)
@@ -28,13 +25,15 @@ openDesk is a Kubernetes-only solution and requires an existing Kubernetes (K8s)
 - K8s cluster >= v1.24, [CNCF Certified Kubernetes distribution](https://www.cncf.io/certification/software-conformance/)
 - Domain and DNS Service
- Ingress controller (Ingress NGINX) >= [4.11.5/1.11.5](https://github.com/kubernetes/ingress-nginx/releases)
+- Ingress controller (Ingress NGINX) >= [4.11.5/1.11.5](https://github.com/kubernetes/ingress-nginx/releases) - tested with v1.11.1 up to v1.11.5
  - **Important Note**: We are working on support for more recent versions, but please ensure to use at least 1.11.5 due to ["security issues"](https://www.wiz.io/blog/ingress-nginx-kubernetes-vulnerabilities) in earlier versions.
  - Ingress-NGINX introduced new security defaults in version 1.12.0, which are currently not compatible with openDesk. While we are working to adhere to these defaults, you can find additional information below on how to configure Ingress-NGINX >= 1.12.0 to be compatible with openDesk.
 - [Helm](https://helm.sh/) >= v3.9.0
- [Helmfile](https://helmfile.readthedocs.io/en/latest/) >= v1.0.0-rc8
+- [Helmfile](https://helmfile.readthedocs.io/en/latest/) >= **v1.0.0-rc8**
 - [HelmDiff](https://github.com/databus23/helm-diff) >= v3.6.0
- Volume provisioner supporting RWO (read-write-once)[^1]
+- Volume provisioner supporting RWO (read-write-once)
 - Certificate handling with [cert-manager](https://cert-manager.io/)
- [OpenKruise](https://openkruise.io/)[^2] >= v1.6
+- [OpenKruise](https://openkruise.io/)[^1] >= v1.6
 # Hardware
@@ -61,33 +60,21 @@ The deployment is tested against [kubespray](https://github.com/kubernetes-sigs/
 The deployment is intended to be used only over HTTPS via a configured FQDN, therefore it is required to have a properly
 configured ingress controller deployed in your cluster.
-## Supported controllers
+**Supported controllers:**
 - [Ingress NGINX Controller](https://github.com/kubernetes/ingress-nginx)
 > **Note**<br>
 > The platform development team is evaluating the use of [Gateway API](https://gateway-api.sigs.k8s.io/).
 **Compatibility with Ingress NGINX >= 1.12.0**
-With the release 1.12.0 Ingress NGINX introduced new security default settings, which are incompatible with current openDesk releases. If you want to use Ingress-NGINX >= 1.12.0 the following settings have to be set:
+With the release 1.12.0 Ingress NGINX introduced new security default settings, which are incompatible with current openDesk releases. If you want to use Ingress-NGINX >= 1.12.0 the following settings have to be set
-```
+- The annotation risk level has to be set to `critical`. See the [documentation](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/#annotations-risk-level) for details.
-controller.config.annotations-risk-level=Critical
+- Strict path type validation has to be disabled. See the [documentation](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/#strict-validate-path-type) for details.
 controller.config.strict-validate-path-type=false
 ```
 See the [`annotations-risk-level` documentation](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/#annotations-risk-level) and [`strict-validate-path-type` documentation](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/#strict-validate-path-type) for details.
 > **Important Note**<br>
-> Ensure to install at least Ingress NGINX 1.11.5 or 1.12.1 due to [security issues](https://www.wiz.io/blog/ingress-nginx-kubernetes-vulnerabilities) in earlier versions.
+> Ensure to install at least Ingress NGINX 1.12.1 due to ["security issues"](https://www.wiz.io/blog/ingress-nginx-kubernetes-vulnerabilities) in 1.12.0.
 ## Minimal configuration
-Several components in openDesk make use of snippet annotations, which are disabled by default. Please enable them using the following configuration:
+> **Note**<br>
-```
+> The platform development team is evaluating the use of [Gateway API](https://gateway-api.sigs.k8s.io/). If you can provide input on that topic, please get in contact with us.
 controller.allowSnippetAnnotations=true
 controller.admissionWebhooks.allowSnippetAnnotations=true
 ```
 See the [`allowSnippetAnnotations` documentation](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/#allow-snippet-annotations) for context.
 # Volume provisioner
@@ -115,7 +102,7 @@ deployments, you need to make use of your own production-grade services; see the
 |----------|---------------------|---------|-----------------------|
 | Cache    | Memcached           | `1.6.x` | Memcached             |
 |          | Redis               | `7.x.x` | Redis                 |
-| Database | Cassandra[^2]       | `5.0.x` | Cassandra             |
+| Database | Cassandra[^1]       | `5.0.x` | Cassandra             |
 |          | MariaDB             | `10.x`  | MariaDB               |
 |          | PostgreSQL          | `15.x`  | PostgreSQL            |
 | Mail     | Mail Transfer Agent |         | Postfix               |
@@ -135,6 +122,4 @@ Helmfile requires [HelmDiff](https://github.com/databus23/helm-diff) to compare
 # Footnotes
-[^1]: Due to [restrictions on Kubernetes `emptyDir`](https://github.com/kubernetes/kubernetes/pull/130277) you need a volume provisioner that has sticky bit support, otherwise the OpenProject seeder job will fail.
+[^1]: Required for Dovecot Pro as part of openDesk Enterprise Edition.
 [^2]: Required for Dovecot Pro as part of openDesk Enterprise Edition.
--- a/docs/scaling.md
+++ b/docs/scaling.md
@@ -1,39 +1,23 @@
 <!--
 SPDX-FileCopyrightText: 2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
 SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
 SPDX-License-Identifier: Apache-2.0
 -->
 <h1>Scaling</h1>
-This document covers the possibilities to scale the applications in openDesk.
+This document covers the possibilities to scale applications.
-It provides rough benchmarks for configuring your own environment across various scale levels.
+# Horizontal scalability
 In production, resource demands are primarily driven by actual usage patterns and system load, especially the number of concurrently active users.
 Consequently, we strongly recommend implementing monitoring and logging solutions to detect usage trends and enable timely intervention when needed.
-| Application  | Recommendation | Note(s) |
+We are working on generating this document automatically based on the file
-| ------------ | -------------- | ------- |
+[`replicas.yaml.gotmpl`](../helmfile/environments/default/replicas.yaml.gotmpl) that contains necessary annotations.
-| Collabora    | - 1 vCPU per 15 active users <br/> - 50 MB RAM per active user <br/> - 1 MBit/s per 10 active users | - |
+In the meantime, this file can be used to check the components scaling support/capabilities.
 | Element      | Per 10k users with values for federation activated / federation deactivated:<br/><br/> Homeserver:<br/> - 15 / 10 vCPU<br/> - 12 / 8 GB RAM<br/><br/>Postgres:<br/> - 10 / 4 vCPU<br/> - 32 / 16 GB RAM | Required hardware resources are impacted by whether or not federation is being used |
 | Cryptpad     | No large-scale deployments seen, minimum requirements: <br/> - 2 vCPU <br/> - 2 GB RAM <br/> - 20 GB storage (depending on planned usage) | Most of the computation is done client-side |
 | Jitsi        | Jitsi-Meet server: <br/> - 4 vCPU <br/> - 8 GB RAM <br/> <br/> For every 200 concurrent users one JVB with: <br/> - 8 vCPU <br/> - 8 GB RAM <br/><br/> Network bandwidth: <br/> - 1 GBit/s - 10 GBit/s small deployments <br/> - 10 Gbit/s *per bridge* large deployments<br/> | JVB network bandwidth calculation depends on the stream resolution (HD vs. 4k). |
 | Nextcloud    | Up to 5k / more than 5k users: <br/> - 4 to 20 Nextcloud AIO Pods with 8 vCPUs and 32 / 64 GB RAM each <br/> - 2 / 4 DB servers with 8 / 16 vCPUs and 64 / 128 GB RAM each, plus DB load balancer | - |
 | OpenProject  | - 4-6 vCPU per ~500 users <br/> - 6-8 GB per ~500 users <br/> - +20-50 GB storage per ~500 users, depending on workload and attachment storage[^1] <br/><br/> - Web Workers: +4 per ~500 users <br/> - Background Workers: +1-2 multithreaded workers per ~500 users, depending on workload | These values are guidelines and should be adjusted based on actual monitoring of resource usage. Scaling should prioritize CPU and RAM, prioritize scaling Web Workers first, followed by Background Workers and Disk Space as needed. |
 | Open-Xchange | For ~200 users (64 concurrent users to App Suite & 128 users to Dovecot): <br/> - 10 vCPU <br/> - 58 GB RAM <br/> - 660 GB storage | - |
 | XWiki        | Advise for small instances: <br> - 4 vCPU <br/> - 6 GB RAM | - |
 [^1]: Nextcloud is configured for attachment storage as well.
 # Upstream information
 While scaling services horizontally is the ideal solution, information about vertical scaling is helpful
 when defining the application's resources, see [`resources.yaml.gotmpl`](../helmfile/environments/default/resources.yaml.gotmpl) for references.
-Linked below is documentation related to scaling for upstream applications, where publically available:
+Linked below is documentation related to scaling from the upstream application:
- [Collabora Online Technical Documentation](https://mautic.collaboraoffice.com/asset/60:collabora-online-technical-information-pdf)
+- [OpenProject system requirements](https://www.openproject.org/docs/installation-and-operations/system-requirements/)
 - [OpenProject System Requirements](https://www.openproject.org/docs/installation-and-operations/system-requirements/)
 - [XWiki Performance](https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/Performances/)
 - [Element Requirements and Recommendations](https://ems-docs.element.io/books/element-server-suite-documentation-lts-2404/page/requirements-and-recommendations)
 - [Jitsi DevOps Guide (scalable setup)](https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-scalable/), [Jitsi Meet Needs](https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-requirements/)
--- a/docs/security-context.md
+++ b/docs/security-context.md
@@ -100,7 +100,6 @@ containerSecurityContext:
    type: "RuntimeDefault"
 ```
 or
 ```yaml
@@ -112,7 +111,7 @@ containerSecurityContext:
 ## readOnlyRootFilesystem
-Containers should have an immutable file systems, so that attackers can not modify application code or download malicious code.
+Containers should have immutable file systems, so that attackers can not modify application code or download malicious code.
 ```yaml
 containerSecurityContext:
@@ -147,7 +146,7 @@ This list gives you an overview of templated security settings and if they compl
 | process | status | allowPrivilegeEscalation | privileged | readOnlyRootFilesystem | runAsNonRoot | runAsUser | runAsGroup | seccompProfile | capabilities |
 | ------- | ------ | ------------------------ | ---------- | ---------------------- | ------------ | --------- | ---------- | -------------- | ------------ |
-| **collabora**/collabora-online | :x: | yes | no | no | yes | 1001 | 1001 | yes | no ["CHOWN","FOWNER","SYS_CHROOT"] |
+| **collabora**/collabora-online | :x: | yes | no | no | yes | 100 | 101 | yes | no ["CHOWN","FOWNER","SYS_CHROOT"] |
 | **cryptpad**/cryptpad | :x: | no | no | no | yes | 4001 | 4001 | yes | yes |
 | **element**/matrix-neoboard-widget | :white_check_mark: | no | no | yes | yes | 101 | 101 | yes | yes |
 | **element**/matrix-neochoice-widget | :white_check_mark: | no | no | yes | yes | 101 | 101 | yes | yes |
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -9,14 +9,14 @@ SPDX-License-Identifier: Apache-2.0
 * [Overview](#overview)
 * [Test concept](#test-concept)
  * [Rely on upstream applications QA](#rely-on-upstream-applications-qa)
-  * [Functional QA (end-to-end tests)](#functional-qa-end-to-end-tests)
+  * [Run minimal functional QA (end-to-end tests)](#run-minimal-functional-qa-end-to-end-tests)
-    * [Nightly testing](#nightly-testing)
+  * [Run extensive load and performance tests](#run-extensive-load-and-performance-tests)
    * [Reporting test results](#reporting-test-results)
  * [Load- and performance testing](#load--and-performance-testing)
    * [Base performance testing](#base-performance-testing)
    * [Load testing to saturation point](#load-testing-to-saturation-point)
    * [Load testing up to a defined user count](#load-testing-up-to-a-defined-user-count)
    * [Overload/recovery tests](#overloadrecovery-tests)
 * [Reporting and test results](#reporting-and-test-results)
  * [Allure TestOps](#allure-testops)
 <!-- TOC -->
 # Overview
@@ -42,65 +42,24 @@ We receive the release notes early before a new application release is integrate
 we are able to check for the existence of a sufficient set of test cases.
 The suppliers create a set of test cases for each new function.
-## Functional QA (end-to-end tests)
+## Run minimal functional QA (end-to-end tests)
-We develop and maintain a [set of end-to-end tests](https://gitlab.opencode.de/bmi/opendesk/deployment/e2e-tests) focussing on:
+To ensure the function of all applications, we run a minimal set of testcases to check the
 basic functionality of openDesk along with the integrated applications.
- use cases that are spanning more than a single application, e.g.
+Furthermore, we analyze all features and use cases which are implemented by a set of more than one
-  - the filepicker in OX App Suite for selecting files from Nextcloud or
+application.
-  - the central navigation that is part of the top bar of most applications.
+Not all of these features are testable by the suppliers, so we develop testcases
- openDesk specific configurations/supported settings that can be found in the `functional.yaml.gotmpl`, e.g.
+for such features.
  - SSO federation or
  - sharing settings for Nextcloud.
 - bugs identified in the past, e.g.
  - creating a folder in OX or
  - enforcement of an account's password renewal.
-We execute the tests using English and German as language profile.
+The openDesk application owners prioritize this list of end-to-end-testcases, and we
 implement these testcases in the [test automation framework](https://gitlab.opencode.de/bmi/opendesk/deployment/e2e-tests).
-The development team utilizes the test automation described above for QA'ing their feature branches.
+## Run extensive load and performance tests
 ### Nightly testing
 We use the functional e2e-tests in nightly testruns on a matrix of deployments addressing different application profiles to ensure the quality of the development branch's current state.
 The following naming scheme is applied for the deployment matrix:
 - `<edition>-<type>-<profile>` resulting e.g. in  `ce-init-default` or `ee-upgr-extsrv`
 **`<edition>`**
 - `ce`: openDesk Community Edition
 - `ee`: openDesk Enterprise Edition
 **`<type>`**
 - `init`: Initial / fresh / from the scratch deployment of `develop` branch into an empty namespace.
 - `upgr`: Deploy latest migration release (needs to be pinned manually) into an empty namespace, afterwards run upgrade deployment with current state of `develop` branch.
 - `upd`: Deploy latest release (`main` branch) into an empty namespace, afterwards run upgrade deployment with current state of `develop` branch.
 **`<profile>`**: The following profiles are defined
 - `default`: With
  - *`functional.yaml`*: No changes beside specific `2FA testing` group and enabled UDM REST API (required for user import).
  - *Services*: Internal services deployed with openDesk are used.
  - *Secrets*: Master password based secrets based on `secrets.yaml.gotmpl`
  - *Certificates*: Letsencrypt-prod certificates are used.
  - *Deployment*: GitLab CI based deployment.
 - `funct1`: Different configuration of `functional.yaml`, self-signed-certs [and when available external secrets].
 - `extsrv`: External services (where possible).
 - `gitops`: Argo CD based deployment.
 ### Reporting test results
 All executions of the end-to-end tests are tracked in a central platform running [Allure TestOps](https://docs.qameta.io/allure-testops/).
 As the TestOps tool contains infrastructure details of our development and test clusters it is currently only accessible for to project members.
 ## Load- and performance testing
 Our goal is to deliver openDesk as application-grade software with the ability to serve large user bases.
-We create and perform [load- and performance tests](https://gitlab.opencode.de/bmi/opendesk/deployment/load-tests) for each release of openDesk.
+We create and perform extensive load and performance tests for each release of openDesk.
 Our approach consists of different layers of load testing.
@@ -150,4 +109,30 @@ If necessary, we perform overload tests, which will saturate the system with mul
 test cases until no further increase in throughput is visible. Then we add even more load
 until the first HTTP requests run into timeouts or errors.
 After a few minutes, we reduce the load below the saturation point.
-Now we can check if the system is able to recover from the overload status.
+Then we check if the system is able to recover from the overload status.
 # Reporting and test results
 We perform test runs every night, on all of our environments.
 For each environment, we define so-called profiles, these contain the features enabled
 per environment.
 For example: Testing the email features in an environment without deployment of Open-Xchange makes no sense at all.
 Also, we test the whole system via a browser with `language=DE` and another browser with `language=EN`.
 The test results are saved in an [Allure TestOps](https://qameta.io/) server, so interested persons
 are able to view the test results later in detail.
 ## Allure TestOps
 The Allure TestOps [server](https://testops.opendesk.run/) is currently only accessible to project members.
 The relevant project is called *opendesk*.
 To get an overview, click in the left symbol list onto the symbol "Rocket" to
 check all relevant launches.
 Now you can see the launch #xxxx, and directly check for the success
 of this launch.
--- a/docs/theming.md
+++ b/docs/theming.md
@@ -14,12 +14,17 @@ This document covers the theming options for an openDesk deployment.
 # Settings
-All default settings can be found in [`theme.yaml.gotmpl`](../helmfile/environments/default/theme.yaml.gotmpl). Most of the components adhere to these settings.
+All default settings can be found in [`theme.gotmpl`](../helmfile/environments/default/theme.gotmpl). Most of the components adhere to these settings.
 Please review the default configuration that is applied to understand your customization options.
-You can just update the files in [helmfile/files/theme](../helmfile/files/theme) to change logos, favicons etc. Note that the `.svg` versions of the favicons are also used for the portal tiles.
+You can just update the files in:
 - [helmfile/files/theme](../helmfile/files/theme): To change logos, favicons etc.
 - [helmfile/files/portal-tiles](../helmfile/files/portal-tiles): To change the icons in the portal.
 # Known limitations
- Portal and Keycloak screen styles, especially colors, must be applied in the [`portalStylesheets.css`](../helmfile/files/theme/portalStylesheet.css),
+Not all applications support theming. Known exceptions are:
 - OpenProject, comes with a build in openDesk theming that can be modified in the Enterprise version's OpenProject web interface.
 - The portal background logo can (currently) only be set on initial deployment.
 - Portal and Keycloak screen styles must be applied in the [`portalStylesheets.css`](../helmfile/files/theme/portalStylesheet.css).
--- a/docs/developer/workflow.md
+++ b/docs/developer/workflow.md
@@ -238,7 +238,7 @@ The Standard Quality Gate addresses quality assurance steps that should be execu
 1. Linting
   - Blocking
     - Licensing: [reuse](https://github.com/fsfe/reuse-tool)
-     - openDesk specific: Especially `images.yaml.gotmpl` and `charts.yaml.gotmpl`, find more details in [development.md](./docs/developer/development.md).
+     - openDesk specific: Especially `images.yaml.gotmpl` and `charts.yaml.gotmpl`, find more details in [development.md](./docs/development.md).
   - Non-Blocking
     - Security: [Kyverno policy check](../.kyverno) addressing some IT-Grundschutz requirements
     - Formal: Yaml
@@ -374,7 +374,7 @@ Example: `fix(open-xchange): Bump to 8.26 to heal issue with functional mailbox
 #### Verified commits
-We only allow verified commits; please read on about the options you have to make your commits verified:
+We only allow verified commits; please read about the options you have to make your commits verified:
 - https://docs.gitlab.com/user/project/repository/signed_commits/ssh/
 - https://docs.gitlab.com/user/project/repository/signed_commits/gpg/
 - https://docs.gitlab.com/user/project/repository/signed_commits/x509/
--- a/helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl
+++ b/helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl
@@ -33,8 +33,6 @@ imagePullSecrets:
 ingress:
  enabled: {{ .Values.ingress.enabled }}
  annotations:
    {{ .Values.annotations.coco.ingress | toYaml | nindent 4 }}
  className: {{ .Values.ingress.ingressClassName | quote }}
  hosts:
    - host: "{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}"
@@ -46,8 +44,7 @@ ingress:
      hosts:
        - "{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}"
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.coco.pod | toYaml | nindent 2 }}
 securityContext:
  allowPrivilegeEscalation: false
@@ -68,7 +65,4 @@ replicaCount: {{ .Values.replicas.collaboraController }}
 resources:
  {{ .Values.resources.collaboraController | toYaml | nindent 2 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.coco.serviceAccount | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/collabora/values.yaml.gotmpl
+++ b/helmfile/apps/collabora/values.yaml.gotmpl
@@ -65,35 +65,6 @@ ingress:
      location /cool/getMetrics { deny all; return 403; }
      location /cool/adminws/ { deny all; return 403; }
      location /browser/dist/admin/admin.html { deny all; return 403; }
    # NGINX
    nginx.org/websocket-services: "collabora"
    nginx.org/lb-method: "hash $arg_WOPISrc consistent"
    nginx.org/proxy-read-timeout: "{{ .Values.ingress.parameters.bodyTimeout.collabora }}s"
    nginx.org/proxy-send-timeout: "{{ .Values.ingress.parameters.bodyTimeout.collabora }}s"
    nginx.org/client-max-body-size: "{{ .Values.ingress.parameters.bodySize.collabora }}"
    nginx.org/server-snippets: |
      # block admin and metrics endpoint from outside by default
      location /cool/getMetrics { deny all; return 403; }
      location /cool/adminws/ { deny all; return 403; }
      location /browser/dist/admin/admin.html { deny all; return 403; }
    # HAProxy
    haproxy.org/timeout-tunnel: "{{ .Values.ingress.parameters.bodyTimeout.collabora }}s"
    haproxy.org/backend-config-snippet: |
       balance url_param WOPISrc check_post
       hash-type consistent
    # HAProxy - Community: https://haproxy-ingress.github.io/
    haproxy-ingress.github.io/timeout-tunnel: "{{ .Values.ingress.parameters.bodyTimeout.collabora }}s"
    haproxy-ingress.github.io/balance-algorithm: "url_param WOPISrc check_post"
    haproxy-ingress.github.io/config-backend: |
      hash-type consistent
      # block admin urls from outside
      acl admin_url path_beg /cool/getMetrics
      acl admin_url path_beg /cool/adminws/
      acl admin_url path_beg /browser/dist/admin/admin.html
      http-request deny if admin_url
   {{- with .Values.annotations.collabora.ingress }}
   {{ . | toYaml | nindent 4 }}
   {{- end }}
  enabled: {{ .Values.ingress.enabled }}
  className: {{ .Values.ingress.ingressClassName | quote }}
  hosts:
@@ -106,11 +77,10 @@ ingress:
      hosts:
        - "{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}"
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.collabora.pod | toYaml | nindent 2 }}
 podSecurityContext:
-  fsGroup: 1001
+  fsGroup: 100
 prometheus:
  servicemonitor:
@@ -132,8 +102,8 @@ securityContext:
  privileged: false
  readOnlyRootFilesystem: false
  runAsNonRoot: true
-  runAsUser: 1001
+  runAsUser: 100
-  runAsGroup: 1001
+  runAsGroup: 101
  seccompProfile:
    type: "RuntimeDefault"
  capabilities:
@@ -146,13 +116,6 @@ securityContext:
  seLinuxOptions:
    {{ .Values.seLinuxOptions.collabora | toYaml | nindent 4 }}
 serviceAccount:
  create: true
  annotations:
    {{ .Values.annotations.collabora.serviceAccount | toYaml | nindent 4 }}
 service:
  annotations:
    {{ .Values.annotations.collabora.service | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/cryptpad/values.yaml.gotmpl
+++ b/helmfile/apps/cryptpad/values.yaml.gotmpl
@@ -39,9 +39,6 @@ ingress:
  enabled: {{ .Values.ingress.enabled }}
  annotations:
    nginx.org/websocket-services: "cryptpad"
   {{- with .Values.annotations.cryptpad.ingress }}
   {{ . | toYaml | nindent 4 }}
   {{- end }}
  className: {{ .Values.ingress.ingressClassName | quote }}
  hosts:
    - host: "{{ .Values.global.hosts.cryptpad }}.{{ .Values.global.domain }}"
@@ -56,8 +53,7 @@ ingress:
 persistence:
  enabled: false
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.cryptpad.pod | toYaml | nindent 2 }}
 podSecurityContext:
  fsGroup: 4001
@@ -84,8 +80,6 @@ securityContext:
 serviceAccount:
  create: true
  annotations:
    {{ .Values.annotations.cryptpad.serviceAccount | toYaml | nindent 4 }}
 workloadStateful: false
--- a/helmfile/apps/element/values-element.yaml.gotmpl
+++ b/helmfile/apps/element/values-element.yaml.gotmpl
@@ -4,9 +4,6 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 commonAnnotations:
  {{ .Values.annotations.element.common | toYaml | nindent 2 }}
 configuration:
  endToEndEncryption: true
  additionalConfiguration:
@@ -139,11 +136,8 @@ ingress:
  tls:
    enabled: {{ .Values.ingress.tls.enabled }}
    secretName: {{ .Values.ingress.tls.secretName | quote }}
  annotations:
    {{ .Values.annotations.element.ingress | toYaml | nindent 4 }}
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.element.pod | toYaml | nindent 2 }}
 podSecurityContext:
  enabled: true
@@ -154,14 +148,6 @@ replicaCount: {{ .Values.replicas.element }}
 resources:
  {{ .Values.resources.element | toYaml | nindent 2 }}
 service:
  annotations:
    {{ .Values.annotations.element.service | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.element.serviceAccount | toYaml | nindent 4 }}
 theme:
  title: "Chat - {{ .Values.theme.texts.productName }}"
  {{ .Values.theme | toYaml | nindent 2 }}
--- a/helmfile/apps/element/values-matrix-neoboard-widget.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-neoboard-widget.yaml.gotmpl
@@ -4,9 +4,6 @@ SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 additionalAnnotations:
  {{ .Values.annotations.elementMatrixNeoboardWidget.additional | toYaml | nindent 2 }}
 containerSecurityContext:
  allowPrivilegeEscalation: false
  capabilities:
@@ -42,11 +39,8 @@ ingress:
  tls:
    enabled: {{ .Values.ingress.tls.enabled }}
    secretName: {{ .Values.ingress.tls.secretName | quote }}
  annotations:
    {{ .Values.annotations.elementMatrixNeoboardWidget.ingress | toYaml | nindent 4 }}
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.elementMatrixNeoboardWidget.pod | toYaml | nindent 2 }}
 podSecurityContext:
  enabled: true
@@ -57,14 +51,6 @@ replicaCount: {{ .Values.replicas.matrixNeoBoardWidget }}
 resources:
  {{ .Values.resources.matrixNeoBoardWidget | toYaml | nindent 2 }}
 service:
  annotations:
    {{ .Values.annotations.elementMatrixNeoboardWidget.service | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.elementMatrixNeoboardWidget.serviceAccount | toYaml | nindent 4 }}
 theme:
  {{ .Values.theme | toYaml | nindent 2 }}
--- a/helmfile/apps/element/values-matrix-neochoice-widget.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-neochoice-widget.yaml.gotmpl
@@ -4,9 +4,6 @@ SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 additionalAnnotations:
  {{ .Values.annotations.elementMatrixNeochoiceWidget.additional | toYaml | nindent 2 }}
 containerSecurityContext:
  allowPrivilegeEscalation: false
  capabilities:
@@ -42,11 +39,8 @@ ingress:
  tls:
    enabled: {{ .Values.ingress.tls.enabled }}
    secretName: {{ .Values.ingress.tls.secretName | quote }}
  annotations:
    {{ .Values.annotations.elementMatrixNeochoiceWidget.ingress | toYaml | nindent 4 }}
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.elementMatrixNeochoiceWidget.pod | toYaml | nindent 2 }}
 podSecurityContext:
  enabled: true
@@ -54,14 +48,6 @@ podSecurityContext:
 replicaCount: {{ .Values.replicas.matrixNeoChoiceWidget }}
 service:
  annotations:
    {{ .Values.annotations.elementMatrixNeochoiceWidget.service | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.elementMatrixNeochoiceWidget.serviceAccount | toYaml | nindent 4 }}
 theme:
  {{ .Values.theme | toYaml | nindent 2 }}
--- a/helmfile/apps/element/values-matrix-neodatefix-bot-bootstrap.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-neodatefix-bot-bootstrap.yaml.gotmpl
@@ -26,8 +26,7 @@ image:
 fullnameOverride: "matrix-neodatefix-bot-bootstrap"
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.elementMatrixNeodatefixBotBootstrap.pod | toYaml | nindent 2 }}
 securityContext:
  allowPrivilegeEscalation: false
@@ -44,7 +43,4 @@ securityContext:
  seLinuxOptions:
    {{ .Values.seLinuxOptions.synapseCreateUser | toYaml | nindent 4 }}
 podAnnotations:
  {{ .Values.annotations.elementMatrixNeodatefixBotBootstrap.serviceAccount | toYaml | nindent 2 }}
 ...
--- a/helmfile/apps/element/values-matrix-neodatefix-bot.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-neodatefix-bot.yaml.gotmpl
@@ -4,9 +4,6 @@ SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 additionalAnnotations:
  {{ .Values.annotations.elementMatrixNeodatefixBot.additional | toYaml | nindent 2 }}
 global:
  domain: {{ .Values.global.domain | quote }}
  hosts:
@@ -79,8 +76,6 @@ ingress:
  tls:
    enabled: {{ .Values.ingress.tls.enabled }}
    secretName: {{ .Values.ingress.tls.secretName | quote }}
  annotations:
    {{ .Values.annotations.elementMatrixNeodatefixBot.ingress | toYaml | nindent 4 }}
 liveness sample:
  enabled: true
@@ -88,11 +83,8 @@ liveness sample:
 persistence:
  size: {{ .Values.persistence.storages.matrixNeoDateFixBot.size | quote }}
  storageClass: {{ coalesce .Values.persistence.storages.matrixNeoDateFixBot.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
  annotations:
    {{ .Values.annotations.elementMatrixNeodatefixBot.persistence | toYaml | nindent 4 }}
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.elementMatrixNeodatefixBot.pod | toYaml | nindent 2 }}
 podSecurityContext:
  enabled: true
@@ -106,12 +98,4 @@ replicaCount: {{ .Values.replicas.matrixNeoDateFixBot }}
 resources:
  {{ .Values.resources.matrixNeoDateFixBot | toYaml | nindent 2 }}
 service:
  annotations:
    {{ .Values.annotations.elementMatrixNeodatefixBot.service | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.elementMatrixNeodatefixBot.serviceAccount | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/element/values-matrix-neodatefix-widget.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-neodatefix-widget.yaml.gotmpl
@@ -4,9 +4,6 @@ SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 additionalAnnotations:
  {{ .Values.annotations.elementMatrixNeodatefixWidget.additional | toYaml | nindent 2 }}
 configuration:
  bot:
    username: "meetings-bot"
@@ -47,11 +44,8 @@ ingress:
  tls:
    enabled: {{ .Values.ingress.tls.enabled }}
    secretName: {{ .Values.ingress.tls.secretName | quote }}
  annotations:
    {{ .Values.annotations.elementMatrixNeodatefixWidget.ingress | toYaml | nindent 4 }}
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.elementMatrixNeodatefixWidget.pod | toYaml | nindent 2 }}
 podSecurityContext:
  enabled: true
@@ -65,14 +59,6 @@ resources:
 theme:
  {{ .Values.theme | toYaml | nindent 2 }}
 service:
  annotations:
    {{ .Values.annotations.elementMatrixNeodatefixWidget.service | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.elementMatrixNeodatefixWidget.serviceAccount | toYaml | nindent 4 }}
 nginx:
  ipv4Only: {{ if eq .Values.cluster.networking.ipFamilies "IPv4" }}true{{ else }}false{{ end }}
--- a/helmfile/apps/element/values-matrix-user-verification-service-bootstrap.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-user-verification-service-bootstrap.yaml.gotmpl
@@ -26,8 +26,7 @@ image:
 fullnameOverride: "opendesk-matrix-user-verification-service-bootstrap"
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.elementMatrixUserVerificationServiceBootstrap.pod | toYaml | nindent 2 }}
 securityContext:
  allowPrivilegeEscalation: false
@@ -43,10 +42,4 @@ securityContext:
    type: "RuntimeDefault"
  seLinuxOptions:
    {{ .Values.seLinuxOptions.synapseCreateUser | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.elementMatrixUserVerificationServiceBootstrap.serviceAccount | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/element/values-matrix-user-verification-service.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-user-verification-service.yaml.gotmpl
@@ -4,9 +4,6 @@ SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 additionalAnnotations:
  {{ .Values.annotations.elementMatrixUserVerificationService.additional | toYaml | nindent 2 }}
 containerSecurityContext:
  allowPrivilegeEscalation: false
  capabilities:
@@ -45,8 +42,7 @@ image:
  repository: {{ .Values.images.matrixUserVerificationService.repository | quote }}
  tag: {{ .Values.images.matrixUserVerificationService.tag | quote }}
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.elementMatrixUserVerificationService.pod | toYaml | nindent 2 }}
 podSecurityContext:
  enabled: true
@@ -57,12 +53,4 @@ replicaCount: {{ .Values.replicas.matrixUserVerificationService }}
 resources:
  {{ .Values.resources.matrixUserVerificationService | toYaml | nindent 2 }}
 service:
  annotations:
    {{ .Values.annotations.elementMatrixUserVerificationService.service | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.elementMatrixUserVerificationService.serviceAccount | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/element/values-synapse-web.yaml.gotmpl
+++ b/helmfile/apps/element/values-synapse-web.yaml.gotmpl
@@ -4,9 +4,6 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 commonAnnotations:
  {{ .Values.annotations.elementSynapseWeb.common | toYaml | nindent 2 }}
 clusterDomain: {{ .Values.cluster.networking.domain }}
 containerSecurityContext:
@@ -47,9 +44,6 @@ ingress:
    nginx.org/client-max-body-size: "{{ .Values.ingress.parameters.bodySize.element }}"
    nginx.org/proxy-read-timeout: "{{ .Values.ingress.parameters.bodyTimeout.element }}s"
    nginx.org/proxy-send-timeout: "{{ .Values.ingress.parameters.bodyTimeout.element }}s"
    {{- with .Values.annotations.elementSynapseWeb.ingress }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  host: "{{ .Values.global.hosts.synapse }}.{{ .Values.global.domain }}"
  enabled: {{ .Values.ingress.enabled }}
  ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
@@ -57,8 +51,7 @@ ingress:
    enabled: {{ .Values.ingress.tls.enabled }}
    secretName: {{ .Values.ingress.tls.secretName | quote }}
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.elementSynapseWeb.pod | toYaml | nindent 2 }}
 podSecurityContext:
  enabled: true
@@ -69,12 +62,4 @@ replicaCount: {{ .Values.replicas.synapseWeb }}
 resources:
  {{ .Values.resources.synapseWeb | toYaml | nindent 2 }}
 service:
  annotations:
    {{ .Values.annotations.elementSynapseWeb.service | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.elementSynapseWeb.serviceAccount | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/element/values-synapse.yaml.gotmpl
+++ b/helmfile/apps/element/values-synapse.yaml.gotmpl
@@ -4,9 +4,6 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 commonAnnotations:
  {{ .Values.annotations.elementSynapse.common | toYaml | nindent 2 }}
 configuration:
  additionalConfiguration:
    user_directory:
@@ -220,8 +217,6 @@ federation:
    tls:
      enabled: {{ .Values.ingress.tls.enabled }}
      secretName: {{ .Values.ingress.tls.secretName | quote }}
    annotations:
      {{ .Values.annotations.elementSynapse.federationIngress | toYaml | nindent 6 }}
 global:
  domain: {{ .Values.global.domain | quote }}
@@ -239,11 +234,8 @@ image:
 persistence:
  size: {{ .Values.persistence.storages.synapse.size | quote }}
  storageClass: {{ coalesce .Values.persistence.storages.synapse.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
  annotations:
    {{ .Values.annotations.elementSynapse.persistence | toYaml | nindent 4 }}
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.elementSynapse.pod | toYaml | nindent 2 }}
 podSecurityContext:
  enabled: true
@@ -258,14 +250,6 @@ replicaCount: {{ .Values.replicas.synapse }}
 resources:
  {{ .Values.resources.synapse | toYaml | nindent 2 }}
 service:
  annotations:
    {{ .Values.annotations.elementSynapse.service | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.elementSynapse.serviceAccount | toYaml | nindent 4 }}
 tls:
  secretName: {{ if .Values.global.matrixDomain }}"opendesk-certificates-synapse-tls"{{ else }}"opendesk-certificates-tls"{{ end }}
 ...
--- a/helmfile/apps/element/values-well-known.yaml.gotmpl
+++ b/helmfile/apps/element/values-well-known.yaml.gotmpl
@@ -4,9 +4,6 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 commonAnnotations:
  {{ .Values.annotations.elementWellKnown.common | toYaml | nindent 2 }}
 configuration:
  e2ee:
    forceDisable: false
@@ -47,11 +44,8 @@ ingress:
  tls:
    enabled: {{ .Values.ingress.tls.enabled }}
    secretName: {{ .Values.ingress.tls.secretName | quote }}
  annotations:
    {{ .Values.annotations.elementWellKnown.ingress | toYaml | nindent 4 }}
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.elementWellKnown.pod | toYaml | nindent 2 }}
 podSecurityContext:
  enabled: true
@@ -62,11 +56,4 @@ replicaCount: {{ .Values.replicas.wellKnown }}
 resources:
  {{ .Values.resources.wellKnown | toYaml | nindent 2 }}
 service:
  annotations:
    {{ .Values.annotations.elementWellKnown.service | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.elementWellKnown.serviceAccount | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/jitsi/values-jitsi.yaml.gotmpl
+++ b/helmfile/apps/jitsi/values-jitsi.yaml.gotmpl
@@ -10,10 +10,8 @@ global:
    {{ .Values.global.hosts | toYaml | nindent 4 }}
  imagePullSecrets:
    {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
-  {{- if .Values.annotations.jitsiGlobal.pod }}
+  podAnnotations: {}
-  podAnnotations:
+
    {{ .Values.annotations.jitsiGlobal.pod | toYaml | nindent 4}}
  {{- end }}
 containerSecurityContext:
  allowPrivilegeEscalation: false
  enabled: true
@@ -79,12 +77,6 @@ jitsi:
      pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
    ingress:
      enabled: {{ .Values.ingress.enabled }}
      {{- if .Values.annotations.jitsiWeb.ingress }}
      annotations:
        {{- with .Values.annotations.jitsiWeb.ingress }}
        {{ . | toYaml | nindent 8 }}
        {{- end }}
      {{- end }}
      ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
      hosts:
        - host: "{{ .Values.global.hosts.jitsi }}.{{ .Values.global.domain }}"
@@ -112,10 +104,6 @@ jitsi:
        type: "RuntimeDefault"
      seLinuxOptions:
        {{ .Values.seLinuxOptions.jitsi | toYaml | nindent 8 }}
    {{- if .Values.annotations.jitsiWeb.pod }}
    podAnnotations:
      {{ .Values.annotations.jitsiWeb.pod | toYaml | nindent 6 }}
    {{- end }}
  prosody:
    image:
      repository: "{{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.prosody.registry }}/{{ .Values.images.prosody.repository }}"
@@ -165,10 +153,6 @@ jitsi:
        type: "RuntimeDefault"
      seLinuxOptions:
        {{ .Values.seLinuxOptions.prosody | toYaml | nindent 8 }}
    {{- if .Values.annotations.jitsiProsody.pod }}
    podAnnotations:
      {{ .Values.annotations.jitsiProsody.pod | toYaml | nindent 6 }}
    {{- end }}
  jicofo:
    replicaCount: {{ .Values.replicas.jicofo }}
    image:
@@ -192,10 +176,6 @@ jitsi:
        type: "RuntimeDefault"
      seLinuxOptions:
        {{ .Values.seLinuxOptions.jicofo | toYaml | nindent 8 }}
    {{- if .Values.annotations.jitsiJicofo.pod }}
    podAnnotations:
      {{ .Values.annotations.jitsiJicofo.pod | toYaml | nindent 6 }}
    {{- end }}
  jigasi:
    replicaCount: {{ .Values.replicas.jigasi }}
    enabled: {{ .Values.sip.jigasi.enabled }}
@@ -225,10 +205,6 @@ jitsi:
        type: "RuntimeDefault"
      seLinuxOptions:
        {{ .Values.seLinuxOptions.jigasi | toYaml | nindent 8 }}
    {{- if .Values.annotations.jitsiJigasi.pod }}
    podAnnotations:
      {{ .Values.annotations.jitsiJigasi.pod | toYaml | nindent 6 }}
    {{- end }}
  jvb:
    replicaCount: {{ .Values.replicas.jvb }}
    # The `useNodeIP` option provided by the upstream charts does not support all relevant scenarios, but since
@@ -245,10 +221,6 @@ jitsi:
      {{ .Values.resources.jvb | toYaml | nindent 6 }}
    service:
      type: {{ coalesce .Values.service.type.jitsiVideoBridge .Values.cluster.service.type | quote }}
    {{- if .Values.annotations.jitsiJvb.service }}
      annotations:
        {{ .Values.annotations.jitsiJvb.service | toYaml | nindent 8 }}
    {{- end }}
    securityContext:
      allowPrivilegeEscalation: false
      capabilities: {}
@@ -261,18 +233,6 @@ jitsi:
        type: "RuntimeDefault"
      seLinuxOptions:
        {{ .Values.seLinuxOptions.jvb | toYaml | nindent 8 }}
    {{- if .Values.annotations.jitsiJvb.pod }}
    podAnnotations:
      {{ .Values.annotations.jitsiJvb.pod | toYaml | nindent 6 }}
    {{- end }}
    metrics:
      prometheusAnnotations:
        {{ .Values.annotations.jitsiJvb.metricsPrometheus | toYaml | nindent 8 }}
      {{- if .Values.annotations.jitsiJvb.metricsGrafana }}
      grafanaDashboards:
        annotations:
          {{ .Values.annotations.jitsiJvb.metricsGrafana | toYaml | nindent 10 }}
      {{- end }}
  jibri:
    replicaCount: {{ .Values.replicas.jibri }}
    image:
@@ -289,19 +249,10 @@ jitsi:
      # Chart does not allow to template more
      capabilities:
        add: ["SYS_ADMIN"]
    {{- if .Values.annotations.jitsiJibri.pod }}
    podAnnotations:
      {{ .Values.annotations.jitsiJibri.pod | toYaml | nindent 6 }}
    {{- end }}
  imagePullSecrets:
  {{- range .Values.global.imagePullSecrets }}
    - name: {{ . | quote }}
  {{- end }}
  {{- if .Values.annotations.jitsi.serviceAccount }}
  serviceAccount:
    annotations:
      {{ .Values.annotations.jitsi.serviceAccount | toYaml | nindent 6 }}
  {{- end }}
 patchJVB:
  configuration:
@@ -328,17 +279,10 @@ patchJVB:
    repository: {{ .Values.images.jitsiPatchJVB.repository | quote }}
    tag: {{ .Values.images.jitsiPatchJVB.tag | quote }}
-{{- if .Values.annotations.jitsi.pod }}
+podAnnotations: {}
 podAnnotations:
  {{ .Values.annotations.jitsi.pod | toYaml | nindent 2 }}
 {{- end }}
 replicaCount: {{ .Values.replicas.jitsiKeycloakAdapter }}
 resources:
  {{ .Values.resources.jitsiKeycloakAdapter | toYaml | nindent 2 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.jitsi.serviceAccount | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl
+++ b/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl
@@ -12,10 +12,7 @@ global:
    {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 additionalAnnotations:
-  intents.otterize.com/service-name: "opendesk-nextcloud-php"
+  intents.otterize.com/service-name: "opendesk-nextcloud-management"
  {{- with .Values.annotations.nextcloudNextcloudMgmt.additional }}
  {{ . | toYaml | nindent 2}}
  {{- end }}
 cleanup:
  deletePodsOnSuccess: {{ .Values.debug.cleanup.deletePodsOnSuccess }}
@@ -75,7 +72,6 @@ configuration:
  collabora:
    # internalWopiUrl: ""
    wopiAllowlist: {{ join ", " ( concat .Values.cluster.networking.cidr .Values.cluster.networking.incomingCIDR ) | quote }}
    defaultFormat: {{ .Values.functional.weboffice.defaultFormat | quote }}
  database:
    {{ if eq .Values.databases.nextcloud.type "mariadb" }}
@@ -188,6 +184,8 @@ containerSecurityContext:
  runAsNonRoot: true
  seLinuxOptions:
    {{ .Values.seLinuxOptions.nextcloudManagement | toYaml | nindent 4 }}
 podSecurityContext:
  fsGroup: 101
 debug:
  loglevel: {{ if .Values.debug.enabled }}"0"{{ else }}"2"{{ end }}
@@ -216,20 +214,10 @@ image:
  imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
  tag: {{ .Values.images.nextcloud.tag | quote }}
-podAnnotations:
+theme:
-  {{ .Values.annotations.nextcloudNextcloudMgmt.pod | toYaml | nindent 2 }}
+  {{ .Values.theme | toYaml | nindent 2 }}
 podSecurityContext:
  fsGroup: 101
 resources:
  {{ .Values.resources.nextcloud | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.nextcloudNextcloudMgmt.serviceAccount | toYaml | nindent 4 }}
 theme:
  {{ .Values.theme | toYaml | nindent 2 }}
 ...
--- a/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl
+++ b/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl
@@ -9,13 +9,6 @@ global:
    {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 exporter:
  additionalAnnotations:
    intents.otterize.com/service-name: "opendesk-nextcloud-exporter"
    {{- with .Values.annotations.nextcloudExporter.additional }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  enabled: true
  configuration:
    server: "http://opendesk-nextcloud-aio"
@@ -41,8 +34,7 @@ exporter:
    repository: "{{ .Values.images.nextcloudExporter.repository }}"
    imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
    tag: {{ .Values.images.nextcloudExporter.tag | quote }}
-  podAnnotations:
+  podAnnotations: {}
    {{ .Values.annotations.nextcloudExporter.pod | toYaml | nindent 4 }}
  prometheus:
    serviceMonitor:
      enabled: {{ .Values.monitoring.prometheus.serviceMonitors.enabled }}
@@ -56,17 +48,9 @@ exporter:
  resources:
    {{ .Values.resources.nextcloudExporter | toYaml | nindent 4 }}
  serviceAccount:
    annotations:
      {{ .Values.annotations.nextcloudExporter.serviceAccount | toYaml | nindent 6 }}
 aio:
  additionalAnnotations:
    intents.otterize.com/service-name: "opendesk-nextcloud-aio"
    {{- with .Values.annotations.nextcloudAio.additional }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  configuration:
    cache:
      auth:
@@ -155,15 +139,11 @@ aio:
      nginx.org/client-max-body-size: "{{ .Values.ingress.parameters.bodySize.nextcloud }}"
      nginx.org/proxy-read-timeout: "{{ .Values.ingress.parameters.bodyTimeout.nextcloud }}s"
      nginx.org/proxy-send-timeout: "{{ .Values.ingress.parameters.bodyTimeout.nextcloud }}s"
      {{- with .Values.annotations.nextcloudAio.ingress }}
        {{ . | toYaml | nindent 6 }}
      {{- end }}
    ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
    host: "{{ .Values.global.hosts.nextcloud }}.{{ .Values.global.domain }}"
    tls:
      secretName: {{ .Values.ingress.tls.secretName | quote }}
-  podAnnotations:
+  podAnnotations: {}
    {{ .Values.annotations.nextcloudAio.pod | toYaml | nindent 4 }}
  podSecurityContext:
    fsGroup: 101
  prometheus:
@@ -179,12 +159,4 @@ aio:
  resources:
    {{ .Values.resources.nextcloud | toYaml | nindent 4 }}
  service:
    annotations:
      {{ .Values.annotations.nextcloudAio.service | toYaml | nindent 6 }}
  serviceAccount:
    annotations:
      {{ .Values.annotations.nextcloudAio.serviceAccount | toYaml | nindent 6 }}
 ...
--- a/helmfile/apps/notes/values.yaml.gotmpl
+++ b/helmfile/apps/notes/values.yaml.gotmpl
@@ -33,9 +33,6 @@ ingressCollaborationWS:
    nginx.ingress.kubernetes.io/proxy-read-timeout: "86400"
    nginx.ingress.kubernetes.io/proxy-send-timeout: "86400"
    nginx.ingress.kubernetes.io/upstream-hash-by: $arg_room
    {{- with .Values.annotations.notes.ingressCollaborationWS }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
 ingressAdmin:
  enabled: {{ .Values.ingress.enabled }}
@@ -44,8 +41,6 @@ ingressAdmin:
  tls:
    enabled: "{{ .Values.ingress.tls.enabled }}"
    secretName: {{ .Values.ingress.tls.secretName | quote }}
  annotations:
    {{ .Values.annotations.notes.ingressAdmin | toYaml | nindent 4 }}
 ingressMedia:
  enabled: {{ .Values.ingress.enabled }}
@@ -59,9 +54,6 @@ ingressMedia:
    nginx.ingress.kubernetes.io/use-regex: "true"
    nginx.ingress.kubernetes.io/rewrite-target: /{{ .Values.objectstores.notes.bucket }}/$1
    nginx.ingress.kubernetes.io/session-cookie-path: /media
    {{- with .Values.annotations.notes.ingressMedia }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  tls:
    enabled: "{{ .Values.ingress.tls.enabled }}"
    secretName: {{ .Values.ingress.tls.secretName | quote }}
@@ -74,14 +66,11 @@ ingressCollaborationApi:
  tls:
    enabled: "{{ .Values.ingress.tls.enabled }}"
    secretName: {{ .Values.ingress.tls.secretName | quote }}
-  annotations:
+
    {{ .Values.annotations.notes.ingressCollaborationAPI | toYaml | nindent 4 }}
 serviceMedia:
  host: {{ .Values.objectstores.notes.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain) | quote }}
  port: {{ .Values.objectstores.notes.port | default 443 }}
  annotations:
    {{ .Values.annotations.notes.serviceMedia | toYaml | nindent 4 }}
 frontend:
  image:
@@ -114,13 +103,6 @@ frontend:
    seLinuxOptions:
      {{ .Values.seLinuxOptions.notesFrontend | toYaml | nindent 6 }}
  podAnnotations:
    {{ .Values.annotations.notesFrontend.pod | toYaml | nindent 4 }}
  service:
    annotations:
      {{ .Values.annotations.notesFrontend.service | toYaml | nindent 6 }}
 yProvider:
  image:
    repository: {{ printf "%s/%s" (coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.notesYProvider.registry) (.Values.images.notesYProvider.repository) | quote }}
@@ -149,13 +131,6 @@ yProvider:
    COLLABORATION_SERVER_SECRET: {{ .Values.secrets.notes.collaborationSecret | quote }}
    Y_PROVIDER_API_KEY: {{ .Values.secrets.notes.collaborationSecret | quote }}
  podAnnotations:
    {{ .Values.annotations.notesYProvider.pod | toYaml | nindent 4 }}
  service:
    annotations:
      {{ .Values.annotations.notesYProvider.service | toYaml | nindent 6 }}
 oidc:
  clientId: "opendesk-notes"
  clientSecret: {{ .Values.secrets.keycloak.clientSecret.notes | quote }}
@@ -240,9 +215,6 @@ backend:
        python manage.py migrate --no-input
    restartPolicy: Never
  migrateJobAnnotations:
    {{ .Values.annotations.notesBackend.migrateJob | toYaml | nindent 4 }}
  createsuperuser:
    command:
      - "/bin/sh"
@@ -251,9 +223,6 @@ backend:
        python manage.py createsuperuser --email default.admin@{{ .Values.global.domain }} --password {{ .Values.secrets.notes.superuser }}
    restartPolicy: Never
  podAnnotations:
    {{ .Values.annotations.notesBackend.pod | toYaml | nindent 4 }}
  resources:
    {{ .Values.resources.notesBackend | toYaml | nindent 4 }}
  securityContext:
@@ -270,9 +239,4 @@ backend:
    runAsNonRoot: true
    seLinuxOptions:
      {{ .Values.seLinuxOptions.notesBackend | toYaml | nindent 6 }}
  service:
    annotations:
      {{ .Values.annotations.notesBackend.service | toYaml | nindent 6 }}
 ...
--- a/helmfile/apps/nubus/values-intercom-service.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-intercom-service.yaml.gotmpl
@@ -4,9 +4,6 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 additionalAnnotations:
  {{ .Values.annotations.nubusIntercomService.additional | toYaml | nindent 2 }}
 containerSecurityContext:
  allowPrivilegeEscalation: false
  capabilities:
@@ -102,11 +99,8 @@ ingress:
  tls:
    enabled: {{ .Values.ingress.tls.enabled }}
    secretName: {{ .Values.ingress.tls.secretName | quote }}
  annotations:
    {{ .Values.annotations.nubusIntercomService.ingress | toYaml | nindent 4 }}
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.nubusIntercomService.pod | toYaml | nindent 2 }}
 podSecurityContext:
  enabled: true
@@ -156,11 +150,4 @@ replicaCount: {{ .Values.replicas.intercomService }}
 resources:
  {{ .Values.resources.intercomService | toYaml | nindent 2 }}
 service:
  annotations:
    {{ .Values.annotations.nubusIntercomService.service | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.nubusIntercomService.serviceAccount | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/nubus/values-nginx-s3-gateway.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-nginx-s3-gateway.yaml.gotmpl
@@ -7,9 +7,6 @@ global:
  imagePullSecrets:
    {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 additionalAnnotations:
  {{ .Values.annotations.nubusNginxS3Gateway.additional | toYaml | nindent 2 }}
 image:
  registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.nginxS3Gateway.registry | quote }}
  repository: {{ .Values.images.nginxS3Gateway.repository | quote }}
@@ -23,10 +20,6 @@ ingress:
  annotations:
    nginx.ingress.kubernetes.io/rewrite-target: "/portal-assets/icons/$2/$3"
    nginx.ingress.kubernetes.io/use-regex: "true"
    {{- with .Values.annotations.nubusNginxS3Gateway.ingress }}
    {{. | toYaml | nindent 4 }}
    {{- end }}
  path: "/univention/(portal|selfservice)/icons/(logos|entries)/(.*)$"
  tls:
    secretName: {{ .Values.ingress.tls.secretName | quote }}
@@ -43,20 +36,8 @@ configuration:
    secretKey:
      value: {{ .Values.objectstores.nubus.secretKey | default .Values.secrets.minio.umsUser | quote }}
 podAnnotations:
  {{ .Values.annotations.nubusNginxS3Gateway.pod | toYaml | nindent 2 }}
 resources:
  {{ .Values.resources.nginxS3Gateway | toYaml | nindent 2 }}
 replicaCount: {{ .Values.replicas.nginxS3Gateway }}
 service:
  annotations:
    {{ .Values.annotations.nubusNginxS3Gateway.service | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.nubusNginxS3Gateway.serviceAccount | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/nubus/values-nubus.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-nubus.yaml.gotmpl
--- a/helmfile/apps/nubus/values-opendesk-keycloak-bootstrap.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-opendesk-keycloak-bootstrap.yaml.gotmpl
@@ -1,5 +1,5 @@
 {{/*
-SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
@@ -110,13 +110,8 @@ config:
    clientSessionMaxLifespan: {{ .Values.functional.authentication.realmSettings.clientSessionMaxLifespan }}
    clientOfflineSessionIdleTimeout: {{ .Values.functional.authentication.realmSettings.clientOfflineSessionIdleTimeout }}
    clientOfflineSessionMaxLifespan: {{ .Values.functional.authentication.realmSettings.clientOfflineSessionMaxLifespan }}
  ssoFederation:
    enabled: {{ .Values.functional.authentication.ssoFederation.enabled }}
    enforceFederatedLogin: {{ .Values.functional.authentication.ssoFederation.enforceFederatedLogin }}
    name: {{ .Values.functional.authentication.ssoFederation.name | quote }}
    idpDetails: {{ .Values.functional.authentication.ssoFederation.idpDetails | toYaml | nindent 6 }}
  twoFactorSettings:
-    additionalGroups: {{ .Values.functional.authentication.twoFactor.groups | toYaml | nindent 6 }}
+    additionalGroups: {{ .Values.functional.authentication.twoFactor.groups }}
  precreateGroups: [ 'Domain Admins', 'Domain Users', '2fa-users', 'IAM API - Full Access',
                     {{ if .Values.apps.nextcloud.enabled }}'managed-by-attribute-Fileshare', 'managed-by-attribute-FileshareAdmin',{{ end }}
                     {{ if .Values.apps.xwiki.enabled }}'managed-by-attribute-Knowledgemanagement', 'managed-by-attribute-KnowledgemanagementAdmin',{{ end }}
@@ -761,15 +756,9 @@ containerSecurityContext:
 additionalAnnotations:
    argocd.argoproj.io/hook: "Sync"
    argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation"
  {{- with .Values.annotations.nubusKeycloakBootstrap.additional }}
  {{. | toYaml | nindent 2 }}
  {{- end }}
 podAnnotations:
  intents.otterize.com/service-name: "ums-keycloak-bootstrap"
  {{- with .Values.annotations.nubusKeycloakBootstrap.pod }}
  {{. | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  enabled: true
@@ -779,10 +768,6 @@ podSecurityContext:
 resources:
  {{ .Values.resources.opendeskKeycloakBootstrap | toYaml | nindent 2 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.nubusKeycloakBootstrap.serviceAccount | toYaml | nindent 4 }}
 {{- if .Values.certificate.selfSigned }}
 extraVolumes:
  - name: "trusted-cert-secret-volume"
--- a/helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl
@@ -4,9 +4,6 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 commonAnnotations:
  {{ .Values.annotations.openxchangeDovecot.common | toYaml | nindent 2 }}
 image:
  registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.dovecot.registry | quote }}
  repository: {{ .Values.images.dovecot.repository | quote }}
@@ -23,8 +20,7 @@ imagePullSecrets:
  {{ .Values.global.imagePullSecrets | toYaml | nindent 2 }}
 dovecot:
-  mailDomains: {{ toYaml (prepend .Values.global.additionalMailDomains (.Values.global.mailDomain | default .Values.global.domain) | uniq) | nindent 4 }}
+  mailDomain: {{ .Values.global.mailDomain | default .Values.global.domain | quote }}
  defaultMailDomain: {{ .Values.global.mailDomain | default .Values.global.domain | quote }}
  password:
    value: {{ .Values.secrets.dovecot.doveadm | quote }}
  migration:
@@ -83,6 +79,9 @@ containerSecurityContext:
  seLinuxOptions:
    {{ .Values.seLinuxOptions.dovecot | toYaml | nindent 4 }}
 podAnnotations: {}
 {{- if .Values.certificate.selfSigned }}
 extraVolumes:
  - name: "trusted-cert-secret-volume"
@@ -112,26 +111,14 @@ persistence:
    - "ReadWriteOnce"
  {{- end }}
  size: {{ .Values.persistence.storages.dovecot.size | quote }}
  annotations:
    {{ .Values.annotations.openxchangeDovecot.persistence | toYaml | nindent 4 }}
 podAnnotations:
  {{ .Values.annotations.openxchangeDovecot.pod | toYaml | nindent 2 }}
 resources:
  {{ .Values.resources.dovecot | toYaml | nindent 2 }}
 {{- if or (eq (coalesce .Values.service.type.dovecot .Values.cluster.service.type) "NodePort") (eq (coalesce .Values.service.type.dovecot .Values.cluster.service.type) "LoadBalancer") }}
 service:
  annotations:
    {{ .Values.annotations.openxchangeDovecot.service | toYaml | nindent 4 }}
  external:
    enabled: true
    type: {{ coalesce .Values.service.type.dovecot .Values.cluster.service.type | quote }}
 {{- end }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.openxchangeDovecot.serviceAccount | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/open-xchange/values-openxchange-bootstrap.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-openxchange-bootstrap.yaml.gotmpl
@@ -4,13 +4,6 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 additionalAnnotations:
  argocd.argoproj.io/hook: "Sync"
  argocd.argoproj.io/hook-delete-policy: "HookSucceeded"
  {{- with .Values.annotations.openxchangeBootstrap.additional }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 cleanup:
  deletePodsOnSuccess: {{ .Values.debug.cleanup.deletePodsOnSuccess }}
  deletePodsOnSuccessTimeout: {{ .Values.debug.cleanup.deletePodsOnSuccessTimeout }}
@@ -38,8 +31,7 @@ image:
 imagePullSecrets:
  {{ .Values.global.imagePullSecrets | toYaml | nindent 2 }}
-serviceAccount:
+additionalAnnotations:
-  annotations:
+  argocd.argoproj.io/hook: "Sync"
-    {{ .Values.annotations.openxchangeBootstrap.serviceAccount | toYaml | nindent 4 }}
+  argocd.argoproj.io/hook-delete-policy: "HookSucceeded"
 ...
--- a/helmfile/apps/open-xchange/values-openxchange-contact-picker.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-openxchange-contact-picker.yaml.gotmpl
@@ -6,11 +6,7 @@ SPDX-License-Identifier: Apache-2.0
 ---
 appsuite:
  core-mw:
-    podAnnotations:
+
      logging.open-xchange.com/format: "appsuite-json"
      {{- with .Values.annotations.openxchangeEnterpriseContactPicker.appsuiteCoreMwPod }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
    properties:
      # Enterprise contact picker
      com.openexchange.contacts.ldap.accounts: "opendesk,other,functional"
@@ -32,10 +28,6 @@ appsuite:
              dn: "uid=ldapsearch_ox,cn=users,{{ .Values.ldap.baseDn }}"
              password: {{ .Values.secrets.nubus.ldapSearch.ox | quote }}
    serviceAccount:
      annotations:
        {{ .Values.annotations.openxchangeEnterpriseContactPicker.appsuiteCoreMwServiceAccount | toYaml | nindent 8 }}
    uiSettings:
      # Enterprise contact picker
      io.ox/core//features/enterprisePicker/enabled: "true"
--- a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
@@ -32,8 +32,7 @@ nextcloud-integration-ui:
  {{- range .Values.global.imagePullSecrets }}
    - name: {{ . | quote }}
  {{- end }}
-  podAnnotations:
+  podAnnotations: {}
    {{ .Values.annotations.openxchangeNextcloudIntegrationUi.pod | toYaml | nindent 4 }}
  replicaCount: {{ .Values.replicas.openxchangeNextcloudIntegrationUI }}
  resources:
    {{ .Values.resources.openxchangeNextcloudIntegrationUI | toYaml | nindent 4 }}
@@ -67,8 +66,7 @@ public-sector-ui:
  {{- end }}
  pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
  replicaCount: {{ .Values.replicas.openxchangePublicSectorUI }}
-  podAnnotations:
+  podAnnotations: {}
    {{ .Values.annotations.openxchangePublicSectorUi.pod | toYaml | nindent 4 }}
  resources:
    {{ .Values.resources.openxchangePublicSectorUI | toYaml | nindent 4 }}
  securityContext:
@@ -97,8 +95,6 @@ appsuite:
  istio:
    enabled: false
  ingress:
    annotations:
      {{ .Values.annotations.openxchangeAppsuiteIngress.ingress | toYaml | nindent 6 }}
    enabled: {{ .Values.ingress.enabled }}
    ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
    tls:
@@ -111,101 +107,11 @@ appsuite:
      hosts:
        - "{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}"
    routes:
      appsuite-base:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.appsuitebase | toYaml | nindent 10 }}
      rootredirect:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.rootredirect | toYaml | nindent 10 }}
      trailslash:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.trailslash | toYaml | nindent 10 }}
      rest-routes-admin:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.restRoutesAdmin | toYaml | nindent 10 }}
      rest-routes-advertisement:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.restRoutesAdvertisement | toYaml | nindent 10 }}
      rest-routes-chronos:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.restRoutesChronos | toYaml | nindent 10 }}
      rest-routes-preliminary:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.restRoutesPreliminary | toYaml | nindent 10 }}
      rest-routes-userfeedback:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.restRoutesUserfeedback | toYaml | nindent 10 }}
      static-routes-servlet:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.staticRoutesServlet | toYaml | nindent 10 }}
      static-routes-realtime:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.staticRoutesRealtime | toYaml | nindent 10 }}
      static-routes-infostore:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.staticRoutesInfostore | toYaml | nindent 10 }}
      static-routes-webservices:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.staticRoutesWebservices | toYaml | nindent 10 }}
      drive-client-windows-ox-route:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.driveClientWindowsOxRoute | toYaml | nindent 10 }}
      guard-api-route:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.guardApiRoute | toYaml | nindent 10 }}
      guard-support-api-route:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.guardSupportApiRoute | toYaml | nindent 10 }}
      guard-pgp-route:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.guardPgpRoute | toYaml | nindent 10 }}
      http-api-routes-api:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.httpApiRoutesApi | toYaml | nindent 10 }}
      http-api-routes-ajax:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.httpApiRoutesAjax | toYaml | nindent 10 }}
      http-api-routes-appsuite-api:
        annotations:
          nginx.ingress.kubernetes.io/proxy-body-size: "{{ .Values.ingress.parameters.bodySize.oxAppSuite }}"
          nginx.ingress.kubernetes.io/proxy-read-timeout: "{{ .Values.ingress.parameters.bodyTimeout.oxAppSuite }}"
          nginx.ingress.kubernetes.io/proxy-send-timeout: "{{ .Values.ingress.parameters.bodyTimeout.oxAppSuite }}"
          {{- with .Values.annotations.openxchangeAppsuiteIngress.httpApiRoutesAppsuiteApi }}
          {{ . | toYaml | nindent 10 }}
          {{- end }}
      http-api-routes-app-root-api:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.httpApiRoutesAppRootApi | toYaml | nindent 10 }}
      rt2-route:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.rt2Route | toYaml | nindent 10 }}
      documents-help-route:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.documentsHelpRoute | toYaml | nindent 10 }}
      drive-help-route:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.driveHelpRoute | toYaml | nindent 10 }}
      core-help-route:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.coreHelpRoute | toYaml | nindent 10 }}
      office-web-route:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.officeWebRoute | toYaml | nindent 10 }}
      caldav-well-known-redirect:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.caldavWellKnownRedirect | toYaml | nindent 10 }}
      carddav-well-known-redirect:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.carddavWellKnownRedirect | toYaml | nindent 10 }}
      dav-infostore-route:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.davInfostoreRoute | toYaml | nindent 10 }}
      dav-root-route:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.davRootRoute | toYaml | nindent 10 }}
      wopi-server-route:
        annotations:
          {{ .Values.annotations.openxchangeAppsuiteIngress.wopiServerRoute | toYaml | nindent 10 }}
      trailslash:
        enabled: false
  core-mw:
@@ -225,11 +131,8 @@ appsuite:
    jolokiaLogin: "jolokia"
    jolokiaPassword: {{ .Values.secrets.oxAppSuite.jolokiaPassword | quote }}
    hostname: "{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}"
-    podAnnotations:
+    podAnnotations: {}
      {{ .Values.annotations.openxchangeAppsuiteCoreMw.pod | toYaml | nindent 6 }}
    serviceAccount:
      annotations:
        {{ .Values.annotations.openxchangeAppsuiteCoreMw.serviceAccount | toYaml | nindent 8 }}
      create: true
    features:
      status:
@@ -248,8 +151,7 @@ appsuite:
        tag: {{ .Values.images.openxchangeGotenberg.tag | quote }}
        pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
      replicaCount: {{ .Values.replicas.openxchangeGotenberg }}
-      podAnnotations:
+      podAnnotations: {}
        {{ .Values.annotations.openxchangeAppsuiteCoreMw.gotenbergPod | toYaml | nindent 8 }}
      resources:
        {{ .Values.resources.openxchangeGotenberg | toYaml | nindent 8 }}
      securityContext:
@@ -277,16 +179,14 @@ appsuite:
    packages:
      status:
        {{- if .Values.functional.migration.oxAppSuite.enabled }}
        open-xchange-oidc: "disabled"
        open-xchange-authentication-oauth: "disabled"
        open-xchange-authentication-masterpassword: "enabled"
        open-xchange-authentication-database: "disabled"
        open-xchange-authentication-ldap: "disabled"
        open-xchange-authentication-oauth: "disabled"
        open-xchange-oidc: "disabled"
        {{- else }}
        open-xchange-oidc: "enabled"
        open-xchange-authentication-oauth: "enabled"
        open-xchange-authentication-masterpassword: "disabled"
        open-xchange-authentication-database: "disabled"
        open-xchange-authentication-oauth: "enabled"
        open-xchange-authentication-ldap: "disabled"
        {{- end }}
        # OX Documents (office-web) is not used in openDesk
@@ -337,12 +237,25 @@ appsuite:
      com.openexchange.authentication.oauth.clientSecret: {{ .Values.secrets.keycloak.clientSecret.as8oidc | quote }}
      # MAIL
      com.openexchange.mail.authType: "xoauth2"
-      com.openexchange.mail.loginSource: "mail"
+      com.openexchange.mail.loginSource: "name"
      com.openexchange.mail.mailServer: "dovecot"
      com.openexchange.mail.mailServerSource: "global"
      com.openexchange.mail.transport.authType: "xoauth2"
      com.openexchange.mail.transportServer: "postfix-ox"
      com.openexchange.mail.transportServerSource: "global"
      # Mail Login Resolver
      com.openexchange.mail.login.resolver.enabled: "true"
      com.openexchange.mail.login.resolver.ldap.enabled: "true"
      com.openexchange.mail.login.resolver.ldap.clientId: contactsLdapClient
      com.openexchange.mail.login.resolver.ldap.mailLoginSearchFilter: "(&(univentionObjectType=users/user)(isOxUser=OK)(mailPrimaryAddress=[mailLogin]))"
      com.openexchange.mail.login.resolver.ldap.userNameAttribute: uid
      com.openexchange.mail.login.resolver.ldap.contextIdAttribute: oxContextIDNum
      com.openexchange.mail.login.resolver.ldap.entitySearchFilter: "(&(univentionObjectType=users/user)(isOxUser=OK)(oxContextIDNum=[cid])(uid=[uname]))"
      #com.openexchange.mail.login.resolver.ldap.mailLoginAttribute: entryUUID
      # Workaround until either OX issue /appsuite/platform/core#251 is fixed
      # or entryUUIDs are replaced by a different field.
      com.openexchange.mail.login.resolver.ldap.mailLoginAttribute: departmentName
      #com.openexchange.mail.login.resolver.ldap.cacheExpire: "1"
      # Requirements for OX-Connector
      com.openexchange.user.enforceUniqueDisplayName: "false"
      com.openexchange.folderstorage.database.preferDisplayName: "false"
@@ -430,10 +343,8 @@ appsuite:
      com.openexchange.share.cryptKey: {{ .Values.secrets.oxAppSuite.shareCryptKey | quote }}
      com.openexchange.conference.element.authToken: {{ .Values.secrets.oxAppSuite.synapseAsToken | quote }}
    propertiesFiles:
      {{- if .Values.functional.migration.oxAppSuite.enabled }}
      /opt/open-xchange/etc/masterpassword-authentication.properties:
        com.openexchange.authentication.masterpassword.password: {{ .Values.secrets.oxAppSuite.migrationsMasterPassword | quote }}
      {{- end }}
      /opt/open-xchange/etc/AdminDaemon.properties:
        MASTER_ACCOUNT_OVERRIDE: "true"
      /opt/open-xchange/etc/AdminUser.properties:
@@ -523,8 +434,6 @@ appsuite:
    # podSecurityContext: {}
    # securityContext: {}
    update:
      podAnnotations:
        {{ .Values.annotations.openxchangeAppsuiteCoreMw.updatePod | toYaml | nindent 8 }}
      image:
        repository: {{ .Values.images.openxchangeCoreMW.repository | quote }}
        tag: {{ .Values.images.openxchangeCoreMW.tag | quote }}
@@ -551,8 +460,7 @@ appsuite:
      tag: {{ .Values.images.openxchangeCoreUI.tag | quote }}
      pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
    replicaCount: {{ .Values.replicas.openxchangeCoreUI }}
-    podAnnotations:
+    podAnnotations: {}
      {{ .Values.annotations.openxchangeAppsuiteCoreUi.pod | toYaml | nindent 6 }}
    resources:
      {{ .Values.resources.openxchangeCoreUI | toYaml | nindent 6 }}
    securityContext:
@@ -588,8 +496,7 @@ appsuite:
      tag: {{ .Values.images.openxchangeCoreUIMiddleware.tag | quote }}
      pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
    overrides: {}
-    podAnnotations:
+    podAnnotations: {}
      {{ .Values.annotations.openxchangeAppsuiteCoreUiMiddleware.pod | toYaml | nindent 6 }}
    redis: *redisConfiguration
    replicaCount: {{ .Values.replicas.openxchangeCoreUIMiddleware }}
    resources:
@@ -632,10 +539,7 @@ appsuite:
      repository: {{ .Values.images.openxchangeDocumentConverter.repository | quote }}
      tag: {{ .Values.images.openxchangeDocumentConverter.tag | quote }}
      pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-    {{- if .Values.annotations.openxchangeAppsuiteCoreDocumentconverter.pod }}
+    podAnnotations: {}
    podAnnotations:
      {{ .Values.annotations.openxchangeAppsuiteCoreDocumentconverter.pod | toYaml | nindent 6 }}
    {{- end }}
    redis: *redisConfiguration
    replicaCount: {{ .Values.replicas.openxchangeCoreDocumentConverter }}
    resources:
@@ -685,8 +589,7 @@ appsuite:
      repository: {{ .Values.images.openxchangeCoreGuidedtours.repository | quote }}
      tag: {{ .Values.images.openxchangeCoreGuidedtours.tag | quote }}
      pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-    podAnnotations:
+    podAnnotations: {}
      {{ .Values.annotations.openxchangeAppsuiteCoreGuidedtours.pod | toYaml | nindent 6 }}
    replicaCount: {{ .Values.replicas.openxchangeCoreGuidedtours }}
    resources:
      {{- .Values.resources.openxchangeCoreGuidedtours | toYaml | nindent 6 }}
@@ -724,10 +627,7 @@ appsuite:
          endpoint: "."
          accessKey: "."
          secretKey: "."
-    {{- if .Values.annotations.openxchangeAppsuiteCoreImageconverter.pod }}
+    podAnnotations: {}
    podAnnotations:
      {{ .Values.annotations.openxchangeAppsuiteCoreImageconverter.pod | toYaml | nindent 6 }}
    {{- end }}
    redis: *redisConfiguration
    replicaCount: {{ .Values.replicas.openxchangeCoreImageConverter }}
    resources:
@@ -796,8 +696,7 @@ appsuite:
    {{- range .Values.global.imagePullSecrets }}
      - name: {{ . | quote }}
    {{- end }}
-    podAnnotations:
+    podAnnotations: {}
      {{ .Values.annotations.openxchangeAppsuiteCoreUserGuide.pod | toYaml | nindent 6 }}
    replicaCount: {{ .Values.replicas.openxchangeCoreUserGuide }}
    resources:
      {{- .Values.resources.openxchangeCoreUserGuide | toYaml | nindent 6 }}
--- a/helmfile/apps/open-xchange/values-oxconnector.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-oxconnector.yaml.gotmpl
@@ -69,8 +69,7 @@ persistence:
  size: {{ .Values.persistence.storages.oxConnector.size | quote }}
  storageClass: {{ coalesce .Values.persistence.storages.oxConnector.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.nubusOxConnector.pod | toYaml | nindent 2 }}
 replicaCount: {{ .Values.replicas.oxConnector }}
@@ -93,8 +92,6 @@ securityContext:
    {{ .Values.seLinuxOptions.oxConnector | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.nubusOxConnector.serviceAccount | toYaml | nindent 4 }}
  create: true
 ...
--- a/helmfile/apps/open-xchange/values-postfix.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-postfix.yaml.gotmpl
@@ -57,7 +57,7 @@ postfix:
  {{- end }}
  rspamdHost: ""
  relayHost: {{ if .Values.smtp.host }}{{ printf "[%s]:%d" .Values.smtp.host .Values.smtp.port | quote }}{{ else }}""{{ end }}
-  allowRelayNets: false
+  relayNets: {{ join " " .Values.cluster.networking.cidr | quote }}
  smtpSASLAuthEnable: "yes"
  smtpSASLPasswordMaps: "lmdb:/etc/postfix/sasl_passwd.map"
  smtpTLSSecurityLevel: "encrypt"
@@ -81,11 +81,10 @@ postfix:
  smtpdMilters: "inet:clamav-simple:7357"
  {{- end }}
  {{- end }}
-  virtualMailboxDomains: {{ toYaml (prepend .Values.global.additionalMailDomains (.Values.global.mailDomain | default .Values.global.domain) | uniq) | nindent 4 }}
+  virtualMailboxDomains: {{ if .Values.global.additionalMailDomains }}{{ printf "%s,%s" (.Values.global.mailDomain | default .Values.global.domain) .Values.global.additionalMailDomains }}{{ else }}{{ .Values.global.mailDomain | default .Values.global.domain | quote }}{{ end }}
  virtualTransport: "lmtps:dovecot:24"
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.openxchangePostfix.pod | toYaml | nindent 2 }}
 replicaCount: {{ .Values.replicas.postfix }}
@@ -94,8 +93,6 @@ resources:
 {{- if or (eq (coalesce .Values.service.type.postfix .Values.cluster.service.type) "NodePort") (eq (coalesce .Values.service.type.postfix .Values.cluster.service.type) "LoadBalancer") }}
 service:
  annotations:
    {{ .Values.annotations.openxchangePostfix.service | toYaml | nindent 4 }}
  external:
    enabled: true
    type: {{ coalesce .Values.service.type.postfix .Values.cluster.service.type | quote }}
--- a/helmfile/apps/opendesk-migrations-post/values.yaml.gotmpl
+++ b/helmfile/apps/opendesk-migrations-post/values.yaml.gotmpl
@@ -3,15 +3,7 @@
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
-additionalAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.opendeskMigrationsPost.additional | toYaml | nindent 2 }}
 podAnnotations:
  {{ .Values.annotations.opendeskMigrationsPost.pod | toYaml | nindent 2 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.opendeskMigrationsPost.serviceAccount | toYaml | nindent 4 }}
 migrations:
  stage: "POST"
--- a/helmfile/apps/opendesk-migrations-pre/values.yaml.gotmpl
+++ b/helmfile/apps/opendesk-migrations-pre/values.yaml.gotmpl
@@ -3,15 +3,7 @@
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
-additionalAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.opendeskMigrationsPre.additional | toYaml | nindent 2 }}
 podAnnotations:
  {{ .Values.annotations.opendeskMigrationsPre.pod | toYaml | nindent 2 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.opendeskMigrationsPre.serviceAccount | toYaml | nindent 4 }}
 migrations:
  stage: "PRE"
--- a/helmfile/apps/opendesk-openproject-bootstrap/values.yaml.gotmpl
+++ b/helmfile/apps/opendesk-openproject-bootstrap/values.yaml.gotmpl
@@ -11,9 +11,6 @@ global:
  imagePullSecrets:
    {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 additionalAnnotations:
  {{ .Values.annotations.openprojectBootstrap.additional | toYaml | nindent 2 }}
 cleanup:
  deletePodsOnSuccess: {{ .Values.debug.cleanup.deletePodsOnSuccess }}
  deletePodsOnSuccessTimeout: {{ .Values.debug.cleanup.deletePodsOnSuccessTimeout }}
@@ -75,9 +72,6 @@ image:
 job:
  enabled: true
 podAnnotations:
  {{ .Values.annotations.openprojectBootstrap.pod | toYaml | nindent 2 }}
 podSecurityContext:
  enabled: true
  fsGroup: 1000
--- a/helmfile/apps/opendesk-services/values-home.yaml.gotmpl
+++ b/helmfile/apps/opendesk-services/values-home.yaml.gotmpl
@@ -3,9 +3,6 @@ SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlic
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 additionalAnnotations:
  {{ .Values.annotations.opendeskServicesHome.additional | toYaml | nindent 2 }}
 global:
  domain: {{ .Values.global.domain | quote }}
  hosts:
@@ -15,6 +12,4 @@ ingress:
  ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
  tls:
    secretName: {{ .Values.ingress.tls.secretName | quote }}
  annotations:
    {{ .Values.annotations.opendeskServicesHome.ingress | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl
+++ b/helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl
@@ -10,9 +10,6 @@ global:
  imagePullSecrets:
    {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 additionalAnnotations:
  {{ .Values.annotations.opendeskServicesStaticFiles.additional | toYaml | nindent 2 }}
 assets:
  element:
    subdomain: {{ .Values.global.hosts.element }}
@@ -99,8 +96,6 @@ ingress:
  host: "{{ .Values.global.hosts.static }}.{{ .Values.global.domain }}"
  tls:
    secretName: {{ .Values.ingress.tls.secretName | quote }}
  annotations:
    {{ .Values.annotations.opendeskServicesStaticFiles.ingress | toYaml | nindent 4 }}
 image:
  registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.opendeskStaticFiles.registry | quote }}
@@ -108,8 +103,6 @@ image:
  tag: {{ .Values.images.opendeskStaticFiles.tag | quote }}
  imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 podAnnotations:
  {{ .Values.annotations.opendeskServicesStaticFiles.pod | toYaml | nindent 2 }}
 podSecurityContext:
  enabled: true
@@ -123,11 +116,4 @@ resources:
 service:
  type: "ClusterIP"
  annotations:
    {{ .Values.annotations.opendeskServicesStaticFiles.service | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.opendeskServicesStaticFiles.serviceAccount | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/opendesk-services/values-otterize.yaml.gotmpl
+++ b/helmfile/apps/opendesk-services/values-otterize.yaml.gotmpl
@@ -8,9 +8,6 @@ global:
  hosts:
    {{ .Values.global.hosts | toYaml | nindent 4 }}
 additionalAnnotations:
  {{ .Values.annotations.opendeskServicesOtterize.additional | toYaml | nindent 2 }}
 apps:
  clamavDistributed:
    enabled: {{ .Values.apps.clamavDistributed.enabled }}
--- a/helmfile/apps/openproject/values.yaml.gotmpl
+++ b/helmfile/apps/openproject/values.yaml.gotmpl
@@ -131,8 +131,7 @@ memcached:
 persistence:
  enabled: false
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.openproject.pod | toYaml | nindent 2 }}
 postgresql:
  bundled: false
@@ -180,12 +179,6 @@ openproject:
      login: "opendesk_username"
      admin: "openproject_admin"
  useTmpVolumes: true
  tmpVolumesAnnotations:
    {{ .Values.annotations.openproject.openprojectTempVolumes | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.openproject.serviceAccount | toYaml | nindent 4 }}
 ingress:
  annotations:
@@ -195,9 +188,6 @@ ingress:
    nginx.org/client-max-body-size: "{{ .Values.ingress.parameters.bodySize.openproject }}"
    nginx.org/proxy-read-timeout: "{{ .Values.ingress.parameters.bodyTimeout.openproject }}s"
    nginx.org/proxy-send-timeout: "{{ .Values.ingress.parameters.bodyTimeout.openproject }}s"
    {{- with .Values.annotations.openproject.ingress }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  host: "{{ .Values.global.hosts.openproject }}.{{ .Values.global.domain }}"
  enabled: {{ .Values.ingress.enabled }}
  ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
@@ -231,9 +221,6 @@ seederJob:
    intents.otterize.com/service-name: "openproject-seeder"
    argocd.argoproj.io/hook: "Sync"
    argocd.argoproj.io/hook-delete-policy: "HookSucceeded"
    {{- with .Values.annotations.openproject.seederJob }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  resources:
    {{ .Values.resources.openprojectSeederJob | toYaml | nindent 4 }}
--- a/helmfile/apps/services-external/values-cassandra.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-cassandra.yaml.gotmpl
@@ -33,10 +33,6 @@ image:
  tag: {{ .Values.images.cassandra.tag | quote }}
  pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 ingress:
  annotations:
    {{ .Values.annotations.cassandra.ingress | toYaml | nindent 6 }}
 initDB:
  initUserData.cql: >
    CREATE KEYSPACE IF NOT EXISTS {{ .Values.databases.dovecotDictmap.name | quote }} WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
@@ -74,8 +70,7 @@ persistence:
  size: {{ .Values.persistence.storages.cassandra.size | quote }}
  storageClass: {{ coalesce .Values.persistence.storages.cassandra.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.cassandra.pod | toYaml | nindent 2 }}
 podSecurityContext:
  enabled: true
@@ -97,10 +92,6 @@ replicaCount: {{ .Values.replicas.cassandra }}
 resources:
  {{ .Values.resources.cassandra | toYaml | nindent 2 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.cassandra.serviceAccount | toYaml | nindent 4 }}
 startupProbe:
  enabled: false
  initialDelaySeconds: 0
--- a/helmfile/apps/services-external/values-clamav-distributed.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-clamav-distributed.yaml.gotmpl
@@ -5,8 +5,6 @@ SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 clamd:
  commonAnnotations:
    {{ .Values.annotations.servicesExternalClamavDistributed.clamdCommon | toYaml | nindent 4 }}
  containerSecurityContext:
    allowPrivilegeEscalation: false
    capabilities:
@@ -27,8 +25,7 @@ clamd:
    repository: {{ .Values.images.clamd.repository | quote }}
    tag: {{ .Values.images.clamd.tag | quote }}
    imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-  podAnnotations:
+  podAnnotations: {}
    {{ .Values.annotations.servicesExternalClamavDistributed.clamdPod | toYaml | nindent 4 }}
  podSecurityContext:
    enabled: true
    fsGroup: 101
@@ -36,13 +33,6 @@ clamd:
  replicaCount: {{ .Values.replicas.clamd }}
  resources:
    {{ .Values.resources.clamd | toYaml | nindent 4 }}
  service:
    annotations:
      {{ .Values.annotations.servicesExternalClamavDistributed.clamdService | toYaml | nindent 6 }}
  serviceAccount:
    annotations:
      {{ .Values.annotations.servicesExternalClamavDistributed.clamdServiceAccount | toYaml | nindent 6 }}
 containerSecurityContext:
  allowPrivilegeEscalation: false
@@ -60,8 +50,6 @@ containerSecurityContext:
    {{ .Values.seLinuxOptions.clamav | toYaml | nindent 4 }}
 freshclam:
  commonAnnotations:
    {{ .Values.annotations.servicesExternalClamavDistributed.freshclamCommon | toYaml | nindent 4 }}
  containerSecurityContext:
    allowPrivilegeEscalation: false
    capabilities:
@@ -82,8 +70,7 @@ freshclam:
    repository: {{ .Values.images.freshclam.repository | quote }}
    tag: {{ .Values.images.freshclam.tag | quote }}
    imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-  podAnnotations:
+  podAnnotations: {}
    {{ .Values.annotations.servicesExternalClamavDistributed.freshclamPod | toYaml | nindent 4 }}
  podSecurityContext:
    enabled: true
    fsGroup: 101
@@ -91,9 +78,6 @@ freshclam:
  replicaCount: {{ .Values.replicas.freshclam }}
  resources:
    {{ .Values.resources.freshclam | toYaml | nindent 4 }}
  serviceAccount:
    annotations:
      {{ .Values.annotations.servicesExternalClamavDistributed.freshclamServiceAccount | toYaml | nindent 6 }}
  settings:
    database:
      auth:
@@ -108,8 +92,6 @@ global:
    {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 icap:
  commonAnnotations:
    {{ .Values.annotations.servicesExternalClamavDistributed.icapCommon | toYaml | nindent 4 }}
  containerSecurityContext:
    allowPrivilegeEscalation: false
    capabilities:
@@ -130,8 +112,7 @@ icap:
    repository: {{ .Values.images.icap.repository | quote }}
    tag: {{ .Values.images.icap.tag | quote }}
    imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-  podAnnotations:
+  podAnnotations: {}
    {{ .Values.annotations.servicesExternalClamavDistributed.icapPod | toYaml | nindent 4 }}
  podSecurityContext:
    enabled: true
    fsGroup: 101
@@ -139,17 +120,8 @@ icap:
  replicaCount: {{ .Values.replicas.icap }}
  resources:
    {{ .Values.resources.icap | toYaml | nindent 4 }}
  service:
    annotations:
      {{ .Values.annotations.servicesExternalClamavDistributed.icapService | toYaml | nindent 6 }}
  serviceAccount:
    annotations:
      {{ .Values.annotations.servicesExternalClamavDistributed.icapServiceAccount | toYaml | nindent 6 }}
 milter:
  commonAnnotations:
    {{ .Values.annotations.servicesExternalClamavDistributed.milterCommon | toYaml | nindent 4 }}
  containerSecurityContext:
    allowPrivilegeEscalation: false
    capabilities:
@@ -170,8 +142,7 @@ milter:
    repository: {{ .Values.images.milter.repository | quote }}
    tag: {{ .Values.images.milter.tag | quote }}
    imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-  podAnnotations:
+  podAnnotations: {}
    {{ .Values.annotations.servicesExternalClamavDistributed.milterPod | toYaml | nindent 4 }}
  podSecurityContext:
    enabled: true
    fsGroup: 101
@@ -179,17 +150,8 @@ milter:
  replicaCount: {{ .Values.replicas.milter }}
  resources:
    {{ .Values.resources.milter | toYaml | nindent 4 }}
  service:
    annotations:
      {{ .Values.annotations.servicesExternalClamavDistributed.milterService | toYaml | nindent 6 }}
  serviceAccount:
    annotations:
      {{ .Values.annotations.servicesExternalClamavDistributed.milterServiceAccount | toYaml | nindent 6 }}
 persistence:
  size: {{ .Values.persistence.storages.clamav.size | quote }}
  storageClass: {{ coalesce .Values.persistence.storages.clamav.storageClassName .Values.persistence.storageClassNames.RWX | quote }}
  annotations:
    {{ .Values.annotations.servicesExternalClamavDistributed.persistence | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/services-external/values-clamav-simple.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-clamav-simple.yaml.gotmpl
@@ -4,9 +4,6 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 commonAnnotations:
  {{ .Values.annotations.servicesExternalClamavSimple.common | toYaml | nindent 2 }}
 containerSecurityContext:
  allowPrivilegeEscalation: false
  capabilities:
@@ -42,11 +39,8 @@ image:
 persistence:
  size: {{ .Values.persistence.storages.clamav.size | quote }}
  storageClass: {{ coalesce .Values.persistence.storages.clamav.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
  annotations:
    {{ .Values.annotations.servicesExternalClamavSimple.persistence | toYaml | nindent 4 }}
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.servicesExternalClamavSimple.pod | toYaml | nindent 2 }}
 podSecurityContext:
  enabled: true
@@ -68,13 +62,4 @@ settings:
        url: {{ .Values.repositories.clamav.mirror.url | quote }}
      customURLs:
        {{ .Values.repositories.clamav.customURLs | toYaml | nindent 8 }}
 service:
  annotations:
    {{ .Values.annotations.servicesExternalClamavSimple.service | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.servicesExternalClamavSimple.serviceAccount | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/services-external/values-dkimpy.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-dkimpy.yaml.gotmpl
@@ -4,9 +4,6 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 additionalAnnotations:
  {{ .Values.annotations.servicesExternalDkimpy.additional | toYaml | nindent 2 }}
 containerSecurityContext:
  allowPrivilegeEscalation: true
  capabilities: {}
@@ -31,9 +28,6 @@ image:
  tag: {{ .Values.images.dkimpy.tag | quote }}
  imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 podAnnotations:
  {{ .Values.annotations.servicesExternalDkimpy.service | toYaml | nindent 2 }}
 podSecurityContext:
  enabled: true
  fsGroup: 1000
@@ -50,13 +44,4 @@ replicaCount: {{ .Values.replicas.dkimpy }}
 resources:
  {{ .Values.resources.dkimpy | toYaml | nindent 2 }}
 service:
  annotations:
    {{ .Values.annotations.servicesExternalDkimpy.service | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.servicesExternalDkimpy.serviceAccount | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/services-external/values-mariadb.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-mariadb.yaml.gotmpl
@@ -8,9 +8,6 @@ cleanup:
  deletePodsOnSuccess: {{ .Values.debug.cleanup.deletePodsOnSuccess }}
  deletePodsOnSuccessTimeout: {{ .Values.debug.cleanup.deletePodsOnSuccessTimeout }}
 commonAnnotations:
  {{ .Values.annotations.servicesExternalMariadb.common | toYaml | nindent 2 }}
 containerSecurityContext:
  allowPrivilegeEscalation: false
  capabilities:
@@ -76,15 +73,10 @@ mariadb:
 persistence:
  size: {{ .Values.persistence.storages.mariadb.size | quote }}
  storageClass: {{ coalesce .Values.persistence.storages.mariadb.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
  annotations:
    {{ .Values.annotations.servicesExternalMariadb.persistence | toYaml | nindent 4 }}
 podAnnotations:
  argocd.argoproj.io/hook: "PostSync"
  argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation"
  {{- with .Values.annotations.servicesExternalMariadb.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  enabled: true
@@ -96,12 +88,4 @@ replicaCount: {{ .Values.replicas.mariadb }}
 resources:
  {{ .Values.resources.mariadb | toYaml | nindent 2 }}
 service:
  annotations:
    {{ .Values.annotations.servicesExternalMariadb.service | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.servicesExternalMariadb.serviceAccount | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/services-external/values-memcached.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-memcached.yaml.gotmpl
@@ -6,9 +6,6 @@ SPDX-License-Identifier: Apache-2.0
 ---
 architecture: {{ if gt .Values.replicas.memcached 1 }}"high-availability"{{ else }}"standalone"{{ end }}
 commonAnnotations:
  {{ .Values.annotations.servicesExternalMemcached.common | toYaml | nindent 2 }}
 containerSecurityContext:
  allowPrivilegeEscalation: false
  capabilities:
@@ -35,21 +32,13 @@ image:
  tag: {{ .Values.images.memcached.tag | quote }}
  pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.servicesExternalMemcached.pod | toYaml | nindent 2 }}
 replicaCount: {{ .Values.replicas.memcached }}
 resources:
  {{ .Values.resources.memcached | toYaml | nindent 2 }}
 service:
  annotations:
    {{ .Values.annotations.servicesExternalMemcached.service | toYaml | nindent 4 }}
 serviceAccount:
  create: true
  annotations:
    {{ .Values.annotations.servicesExternalMemcached.serviceAccount | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/services-external/values-minio.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-minio.yaml.gotmpl
@@ -15,16 +15,10 @@ apiIngress:
  annotations:
    nginx.ingress.kubernetes.io/proxy-body-size: "4G"
    nginx.org/client-max-body-size: "4G"
    {{- with .Values.annotations.servicesExternalMinio.apiIngress }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
 auth:
  rootPassword: {{ .Values.secrets.minio.rootPassword | quote }}
 commonAnnotations:
  {{ .Values.annotations.servicesExternalMinio.common | toYaml | nindent 2 }}
 containerSecurityContext:
  enabled: true
  allowPrivilegeEscalation: false
@@ -72,9 +66,6 @@ ingress:
      secretName: "{{ .Values.ingress.tls.secretName }}"
  annotations:
    nginx.org/websocket-services: "minio"
    {{- with .Values.annotations.servicesExternalMinio.ingress }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
 {{- end }}
 livenessProbe:
@@ -101,8 +92,6 @@ podSecurityContext:
 persistence:
  size: {{ .Values.persistence.storages.minio.size | quote }}
  storageClass: {{ coalesce .Values.persistence.storages.minio.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
  annotations:
    {{ .Values.annotations.servicesExternalMinio.persistence | toYaml | nindent 4 }}
 provisioning:
  enabled: true
@@ -132,8 +121,6 @@ provisioning:
      versioning: "Suspended"
      withLock: false
    {{- end }}
  podAnnotations:
    {{ .Values.annotations.servicesExternalMinio.provisioningPod | toYaml | nindent 4 }}
  policies:
    - name: "migrations-bucket-policy"
      statements:
@@ -251,8 +238,7 @@ provisioning:
  resources:
    {{ .Values.resources.minio | toYaml | nindent 4 }}
-podAnnotations:
+podAnnotations: {}
  {{ .Values.annotations.servicesExternalMinio.pod | toYaml | nindent 2 }}
 readinessProbe:
  enabled: true
@@ -263,17 +249,6 @@ readinessProbe:
 resources:
  {{ .Values.resources.minio | toYaml | nindent 2 }}
 service:
  annotations:
    {{ .Values.annotations.servicesExternalMinio.serviceService | toYaml | nindent 4 }}
  headless:
    annotations:
      {{ .Values.annotations.servicesExternalMinio.serviceHeadless | toYaml | nindent 6 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.servicesExternalMinio.serviceAccount | toYaml | nindent 4 }}
 startupProbe:
  enabled: true
  periodSeconds: 10
--- a/helmfile/apps/services-external/values-postfix.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-postfix.yaml.gotmpl
@@ -9,9 +9,6 @@ certificate:
  request:
    enabled: false
 commonAnnotations:
  {{ .Values.annotations.servicesExternalPostfix.common | toYaml | nindent 2 }}
 containerSecurityContext:
  allowPrivilegeEscalation: true
  capabilities: {}
@@ -39,11 +36,6 @@ image:
 persistence:
  size: {{ .Values.persistence.storages.postfix.size | quote }}
  storageClass: {{ coalesce .Values.persistence.storages.postfix.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
  annotations:
    {{ .Values.annotations.servicesExternalPostfix.persistence | toYaml | nindent 4 }}
 podAnnotations:
  {{ .Values.annotations.servicesExternalPostfix.pod | toYaml | nindent 2 }}
 podSecurityContext:
  enabled: true
@@ -66,7 +58,6 @@ postfix:
  rspamdHost: ""
  relayHost: {{ if .Values.smtp.host }}{{ printf "[%s]:%d" .Values.smtp.host .Values.smtp.port | quote }}{{ else }}""{{ end }}
  relayNets: {{ join " " .Values.cluster.networking.cidr | quote }}
  allowRelayNets: true
  smtpSASLAuthEnable: "yes"
  smtpSASLPasswordMaps: "lmdb:/etc/postfix/sasl_passwd.map"
  smtpTLSSecurityLevel: "encrypt"
@@ -96,7 +87,7 @@ postfix:
  {{- end }}
  # Only deliver mail to Dovecot, if it is available
  {{- if .Values.apps.oxAppSuite.enabled }}
-  virtualMailboxDomains: {{ toYaml (prepend .Values.global.additionalMailDomains (.Values.global.mailDomain | default .Values.global.domain) | uniq) | nindent 4 }}
+  virtualMailboxDomains: {{ if .Values.global.additionalMailDomains }}{{ printf "%s,%s" (.Values.global.mailDomain | default .Values.global.domain) .Values.global.additionalMailDomains }}{{ else }}{{ .Values.global.mailDomain | default .Values.global.domain | quote }}{{ end }}
  virtualTransport: "lmtps:dovecot:24"
  {{- end }}
@@ -108,12 +99,6 @@ resources:
  {{ .Values.resources.postfix | toYaml | nindent 2 }}
 service:
  annotations:
    {{ .Values.annotations.servicesExternalPostfix.service | toYaml | nindent 4 }}
  external:
    enabled: false
 serviceAccount:
  annotations:
    {{ .Values.annotations.servicesExternalPostfix.serviceAccount | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/services-external/values-postgresql.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-postgresql.yaml.gotmpl
@@ -8,9 +8,6 @@ cleanup:
  deletePodsOnSuccess: {{ .Values.debug.cleanup.deletePodsOnSuccess }}
  deletePodsOnSuccessTimeout: {{ .Values.debug.cleanup.deletePodsOnSuccessTimeout }}
 commonAnnotations:
  {{ .Values.annotations.servicesExternalPostgresql.common | toYaml | nindent 2 }}
 containerSecurityContext:
  allowPrivilegeEscalation: false
  capabilities:
@@ -113,15 +110,10 @@ job:
 persistence:
  size: {{ .Values.persistence.storages.postgresql.size | quote }}
  storageClass: {{ coalesce .Values.persistence.storages.postgresql.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
  annotations:
    {{ .Values.annotations.servicesExternalPostgresql.persistence | toYaml | nindent 4 }}
 podAnnotations:
  argocd.argoproj.io/hook: "PostSync"
  argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation"
  {{- with .Values.annotations.servicesExternalPostgresql.pod}}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 postgres:
  user: "postgres"
@@ -129,13 +121,4 @@ postgres:
 resources:
  {{ .Values.resources.postgresql | toYaml | nindent 2 }}
 service:
  annotations:
    {{ .Values.annotations.servicesExternalPostgresql.service | toYaml | nindent 4 }}
 serviceAccount:
  annotations:
    {{ .Values.annotations.servicesExternalPostgresql.serviceAccount | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/services-external/values-redis.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-redis.yaml.gotmpl
@@ -9,9 +9,6 @@ architecture: "standalone"
 auth:
  password: {{ .Values.secrets.redis.password | quote }}
 commonAnnotations:
  {{ .Values.annotations.servicesExternalRedis.common | toYaml | nindent 2 }}
 global:
  imagePullSecrets:
    {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
@@ -24,8 +21,6 @@ image:
  pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 master:
  annotations:
    {{ .Values.annotations.servicesExternalRedis.masterMaster | toYaml | nindent 4 }}
  containerSecurityContext:
    privileged: false
    readOnlyRootFilesystem: true
@@ -43,40 +38,13 @@ master:
  count: {{ .Values.replicas.redis }}
  persistence:
    size: {{ .Values.persistence.storages.redis.size | quote }}
-    annotations:
+  podAnnotations: {}
      {{ .Values.annotations.servicesExternalRedis.masterPersistence | toYaml | nindent 6 }}
  podAnnotations:
    {{ .Values.annotations.servicesExternalRedis.masterPod | toYaml | nindent 4 }}
  resources:
    {{ .Values.resources.redis | toYaml | nindent 4 }}
  service:
    annotations:
      {{ .Values.annotations.servicesExternalRedis.masterService | toYaml | nindent 6 }}
  serviceAccount:
    annotations:
      {{ .Values.annotations.servicesExternalRedis.masterServiceAccount | toYaml | nindent 6 }}
 metrics:
  enabled: false
 replica:
  annotations:
    {{ .Values.annotations.servicesExternalRedis.replicaReplica | toYaml | nindent 4 }}
  persistence:
    annotations:
      {{ .Values.annotations.servicesExternalRedis.replicaPersistence | toYaml | nindent 6 }}
  podAnnotations:
    {{ .Values.annotations.servicesExternalRedis.replicaPod | toYaml | nindent 4 }}
  service:
    annotations:
      {{ .Values.annotations.servicesExternalRedis.replicaService | toYaml | nindent 6 }}
  serviceAccount:
    annotations:
      {{ .Values.annotations.servicesExternalRedis.replicaServiceAccount | toYaml | nindent 6 }}
 secretAnnotations:
  {{ .Values.annotations.servicesExternalRedis.secret | toYaml | nindent 2 }}
 sentinel:
  enabled: false
--- a/helmfile/apps/xwiki/values.yaml.gotmpl
+++ b/helmfile/apps/xwiki/values.yaml.gotmpl
@@ -4,9 +4,6 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 commonAnnotations:
  {{ .Values.annotations.xwiki.common | toYaml | nindent 2 }}
 image:
  {{- if eq .Values.databases.xwiki.type "mariadb" }}
  name: "{{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.xwikiMariadb.registry }}/{{ .Values.images.xwikiMariadb.repository }}"
@@ -132,9 +129,6 @@ ingress:
    nginx.org/proxy-read-timeout: "{{ .Values.ingress.parameters.bodyTimeout.xwiki }}s"
    nginx.org/proxy-send-timeout: "{{ .Values.ingress.parameters.bodyTimeout.xwiki }}s"
    haproxy-ingress.github.io/headers: "X-Forwarded-Host {{ .Values.global.hosts.xwiki }}.{{ .Values.global.domain }}"
    {{- with .Values.annotations.xwiki.ingress }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  hosts:
    - host: "{{ .Values.global.hosts.xwiki }}.{{ .Values.global.domain }}"
      paths:
@@ -155,8 +149,6 @@ mysql:
  enabled: false
 persistence:
  annotations:
    {{ .Values.annotations.xwiki.persistence | toYaml | nindent 4 }}
  size: {{ .Values.persistence.storages.xwiki.size | quote }}
  storageClass: {{ coalesce .Values.persistence.storages.xwiki.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
@@ -225,15 +217,9 @@ resources:
  {{ .Values.resources.xwiki | toYaml | nindent 2 }}
 service:
  annotations:
    {{ .Values.annotations.xwiki.service | toYaml | nindent 4 }}
  externalPort: 80
  enabled: true
 serviceAccount:
  annotations:
    {{ .Values.annotations.xwiki.serviceAccount | toYaml | nindent 4 }}
 volumePermissions:
  enabled: true
--- a/helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl
+++ b/helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl
@@ -6,7 +6,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "zendis/opendesk-enterprise/components/product-development/charts/opendesk-dovecot-pro"
    name: "dovecot"
-    version: "3.0.0"
+    version: "2.0.2"
    verify: true
  oxAppSuite:
    registry: "registry.opencode.de"
--- a/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl
+++ b/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl
@@ -5,7 +5,7 @@ images:
  collabora:
    registry: "registry.opencode.de"
    repository: "zendis/opendesk-enterprise/components/supplier/collabora/images/collabora-online-for-opendesk"
-    tag: "24.04.13.3.1@sha256:7e9b63972415a5a8006ec6b7e904c2d78d9af467218ead7e578d0c8a5691f0bc"
+    tag: "24.04.12.4.1@sha256:af4d4d0e743c71f7995e81cb081d0e1db79d016b0c50169480096f70b4b42f85"
  dovecot:
    registry: "registry.opencode.de"
    repository: "zendis/opendesk-enterprise/components/supplier/open-xchange/images-mirror/dovecot-pro"
@@ -13,9 +13,9 @@ images:
  nextcloud:
    registry: "registry.opencode.de"
    repository: "zendis/opendesk-enterprise/components/supplier/nextcloud/images/opendesk-nextcloud"
-    tag: "1.2.0@sha256:ddd2bec74a22a713967f62fcdcf18fa8d53d730c1db296d570143754c93d20a5"
+    tag: "1.1.9@sha256:ad28c9dd8cdb4bdd325fe132215d0cf094392c3ddd1f114707b09bb7d1c61a9e"
  openxchangeCoreMW:
    registry: "registry.opencode.de"
-    repository: "zendis/opendesk-enterprise/components/supplier/open-xchange/images-mirror/middleware-public-sector-pro"
+    repository: "zendis/opendesk-enterprise/components/supplier/open-xchange/images-mirror/core-mw"
    tag: "8.35.85@sha256:54d01a16ea29a3ae8f1857e5bdf6d2e34046b8a3fa3d6179bb3ad3d047e1318f"
 ...
--- a/helmfile/environments/default/annotations.yaml.gotmpl
+++ b/helmfile/environments/default/annotations.yaml.gotmpl
@@ -1,440 +0,0 @@
 # SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
 # SPDX-License-Identifier: Apache-2.0
 ---
 annotations:
  cassandra:
    ingress: ~
    pod: ~
    serviceAccount: ~
  coco:
    ingress: ~
    pod: ~
    serviceAccount: ~
  collabora:
    ingress: ~
    pod: ~
    service: ~
    serviceAccount: ~
  cryptpad:
    ingress: ~
    pod: ~
    serviceAccount: ~
  element:
    common: ~
    ingress: ~
    pod: ~
    service: ~
    serviceAccount: ~
  elementMatrixNeoboardWidget:
    additional: ~
    ingress: ~
    pod: ~
    service: ~
    serviceAccount: ~
  elementMatrixNeochoiceWidget:
    additional: ~
    ingress: ~
    pod: ~
    service: ~
    serviceAccount: ~
  elementMatrixNeodatefixBot:
    additional: ~
    ingress: ~
    persistence: ~
    pod: ~
    service: ~
    serviceAccount: ~
  elementMatrixNeodatefixBotBootstrap:
    pod: ~
    serviceAccount: ~
  elementMatrixNeodatefixWidget:
    additional: ~
    ingress: ~
    pod: ~
    service: ~
    serviceAccount: ~
  elementMatrixUserVerificationService:
    additional: ~
    pod: ~
    service: ~
    serviceAccount: ~
  elementMatrixUserVerificationServiceBootstrap:
    pod: ~
    serviceAccount: ~
  elementSynapse:
    common: ~
    federationIngress: ~
    persistence: ~
    pod: ~
    service: ~
    serviceAccount: ~
  elementSynapseWeb:
    common: ~
    ingress: ~
    pod: ~
    service: ~
    serviceAccount: ~
  elementWellKnown:
    common: ~
    ingress: ~
    pod: ~
    service: ~
    serviceAccount: ~
  jitsi:
    pod: ~
    serviceAccount: ~
  jitsiGlobal:
    pod: ~
  jitsiJibri:
    pod: ~
  jitsiJicofo:
    pod: ~
  jitsiJigasi:
    pod: ~
  jitsiJitsiPatchJVB:
    serviceAccount: ~
  jitsiJvb:
    pod: ~
    service: ~
    metricsPrometheus: ~
    metricsGrafana: ~
  jitsiProsody:
    pod: ~
  jitsiWeb:
    ingress: ~
    pod: ~
  nextcloudAio:
    additional: ~
    ingress: ~
    pod: ~
    service: ~
    serviceAccount: ~
  nextcloudExporter:
    additional: ~
    ingress: ~
    pod: ~
    serviceAccount: ~
  nextcloudNextcloudMgmt:
    additional: ~
    pod: ~
    serviceAccount: ~
  notes:
    ingressAdmin: ~
    ingressCollaborationWS: ~
    ingressCollaborationAPI: ~
    ingressMedia: ~
    serviceMedia: ~
  notesBackend:
    migrateJob: ~
    pod: ~
    service: ~
  notesFrontend:
    pod: ~
    service: ~
  notesYProvider:
    pod: ~
    service: ~
  nubus:
    additional: ~
    ingress: ~
  nubusGuardian:
    authorizationApiPod: ~
    globalPod: ~
    ingressIngress: ~
    ingressManagementUi: ~
    ingressManagementApi: ~
    ingressAuthorizationApi: ~
    managementApiPod: ~
    managementUiPod: ~
    serviceAccount: ~
  nubusIntercomService:
    additional: ~
    ingress: ~
    pod: ~
    service: ~
    serviceAccount: ~
  nubusKeycloak:
    common: ~
    pod: ~
    service: ~
    serviceAccount: ~
  nubusKeycloakBootstrap:
    additional: ~
    pod: ~
    service: ~
    serviceAccount: ~
  nubusKeycloakBootstrapNubus:
    additional: ~
    pod: ~
    serviceAccount: ~
  nubusKeycloakExtensions:
    handlerAdditional: ~
    handlerPod: ~
    handlerService: ~
    handlerServiceAccount: ~
    proxyAdditional: ~
    proxyIngress: ~
    proxyPod: ~
    proxyService: ~
    proxyServiceAccount: ~
  nubusLdapNotifier:
    additional: ~
    pod: ~
    service: ~
    serviceAccount: ~
  nubusLdapServer:
    additional: ~
    pod: ~
    service: ~
    serviceAccount: ~
  nubusNotificationsApi:
    additional: ~
    ingress: ~
    persistence: ~
    pod: ~
    service: ~
    serviceAccount: ~
  nubusOxConnector:
    pod: ~
    serviceAccount: ~
  nubusPortalConsumer:
    pod: ~
  nubusPortalFrontend:
    additional: ~
    ingressIngress: ~
    ingressRewrites: ~
    ingressRedirects: ~
    persistence: ~
    pod: ~
    service: ~
    serviceAccount: ~
  nubusPortalServer:
    additional: ~
    ingress: ~
    persistence: ~
    pod: ~
    service: ~
    serviceAccount: ~
  nubusProvisioning:
    additional: ~
    apiAdditional: ~
    apiPod: ~
    dispatcherAdditional: ~
    dispatcherPod: ~
    natsAdditional: ~
    natsPod: ~
    udmTransformerAdditional: ~
    udmTransformerPod: ~
    pod: ~
    prefillAdditional: ~
    prefillPod: ~
    registerConsumersAdditional: ~
    registerConsumersPod: ~
    service: ~
    serviceAccount: ~
  nubusNginxS3Gateway:
    additional: ~
    ingress: ~
    pod: ~
    service: ~
    serviceAccount: ~
  nubusSelfserviceConsumer:
    pod: ~
    serviceAccount: ~
  nubusStackDataUms:
    additional: ~
    pod: ~
    serviceAccount: ~
  nubusUdmListener:
    pod: ~
    serviceAccount: ~
  nubusUdmRestApi:
    additional: ~
    ingress: ~
    persistence: ~
    pod: ~
    service: ~
    serviceAccount: ~
  nubusUmcGateway:
    ingress: ~
    pod: ~
    serviceAccount: ~
  nubusUmcServer:
    additional: ~
    ingress: ~
    pod: ~
    serviceAccount: ~
  opendeskMigrationsPost:
    additional: ~
    pod: ~
    serviceAccount: ~
  opendeskMigrationsPre:
    additional: ~
    pod: ~
    serviceAccount: ~
  opendeskServicesHome:
    additional: ~
    ingress: ~
  opendeskServicesOtterize:
    additional: ~
  opendeskServicesStaticFiles:
    additional: ~
    ingress: ~
    pod: ~
    service: ~
    serviceAccount: ~
  openproject:
    ingress: ~
    pod: ~
    openprojectTempVolumes: ~
    serviceAccount: ~
    seederJob: ~
  openprojectBootstrap:
    additional: ~
    pod: ~
  openxchangeAppsuiteCoreDocumentconverter:
    pod: ~
  openxchangeAppsuiteCoreGuidedtours:
    pod: ~
  openxchangeAppsuiteCoreImageconverter:
    pod: ~
  openxchangeAppsuiteCoreUi:
    pod: ~
  openxchangeAppsuiteCoreUiMiddleware:
    pod: ~
  openxchangeAppsuiteCoreMw:
    gotenbergPod: ~
    pod: ~
    serviceAccount: ~
    updatePod: ~
  openxchangeAppsuiteCoreUserGuide:
    pod: ~
  openxchangeAppsuiteIngress:
    appsuitebase: ~
    ingress: ~
    rootredirect: ~
    trailslash: ~
    restRoutesAdmin: ~
    restRoutesAdvertisement: ~
    restRoutesChronos: ~
    restRoutesPreliminary: ~
    restRoutesUserfeedback: ~
    staticRoutesServlet: ~
    staticRoutesRealtime: ~
    staticRoutesInfostore: ~
    staticRoutesWebservices: ~
    driveClientWindowsOxRoute: ~
    guardApiRoute: ~
    guardSupportApiRoute: ~
    guardPgpRoute: ~
    httpApiRoutesApi: ~
    httpApiRoutesAjax: ~
    httpApiRoutesAppsuiteApi: ~
    httpApiRoutesAppRootApi: ~
    rt2Route: ~
    documentsHelpRoute: ~
    driveHelpRoute: ~
    coreHelpRoute: ~
    officeWebRoute: ~
    caldavWellKnownRedirect: ~
    carddavWellKnownRedirect: ~
    davInfostoreRoute: ~
    davRootRoute: ~
    wopiServerRoute: ~
  openxchangeBootstrap:
    additional: ~
    serviceAccount: ~
  openxchangeDovecot:
    common: ~
    persistence: ~
    pod: ~
    service: ~
    serviceAccount: ~
  openxchangeEnterpriseContactPicker:
    appsuiteCoreMw:
    appsuiteCoreMwPod: ~
    appsuiteCoreMwServiceAccount: ~
  openxchangeNextcloudIntegrationUi:
    pod: ~
  openxchangePostfix:
    pod: ~
    service: ~
  openxchangePublicSectorUi:
    pod: ~
  servicesExternalClamavDistributed:
    clamdCommon: ~
    clamdPod: ~
    clamdService: ~
    clamdServiceAccount: ~
    freshclamCommon: ~
    freshclamService: ~
    freshclamServiceAccount: ~
    milterCommon: ~
    milterPod: ~
    milterService: ~
    milterServiceAccount: ~
    persistence: ~
  servicesExternalClamavSimple:
    common: ~
    persistence: ~
    pod: ~
    service: ~
    serviceAccount: ~
  servicesExternalDkimpy:
    additional: ~
    pod: ~
    service: ~
    serviceAccount: ~
  servicesExternalMariadb:
    common: ~
    persistence: ~
    pod: ~
    service: ~
    serviceAccount: ~
  servicesExternalMemcached:
    common: ~
    pod: ~
    service: ~
    serviceAccount: ~
  servicesExternalMinio:
    apiIngress: ~
    common:
    ingress: ~
    persistence: ~
    provisioningPod: ~
    pod: ~
    serviceService: ~
    serviceHeadless: ~
    serviceAccount: ~
  servicesExternalPostfix:
    common: ~
    persistence: ~
    pod: ~
    service: ~
    serviceAccount: ~
  servicesExternalPostgresql:
    common: ~
    persistence: ~
    pod: ~
    service: ~
    serviceAccount: ~
  servicesExternalRedis:
    common: ~
    masterMaster: ~
    masterPersistence: ~
    masterPod: ~
    masterService: ~
    masterServiceAccount: ~
    replicaReplica: ~
    replicaPersistence: ~
    replicaPod: ~
    replicaService: ~
    replicaServiceAccount: ~
    secret: ~
  xwiki:
    common: ~
    ingress: ~
    persistence: ~
    service: ~
    serviceAccount: ~
 ...
--- a/helmfile/environments/default/charts.yaml.gotmpl
+++ b/helmfile/environments/default/charts.yaml.gotmpl
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
 # SPDX-License-Identifier: Apache-2.0
 #
-# Please read the /docs/developer/development.md for information about structure and annotations used in this file.
+# Please read the /docs/development.md for information about structure and annotations used in this file.
 # yamllint disable rule:line-length
 ---
 charts:
@@ -56,7 +56,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/collabora/charts-mirror"
    name: "collabora-online"
-    version: "1.1.37"
+    version: "1.1.21"
    verify: true
  collaboraController:
    # Enterprise Component
@@ -99,7 +99,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-dovecot"
    name: "dovecot"
-    version: "3.0.0"
+    version: "2.0.0"
    verify: true
  element:
    # providerCategory: "Platform"
@@ -251,7 +251,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
    name: "opendesk-nextcloud"
-    version: "4.1.0"
+    version: "4.0.3"
    verify: true
  nextcloudManagement:
    # providerCategory: "Platform"
@@ -261,7 +261,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
    name: "opendesk-nextcloud-management"
-    version: "4.1.0"
+    version: "4.0.3"
    verify: true
  nginx:
    # providerCategory: "Community"
@@ -303,7 +303,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
    name: "nubus"
-    version: "1.9.1"
+    version: "1.7.0"
    verify: true
  opendeskAlerts:
    # providerCategory: "Platform"
@@ -333,7 +333,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-keycloak-bootstrap"
    name: "opendesk-keycloak-bootstrap"
-    version: "2.6.0"
+    version: "2.5.0"
    verify: true
  opendeskStaticFiles:
    # providerCategory: "Platform"
@@ -355,7 +355,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/openproject/charts-mirror"
    name: "openproject"
-    version: "9.10.1"
+    version: "9.8.3"
    verify: true
  openprojectBootstrap:
    # providerCategory: "Platform"
@@ -419,7 +419,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-postfix"
    name: "postfix"
-    version: "4.0.0"
+    version: "3.0.0"
    verify: true
  postgresql:
    # providerCategory: "Platform"
--- a/helmfile/environments/default/functional.yaml.gotmpl
+++ b/helmfile/environments/default/functional.yaml.gotmpl
@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 ---
 functional:
  admin:
    portal:
      deploymentTimestamp:
@@ -41,40 +40,6 @@ functional:
      clientSessionMaxLifespan: 0
      clientOfflineSessionIdleTimeout: 0
      clientOfflineSessionMaxLifespan: 0
    # SSO federation allows an external OIDC IdP to authenticate users within openDesk
    ssoFederation:
      # Enabling SSO federation requires an upstream IdP specific configuration in `idpDetails` below.
      enabled: false
      # When enforcing the federated login all users are immediately redirected to the federated IdP when a login
      # is requested or required.
      enforceFederatedLogin: false
      # Name of the SSO federation, if you do not enforce the login the name is shown as a login option the user can select
      # within the openDesk login dialog.
      name: "My upstream IdP"
      # Configuration details for your upstream IdP, when you configured them manually in the Keycloak UI e.g. for
      # testing the setup, you can get them from a Keycloak realm export in the `identityProviders` list.
      # Notes:
      # - You have to convert the configuration into YAML to apply it below.
      # - You have to omit the following attributes as they are either defined explicitly above or implicitly by
      #   the openDesk configuration
      #  - `displayName`
      #  - `alias`
      #  - `firstBrokerLoginFlowAlias`
      #  - `internalId`
      idpDetails: {}
  chat:
    matrix:
      profile:
        # Once connected with a user that user's Matrix ID is rarely checked by their communication partners, as the
        # display name is used to see whom they are communicating with. Not allowing users to change their
        # own display name reduces the risk of identity fraud.
        # To get the display name updated from the central identity and access management you have to have the Synapse
        # enterprise feature "groupsync" configured.
        allowUsersToUpdateDisplayname: true
        # If the LDAP entryUUID should be used for the localpart of user's Matrix IDs following setting must be `true`.
        useImmutableIdentifierForLocalpart: false
  externalServices:
    nubus:
@@ -88,16 +53,6 @@ functional:
        # List of matrix homeserver domains you want to allow federation with
        domainAllowList: []
  dataProtection:
    matrixPresence:
      # Enable to allow information about the user presence status to be shared.
      # Ref.: https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#presence
      enabled: false
    jitsiRoomHistory:
      # Disable to avoid the room history to be stored in the user's browser local storage.
      # Ref.: https://github.com/jitsi/docker-jitsi-meet/issues/898
      enabled: true
  filestore:
    quota:
      # Set the default quota for all users in GB
@@ -144,12 +99,15 @@ functional:
        versions: "auto"
        # yamllint enable rule:line-length
-  migration:
+  dataProtection:
-    oxAppSuite:
+    matrixPresence:
-      # Note: Only available in openDesk Enterprise.
+      # Enable to allow information about the user presence status to be shared.
-      # Turn on temporary for migration purposes only. Will enable master password auth in OX AppSuite and Dovecot using
+      # Ref.: https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#presence
      # `secrets.oxAppSuite.migrationsMasterPassword`.
      enabled: false
    jitsiRoomHistory:
      # Disable to avoid the room history to be stored in the user's browser local storage.
      # Ref.: https://github.com/jitsi/docker-jitsi-meet/issues/898
      enabled: true
  portal:
    # Configure if the a re-direct to the login dialogue is enforced, or if the portal is shown and the user as to actively
@@ -160,10 +118,24 @@ functional:
    # Link to the privacy statement shown in the portal menu, set to "~" if you want to remove the link
    linkPrivacyStatement: "https://zendis.de/datenschutzerklaerung"
-  weboffice:
+  chat:
-    # Set the file format to be used by default when creating new documents from the portal or the Nextcloud app.
+    matrix:
-    # You can choose between "ODF" and "OOXML".
+      profile:
-    # Ref.: https://en.wikipedia.org/wiki/Comparison_of_Office_Open_XML_and_OpenDocument
+        # Once connected with a user that user's Matrix ID is rarely checked by their communication partners, as the
-    defaultFormat: "ODF"
+        # display name is used to see whom they are communicating with. Not allowing users to change their
        # own display name reduces the risk of identity fraud.
        # To get the display name updated from the central identity and access management you have to have the Synapse
        # enterprise feature "groupsync" configured.
        allowUsersToUpdateDisplayname: true
        # If the LDAP entryUUID should be used for the localpart of user's Matrix IDs following setting must be `true`.
        useImmutableIdentifierForLocalpart: false
  migration:
    oxAppSuite:
      # Note: Only available in openDesk Enterprise.
      # Turn on temporary for migration purposes only. Will enable master password auth in OX AppSuite and Dovecot using
      # `secrets.oxAppSuite.migrationsMasterPassword`.
      enabled: false
 ...
--- a/helmfile/environments/default/global.generated.yaml.gotmpl
+++ b/helmfile/environments/default/global.generated.yaml.gotmpl
@@ -3,5 +3,5 @@
 ---
 global:
  systemInformation:
-    releaseVersion: "v1.3.3"
+    releaseVersion: "v1.2.1"
 ...
--- a/helmfile/environments/default/global.yaml.gotmpl
+++ b/helmfile/environments/default/global.yaml.gotmpl
@@ -19,7 +19,7 @@ global:
  ## Define additional mail domains, comma separated, e.g. domain1.de,domain2.de
  #
-  additionalMailDomains: []
+  additionalMailDomains: ""
  ## Define synapse host
  ## If this is unset the "domain" value above should be used in all references
--- a/helmfile/environments/default/images.yaml.gotmpl
+++ b/helmfile/environments/default/images.yaml.gotmpl
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
 # SPDX-License-Identifier: Apache-2.0
 #
-# Please read the /docs/developer/development.md for information about structure and annotations used in this file.
+# Please read the /docs/development.md for information about structure and annotations used in this file.
 ---
 images:
  bitnamiOSShell:
@@ -44,7 +44,7 @@ images:
    # upstreamRepository: "bmi/opendesk/components/supplier/collabora/images/collabora-online-for-opendesk"
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/collabora/images/collabora-online-for-opendesk"
-    tag: "24.04.13.3.1@sha256:f04a31d72b2b12b530b4e88b3ecb81eb96ebd98112515db59499ff71a4ec905f"
+    tag: "24.04.12.4.1@sha256:c794cefc3b56b13479e29626bb13e903ccc77a49163dacab1328efed69140c62"
  collaboraController:
    # Enterprise Component
    # providerCategory: "Supplier"
@@ -108,6 +108,13 @@ images:
    registry: "registry.opencode.de"
    repository: "zendis/opendesk-enterprise/components/supplier/element/images-mirror/groupsync"
    tag: "v0.14.0@sha256:a8cee92b9035d8cc80cc13194e4e0118c7dfbfcbc4c0ee5ac173582d0cd55846"
  elementHaProxy:
    # Enterprise Component
    # providerCategory: "Supplier"
    # providerResponsible: "Element"
    registry: "registry.opencode.de"
    repository: "zendis/opendesk-enterprise/components/supplier/element/images-mirror/haproxy"
    tag: "3.0-alpine@sha256:c22c8710886104a48b920306f063401f0d11811858e3c6b9d87d88a7556b2e61"
  elementPipe:
    # Enterprise Component
    # providerCategory: "Supplier"
@@ -296,7 +303,7 @@ images:
    # upstreamRepository: "bmi/opendesk/components/platform-development/images/opendesk-migrations"
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/images/opendesk-migrations"
-    tag: "1.6.1@sha256:cc97de002f5821e3b3751879514f3f45a3b4ffa851d999187c3cf3dd0dee82e7"
+    tag: "1.6.0@sha256:67ac4872f879b3ef3e27924754b3f89c6bdb158c22bd91c6c7c484aa2fed91ce"
  milter:
    # providerCategory: "Community"
    # providerResponsible: "openDesk"
@@ -320,7 +327,7 @@ images:
    # upstreamRepository: "bmi/opendesk/components/platform-development/images/opendesk-nextcloud"
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/images/opendesk-nextcloud"
-    tag: "2.5.0@sha256:9457bc2116620e52dcd1f5f12f042090aa4cca2a3e4d5f64b7c84c232ca6bb63"
+    tag: "2.4.11@sha256:2fe6e311735c706016fe7b39c8f60a6cf0f0e735761dbc60fb4cd2eedbe135c4"
  nextcloudExporter:
    # providerCategory: "Platform"
    # providerResponsible: "openDesk"
@@ -370,7 +377,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "41", "5"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/data-loader"
-    tag: "0.90.0@sha256:a776ea84ca5d4f984a1ecf1f97d8c90cd98894c3568401be6858a8e955c7ed92"
+    tag: "0.87.0@sha256:b45af938d7b0c3138054a859985e60c76c8a79caeb1dc31a6cd4189035bb07b7"
  nubusGuardianAuthorizationApi:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -410,17 +417,17 @@ images:
    # upstreamMirrorStartFrom: ["0", "3", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/guardian-init"
-    tag: "0.19.1@sha256:9030841a136d9addc37b2b62d39d80b113b824e50bd9cdcd5cf2c22bad74eeb0"
+    tag: "0.14.0@sha256:91613f123f7e46b321002d4b2b86c4635b79621376e513d4bea1bb1d01aa99f8"
  nubusKeycloak:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
    # upstreamRegistry: "https://artifacts.software-univention.de"
    # upstreamRepository: "nubus/images/keycloak"
-    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
+    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+).+$'
-    # upstreamMirrorStartFrom: ["0", "0", "1"]
+    # upstreamMirrorStartFrom: ["22", "0", "3"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/keycloak"
-    tag: "0.0.1@sha256:ce2397ac38920750b81a8a6065f7ed8a551641c6562a551963a2857fe6822beb"
+    tag: "25.0.6-ucs5@sha256:8e9df64f9b6c5ce6e5f0ae732f0aadc928e13e7166236bd16bf647b92dad22bb"
  nubusKeycloakBootstrap:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -430,7 +437,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "1", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/keycloak-bootstrap"
-    tag: "0.11.0@sha256:55ad741e01dd91bb9b0332fd602a6262d3618abdf97a86c13f1e6148b36bd242"
+    tag: "0.7.1@sha256:1675e1615732914f01f832af7347c5913af51b447f7e5ca4bdd38557d798c52e"
  nubusKeycloakExtensionHandler:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -460,7 +467,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "8", "2"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/ldap-notifier"
-    tag: "0.37.0@sha256:b148e15c268badc45db9a6ce12c97cce332d25b86e86fec47fc417b8fe74d0d2"
+    tag: "0.33.0@sha256:1aed364bff3a5ce8fe6c19e6c8914a3243f7a0684c3ea9330fc61bcb6cbe4cac"
  nubusLdapServer:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -470,7 +477,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "8", "2"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/ldap-server"
-    tag: "0.37.0@sha256:caf7de9e121e5500c52dc8338b80057acd3eaa1e3877b526a5ae944bb53fe876"
+    tag: "0.33.0@sha256:9354c79788ac48820ac781463e50f6ee315bf352b4ae384c3355124347953aa8"
  nubusLdapServerDhInitContainer:
    # providerCategory: 'Community'
    # providerResponsible: 'Univention'
@@ -488,7 +495,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "29", "1"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/ldap-server-elector"
-    tag: "0.37.0@sha256:c9580e33ea48ec5d7ab2d4816926ca1b2ef72787f7615f31b124119c376c4324"
+    tag: "0.33.0@sha256:c1304a156094b276199fb263baf93e3704ceece478d7f663061b1b1f05f5931c"
  nubusNats:
    # providerCategory: 'Community'
    # providerResponsible: 'Univention'
@@ -522,7 +529,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "9", "4"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/notifications-api"
-    tag: "0.67.0@sha256:da28ce84d97b78027eafbe0bcf8286a333efffdfc52a8abe852caed9d8cde339"
+    tag: "0.55.0@sha256:845d027becc48892314ed9bed4f2c78feaa63d632fcded2fe1cdc6458b1ba831"
  nubusOpendeskExtension:
    # providerCategory: "Platform"
    # providerResponsible: "openDesk"
@@ -530,7 +537,7 @@ images:
    # upstreamRepository: "bmi/opendesk/components/platform-development/images/opendesk-nubus"
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/images/opendesk-nubus"
-    tag: "1.14.0@sha256:66ee00b6e44276f5f1e9d7a8066352fd5772820c50c10381acfd48c97f0acf4a"
+    tag: "1.12.8@sha256:9c5e06ed459c0b5f35e511c476b982b86466760bd3fe1617aa908fdcf9e389df"
  nubusOpendeskExtensionA2gMapper:
    # providerCategory: "Platform"
    # providerResponsible: "openDesk"
@@ -568,7 +575,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "27", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-consumer"
-    tag: "0.67.1@sha256:580adf9079d27f53f6efd0c519252c7855f6907e3badc033b994165856b16126"
+    tag: "0.55.0@sha256:919b4de5d2ef27e239f1d3e944ab58dfaa3e5ef52b865a31fe465da165b03eed"
  nubusPortalExtension:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -578,7 +585,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "28", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-extension"
-    tag: "0.59.1@sha256:c9c7faa3cca2be2f45d073517a50e8a8cc89d46c978c2f3a6be3c13d0e6ae900"
+    tag: "0.55.0@sha256:6f4fff6a53ffb8be858f3a06e9832b90f773500877dd8ab0e20da82008f3d964"
  nubusPortalFrontend:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -596,7 +603,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "9", "4"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-server"
-    tag: "0.67.0@sha256:d9418c7a1db7541ced1e3034f45683c190bf63270c6ba8f3d67c1fe0ac2edb1a"
+    tag: "0.55.0@sha256:bb9d73f1a75cf50073d7f8f8cfbeeecce930a7370cb80f1c543956aa669f7fd4"
  nubusProvisioningDispatcher:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -606,7 +613,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "14", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-dispatcher"
-    tag: "0.51.0@sha256:f0cea25f788ff565b883e50c6138874c6f0338e0f91c5f8a32595323059930ef"
+    tag: "0.49.1@sha256:3ebc70a95749504f771e257187854d6bd3623fe9b0f8085aa4116e5290db9beb"
  nubusProvisioningEventsAndConsumerApi:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -616,7 +623,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "14", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-events-and-consumer-api"
-    tag: "0.51.0@sha256:66fec83fd5033cf32cd759e9c73f7ae659a4ec45a433f13417a12e007b1d4db6"
+    tag: "0.49.1@sha256:8ad56dc861fa4880c100ba9efffe75398e8b077e4eeb673dadac34cfe44aa1ba"
  nubusProvisioningPrefill:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -626,7 +633,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "14", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-prefill"
-    tag: "0.51.0@sha256:ff04d8cec6ecc0b33cdea164e1ba1222c90ed9fe8370057a58329b4521e56de1"
+    tag: "0.49.1@sha256:3b3eac87ca6dd140236e8a36cd5b42efceb33013beb836f1caeff85ff700a570"
  nubusProvisioningUdmListener:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -636,7 +643,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "14", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-udm-listener"
-    tag: "0.51.0@sha256:5f0bba855945da2fa97d40b0fe51a14e3495b0b6da83562def6a6fcf4c21c059"
+    tag: "0.49.1@sha256:4534ec7c0ee1af3a1eabd4a39cc28c5ddc225e0c3a6bea31a0d6cdf6dcb11147"
  nubusProvisioningUdmTransformer:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -646,7 +653,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "14", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-udm-transformer"
-    tag: "0.51.0@sha256:ce9c312699ebe42c2e1df0d6caf150dfda1e4cc3fc1aaebe62c9ea5de8c11780"
+    tag: "0.49.1@sha256:43f4636ed88333005570c97c51cf46deba499a25ffd65e993b37cf1418dfc483"
  nubusSelfServiceConsumer:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -656,7 +663,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "3", "2"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/selfservice-invitation"
-    tag: "0.15.0@sha256:a7c4c097029de8903e3c2eee2082d740b5352dcc7a7a2a3c330bd9ebd7ad5b62"
+    tag: "0.14.0@sha256:999c50058a02f6006a8d1732b651a5c738c5ee91fc453dc8ae3fcdbb9d4192c0"
  nubusUdmRestApi:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -666,7 +673,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "9", "3"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/udm-rest-api"
-    tag: "0.30.0@sha256:9503666bac5f44a1d7cb6f17c6fd11a7d6976bc9059938596b6ac9f7bb581ca5"
+    tag: "0.29.0@sha256:2b061d1cf244aeadcb790a08cac94804a32abe73dd442382355a6657b05c0ff2"
  nubusUmcGateway:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -676,7 +683,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "7", "3"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/umc-gateway"
-    tag: "0.43.1@sha256:e1f23a199e1e35667e2ba6a45866bcb6d37bc2b13f3b8134e511ae95973c743b"
+    tag: "0.37.0@sha256:3ac0e34e9b1c353ab7778bae548804e3dcc236dd454c3f500de9795eb7dda947"
  nubusUmcServer:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -686,7 +693,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "7", "3"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/umc-server"
-    tag: "0.43.1@sha256:1aef76db446164c3ffaeaf233e9ef6303ebb1609b47f918ac4ab6714abf95283"
+    tag: "0.37.0@sha256:ef06422cab2ab2bc4f84a13dfd7bfb7e862a3504f83fc6957fcbdfaa433d0468"
  nubusUmcServerProxy:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -704,7 +711,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "9", "4"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/wait-for-dependency"
-    tag: "0.30.0@sha256:fa804c2a10aa42439bf3f388007d7e55c046d6da6dc8a74c27f5a989fd422c8d"
+    tag: "0.28.0@sha256:816ad27b76046be360398274ba3c1f1bcec8f58c2ea5a200b2fb675aab1a5ab8"
  opendeskKeycloakBootstrap:
    # providerCategory: "Platform"
    # providerResponsible: "openDesk"
@@ -730,7 +737,7 @@ images:
    # upstreamMirrorStartFrom: ["13", "1", "1"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/openproject/images-mirror/open_desk"
-    tag: "15.5.1@sha256:9ca328a30fc1e143fc1a34942836ff44923c05c327c27779e248767f2ce9ffc7"
+    tag: "15.4.2@sha256:d88df284e03b5c255ad3963ebe335f38a4e069754569dd47c5e92930e0b26a1b"
  openprojectBootstrap:
    # providerCategory: "Platform"
    # providerResponsible: "openDesk"
@@ -746,7 +753,7 @@ images:
    # upstreamRepository: "library/postgres"
    registry: "registry-1.docker.io"
    repository: "library/postgres"
-    tag: "16.9-alpine3.20@sha256:e5507c984377515b8c9922b0eb19f55aba2063fdc7bccf268cefd53133f97054"
+    tag: "16.8-alpine3.20@sha256:951d0626662c85a25e1ba0a89e64f314a2b99abced2c85b4423506249c2d82b0"
  openxchangeBootstrap:
    # providerCategory: "Community"
    # providerResponsible: "openDesk"
@@ -882,7 +889,7 @@ images:
    # upstreamRepository: "bmi/opendesk/components/platform-development/images/postfix"
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/images/postfix"
-    tag: "3.0.2@sha256:e65c6a70d2095a839c4337ef5dacefd42781641b7ac4dc202ff111881dae3716"
+    tag: "3.0.1@sha256:d2c6543b35b616ac3e6c8c27222d3154c0d35680813a8942ce0cc3fa9ea72a6d"
  postfixBootstrap:
    # providerCategory: "Community"
    # providerResponsible: "openDesk"
--- a/helmfile/files/theme/portal/stylesheet.css
+++ b/helmfile/files/theme/portal/stylesheet.css
@@ -136,15 +136,13 @@
 #kc-login,
 #kc-logout,
 #saveTOTPBtn,
-.pf-c-button.btn-lg {
+.pf-c-button.btn-lg,
-  color: var(--color-opendesk-white) !important;
+.kc-social-provider-name
 {
  color: var(--color-opendesk-white);
  border: 2px solid;
 }
 .kc-social-provider-name {
  color: var(--color-opendesk-white) !important;
 }
 #kc-login:hover,
 #kc-logout:hover,
 #saveTOTPBtn:hover,
--- a/publiccode.yml
+++ b/publiccode.yml
@@ -22,11 +22,11 @@ name: "openDesk"
 platforms:
  - "web"
 developmentStatus: "stable"
-softwareVersion: "1.3.1"
+softwareVersion: "1.2.1"
-releaseDate: "2025-04-23"
+releaseDate: "2025-03-21"
 softwareType: "standalone/web"
 url: "https://gitlab.opencode.de/bmi/opendesk/"
-logo: ".opencode/openDesk-logo-rgb-color.svg"
+logo: "openDesk-logo-rgb-color.svg"
 maintenance:
  type: "contract"
@@ -91,6 +91,8 @@ description:
      - ".opencode/screenshots/02-dateien-desktop.png"
      - ".opencode/screenshots/03-projekte-desktop.png"
      - ".opencode/screenshots/04-wiki-desktop.png"
    videos:
      - ".opencode/screenshots/openDesk_Intro.mp4"
    documentation: "https://docs.opendesk.eu/user"
 usedBy:
  - "Robert Koch-Institut"
Author	SHA1	Message	Date
Viktor Pracht	f7e28b064e	feat(open-xchange): Enable ACLs and support logins different from local part Enable the Mail Login Resolver to properly resolve UUIDs to OX users and vice versa. Switch IMAP auth from emails to login names, since that's the only field present in authentication tokens. Due to an issue with retrieving operationsl LDAP attributes (see OX issue /appsuite/platform/core#251), entryUUID does not work currently. As a work-around, users need to have their UUIDs in the field departmentNumber. Migrating to UUIDs (WP#1236) would also work. Maybe we should just make that field configurable.	2025-04-13 17:25:32 +02:00
Thorsten Roßner	a5f9b01ca0	ci: Ensure "DEPLOY" options are grouped together	2025-04-11 13:05:07 +02:00
Thorsten Roßner	1f2d42ea48	docs(README-EE.md): More detailled information regarding oD EE artifacts	2025-04-11 13:05:04 +02:00
René Fischer	91882b22e5	chore(docs): Fix links in docs	2025-04-11 08:54:33 +02:00
Ben Schlagbauer	d444d24489	docs: Overall fixes improvements	2025-04-10 09:46:01 +02:00
Simon Herman	c1f19131d9	docs(requirements): Add information on compatibility with Ingress-NGINX >= 1.12.0	2025-04-09 13:47:59 +02:00
René Fischer	61ea6bdd44	chore(docs): Merge info repo contents	2025-04-07 08:41:21 +02:00
Thorsten Roßner	ffe3daa506	fix(helmfile): Support for Keycloak session settings via `functional.authentication.realmSettings.*`	2025-04-04 10:33:00 +00:00
Norbert Tretkowski	76a8e03acf	fix(ox-connector): Update to v0.19.0	2025-04-04 11:38:03 +02:00
Thorsten Roßner	97cb914f18	fix(xwiki): Update Helm chart to v1.4.4 to fix the problem with XWiki not starting when secrets contained specific (XML interpreted) characters	2025-04-01 09:19:01 +00:00
Thorsten Roßner	0c92d1681c	fix(helmfile): Remove no longer used `secrets.nubus.defaultAccounts.*`	2025-04-01 09:19:01 +00:00
Thomas Kaltenbrunner	f6aeffb189	fix(helmfile): Fix Kyverno lint issues for EE components	2025-03-31 12:59:39 +02:00