feat(intercom): Update from v2.19.5 to v2.22.0

docs(getting-started.md): AAAA record on base domain is optional
docs(monitoring.md): Correct references and wordings in monitoring documentation
2025-12-06 07:21:36 +01:00 · 2025-12-05 19:25:00 +01:00 · 2025-12-03 15:44:05 +00:00 · 2025-12-03 15:56:36 +01:00 · 2025-12-03 08:36:44 +01:00 · 2025-12-03 07:41:40 +01:00
90 changed files with 1265 additions and 526 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@
 ---
 include:
  - project: "${PROJECT_PATH_GITLAB_CONFIG_TOOLING}"
-    ref: "v2.4.10"
+    ref: "v2.4.17"
    file:
      - "ci/common/lint.yml"
      - "ci/release-automation/semantic-release.yml"
@@ -762,22 +762,38 @@ import-default-accounts:
    - if: >
          $CI_PIPELINE_SOURCE =~ "web|schedules|trigger|api" && $NAMESPACE =~ /.+/ && $CREATE_DEFAULT_ACCOUNTS == "yes"
      when: "on_success"
-  image: "registry.opencode.de/bmi/opendesk/components/platform-development/images/user-import:3.3.2"
+  image: "registry.opencode.de/bmi/opendesk/components/platform-development/images/user-import:3.4.1"
  script:
    - "echo \"Starting default account import for ${DOMAIN}\""
    - "cd /app"
    - |
-      ./user_import_udm_rest_api.py \
+      set +e
-        --import_domain ${DOMAIN} \
+      success=0
-        --udm_api_password ${DEFAULT_ADMINISTRATOR_PASSWORD} \
+      for i in {1..5}; do
-        --set_default_password ${DEFAULT_ACCOUNTS_PASSWORD} \
+        echo "Attempt $i/5..."
-        --import_filename ./template.ods \
+        ./user_import_udm_rest_api.py \
-        --admin_enable_fileshare True \
+          --import_domain ${DOMAIN} \
-        --admin_enable_knowledgemanagement True \
+          --udm_api_password ${DEFAULT_ADMINISTRATOR_PASSWORD} \
-        --admin_enable_projectmanagement True \
+          --set_default_password ${DEFAULT_ACCOUNTS_PASSWORD} \
-        --create_admin_accounts True \
+          --import_filename ./template.ods \
-        --create_maildomains True \
+          --admin_enable_fileshare True \
-        --verify_certificate False
+          --admin_enable_knowledgemanagement True \
          --admin_enable_projectmanagement True \
          --create_admin_accounts True \
          --create_maildomains True \
          --verify_certificate False
        if [ $? -eq 0 ]; then
          echo "Script succeeded on attempt $i."
          success=1
          break
        fi
        echo "Script failed. Waiting 60 seconds before retry..."
        sleep 60
      done
      if [ "$success" -ne 1 ]; then
        echo "Script failed after 5 attempts."
        exit 1
      fi
 run-tests:
  stage: "post-execute"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,57 @@
 # [1.10.0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.9.0...v1.10.0) (2025-11-24)
 ### Bug Fixes
 * **collabora:** Update Controller to 1.1.6 incl. Helm chart update to 1.1.10 ([d25c95f](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/d25c95f06bc199d09aa6ea4dc09c10e95153de38))
 * **collabora:** Update from 25.04.5 to 25.04.6 ([8de0f5d](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/8de0f5de7277ad726588d7de2d06cb3e9376c993))
 * **external-services:** Create `nubus_authsession` database ([ec72602](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/ec72602cdd3207f73ff806a26bfe7b9fd32b8634))
 * **helmfile:** Enable verification for XWiki Helm chart ([5104793](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/51047936de102c610adc00f4dff12d2eb8e945b0))
 * **helmfile:** Streamline annotations ([7aa717c](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/7aa717c0509a731c060c58a1b5877e1d9899406f))
 * **nubus:** Remove legacy `UMC` Keycloak client that was used for SAML connection with the Nubus portal ([152221f](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/152221fa7976bfa942d5e9e9b8f78cc8e65765c0))
 * **open-xchange:** Only enable `smtpSASLAuthEnable` when `relayHost` is set ([70bbbf3](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/70bbbf311fcba57c31f535be7d0d453f4a945cee))
 * **open-xchange:** Optimize Dovecot Pro full-text search caches; review `migrations.md` for required upgrade steps ([f3f707c](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/f3f707c9eee8edf3ad61834d87b5c059f31b0e26))
 * **open-xchange:** Template SASL security options ([684c6d4](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/684c6d4f29dd447872ebe582eef43c04034896f7))
 * **open-xchange:** Update Dovecot configuration based on supplier's best practise review ([850761e](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/850761e0475b2f281fb23f6972d5c74fbdaa3a61))
 * **opendesk-static-files:** [[#260](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/issues/260)] Fix doublette creation of configmap `data` keys when the same file is referenced multiple times for a component ([b5a76be](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/b5a76bea57ef7b136c54d1bc95c40f0a0c3f9716))
 * **openproject:** Update from 16.6.0 to 16.6.1 ([62fae99](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/62fae9976a731c00700d56ce8fab198bb2531d20))
 * **xwiki:** Update XWiki from 17.4.4 to 17.4.7 ([02a3b77](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/02a3b7711490394690df70ca92bab58b253e34f5))
 ### Features
 * **jitsi:** Update from 2.0.10431 to 2.0.10590 ([f5aad1f](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/f5aad1fa47559f0d3941c233c7d40029a9e83281))
 * **nubus:** Update from v1.14.0 to v1.15.2 ([12379d6](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/12379d67e07936496fe31276b2052406e0137db6))
 * **open-xchange:** Support for LDAP group based mailing lists ([cc94f0c](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/cc94f0c66df098d0a20f7f0d4a6af5e791557981))
 * **openproject:** Update OpenProject from 16.5.1 to 16.6.0 ([19438c0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/19438c02817875bd408c5d6cf423d7bfb61f907f))
 # [1.9.0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.8.0...v1.9.0) (2025-11-07)
 ### Bug Fixes
 * **collabora:** Update from 25.04.4.3.1 to 25.04.5.3.1 ([e0128e6](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/e0128e6ccf02eaaa68fe53f5629150f0e0863ba0))
 * **element:** Increase message and media rate limits ([13968a8](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/13968a8133174024dc97c5cf73e6b1e7883ce0a0))
 * **element:** Update favicon to use PNG version ([f8104f6](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/f8104f635862ce6c80b66c6d7fa82df7cde9d446))
 * **element:** Update Synapse from v1.137.0 to v1.141.0; fixes https://github.com/element-hq/synapse/security/advisories/GHSA-fh66-fcv5-jjfr which applies to all openDesk deployments using Element/Matrix with federation enabled ([02d3021](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/02d3021c4ba97f81165e286d1ee53b7c199f5dbb))
 * **element:** Update widgets primary color theme settings ([94394a1](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/94394a1e3e3da304138263de73121a62aabbee11))
 * **gitlab:** Add issue templates ([26da7e3](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/26da7e366709b3888f6786b574e3b3b11f1a6fab))
 * **helmfile:** Support setting the `defaultLanguage` - relevant for OX App Suite and XWiki - in `functional.yaml.gotmpl` ([24065db](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/24065dbc7043d09dbad0d272128cfe2f33f22e48))
 * **helmfile:** Use passwords defined in `database.yaml.gotmpl` for Cassandra when available ([0268219](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/026821996a4e42ac9ef25dd62c34d1697547962c))
 * **notes:** Fix python path for self signed certs ([c4279d1](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/c4279d11bb46c9fe65b2ccd54dc0789d11c0d0d8))
 * **notes:** Fix repeated redirects on expired session; Remove fetching of external assets ([c1012f4](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/c1012f4e656222750dda0668d8f81e5d1fbe02fd))
 * **open-xchange:** Don't enable sasl auth when no relay host is set ([ff3b221](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/ff3b2218706a98b854c072de62105aa8352e3949))
 * **open-xchange:** Enable and configure defaults for ContactCollector, remove legacy config artifacts ([465f60d](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/465f60d4a28ead7d7a715db71dad9d9992e8b89a))
 * **open-xchange:** Use masterpassword for mailfilter in migration Pods; use PLAIN instead of OAuth for SASL ([484dfaf](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/484dfafe643e04a717e6bc3a8e6e6e6f5011c1c1))
 * **ox-connector:** Use FQDN for internal service URLs ([8593d5f](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/8593d5f2bdea685a836edc9d9034ce1976cf2e96))
 ### Features
 * **helmfile:** Add toggle for external mail client onboarding and allow non-default FQDNs for IMAP and SMTP endpoints ([25a97ab](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/25a97abba69b34c6b65a08ca7af979f3897d218b))
 * **open-xchange:** Enable XRechnung in Viewer ([08e6ec5](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/08e6ec59d2abac36a8f6e5ab10fec6a5643de282))
 * **openproject:** Update from 16.4.1 to 16.5.1 ([74cf2ee](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/74cf2ee0d818b5e017b3c97f6fbedb05ab764d67))
 # [1.8.0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.7.1...v1.8.0) (2025-09-25)
--- a/README-EE.md
+++ b/README-EE.md
@@ -86,7 +86,7 @@ When a repository path starts with `/zendis`, the artifact is only available in
 ###  Collabora
 - 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.
+- [COOL Controller](https://www.collaboraonline.com/cool-controller-release-notes/) 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.
--- a/README.md
+++ b/README.md
@@ -40,10 +40,10 @@ openDesk currently features the following functional main components:
 | File management      | Nextcloud                   | AGPL-3.0-or-later                                                                      | [31.0.7](https://nextcloud.com/de/changelog/#31-0-7)                                          | [Nextcloud 31](https://docs.nextcloud.com/)                                                                                           |
 | Groupware            | OX App Suite                | GPL-2.0-only (backend), AGPL-3.0-or-later (frontend)                                   | [8.41](https://documentation.open-xchange.com/appsuite/releases/8.41/)                        | Online documentation available from within the installed application; [Additional resources](https://documentation.open-xchange.com/) |
 | Knowledge management | XWiki                       | LGPL-2.1-or-later                                                                      | [17.4.4](https://www.xwiki.org/xwiki/bin/view/ReleaseNotes/Data/XWiki/17.4.4/)                | [For the most recent release](https://www.xwiki.org/xwiki/bin/view/Documentation)                                                     |
-| Portal & IAM         | Nubus                       | AGPL-3.0-or-later                                                                      | [1.14.0](https://docs.software-univention.de/nubus-kubernetes-release-notes/1.x/en/1.14.html) | [Univention's documentation website](https://docs.software-univention.de/n/en/nubus.html)                                             |
+| Portal & IAM         | Nubus                       | AGPL-3.0-or-later                                                                      | [1.15.2](https://docs.software-univention.de/nubus-kubernetes-release-notes/1.x/en/1.15.html) | [Univention's documentation website](https://docs.software-univention.de/n/en/nubus.html)                                             |
-| Project management   | OpenProject                 | GPL-3.0-only                                                                           | [16.4.1](https://www.openproject.org/docs/release-notes/16-4-1/)                              | [For the most recent release](https://www.openproject.org/docs/user-guide/)                                                           |
+| Project management   | OpenProject                 | GPL-3.0-only                                                                           | [16.6.1](https://www.openproject.org/docs/release-notes/16-6-1/)                              | [For the most recent release](https://www.openproject.org/docs/user-guide/)                                                           |
-| Videoconferencing    | Jitsi                       | Apache-2.0                                                                             | [2.0.10431](https://github.com/jitsi/jitsi-meet/releases/tag/stable%2Fjitsi-meet_10431)       | [For the most recent  release](https://jitsi.github.io/handbook/docs/category/user-guide/)                                            |
+| Videoconferencing    | Jitsi                       | Apache-2.0                                                                             | [2.0.10590](https://github.com/jitsi/jitsi-meet/releases/tag/stable%2Fjitsi-meet_10590)       | [For the most recent  release](https://jitsi.github.io/handbook/docs/category/user-guide/)                                            |
-| Weboffice            | Collabora                   | MPL-2.0                                                                                | [25.04.5](https://www.collaboraoffice.com/code-25-04-release-notes/)                          | Online documentation available from within the installed application; [Additional resources](https://sdk.collaboraonline.com/)        |
+| Weboffice            | Collabora                   | MPL-2.0                                                                                | [25.04.6](https://www.collaboraoffice.com/code-25-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.
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -129,7 +129,7 @@ An overview of
 - components that consume the LDAP service.
  - The components access the LDAP using a component-specific LDAP search account.
 - components using Univention Keycloak as an identity provider (IdP).
-  - The components should use OAuth2 / OIDC flows if not otherwise denoted.
+  - All components use OAuth2 / OIDC flows.
  - All components have a client configured in Keycloak.
 Some components trust others to handle authentication for them.
@@ -148,7 +148,7 @@ flowchart TD
 D-->K
 O-->K
 X-->K
- P-->|SAML|K
+ P-->K
 E[Element]-->K
 J[Jitsi]-->K
 I[IntercomService]-->K
@@ -184,9 +184,6 @@ sequenceDiagram
    Note over Browser: User is authenticated
 ```
 > **Note:**<br>
 > Nubus' Portal and UMC still use [SAML 2.0](https://www.oasis-open.org/standard/saml/) to authenticate users. However, Nubus will switch to OIDC in an upcoming release, eliminating the use of SAML in openDesk altogether.
 ## Keycloak
 [Keycloak](https://www.keycloak.org/) is an open-source identity and access management solution for web based applications and services. It provides features such as single sign-on, multi-factor authentication, user federation, and centralized user management.
@@ -245,7 +242,7 @@ To find out more, see [Roles & Permissions](./docs/permissions.md).
 In openDesk, SCIM will be used in the future to automate the process of creating, updating, and deactivating user accounts across the applications. This ensures that user data is consistent across all applications, reducing the administrative overhead and potential for errors.
-> **Note:**<br>
+> [!note]
 > SCIM support is planned in openDesk for 2025.
 # Component integration
@@ -449,4 +446,4 @@ While the IAM manages users centrally, some applications come with local account
 # Footnotes
-[^1]: We are working on a new approach to provision the OpenProject filestore, therefore the accounts are planned to be deactivated/removed with openDesk 1.2.
+[^1]: We are working on a new approach to provision the OpenProject filestore, therefore the accounts are planned to be deactivated/removed in the future.
--- a/docs/architecture/apis.md
+++ b/docs/architecture/apis.md
@@ -295,8 +295,10 @@ The following are the APIs used by the Groupware application:
 | Supported standards            | SOAP                                                                                         |
 | Documentation                  | https://software.open-xchange.com/products/appsuite/doc/SOAP/admin/OX-Admin-SOAP.html        |
-> **Note**:
+> [!note]
-> You will find a catalogue of the available services including links to the respective URLs at `/webservices/` within the AppSuite host of your openDesk installation, e.g. https://webmail.myopendesk.tld/webservices/
+> You will find a catalogue of the available services including links to the respective URLs at
 > `/webservices/` within the AppSuite host of your openDesk installation,
 > e.g. https://webmail.myopendesk.tld/webservices/
 ## REST API
@@ -648,7 +650,7 @@ The following are the APIs used by the Project management application:
 ## Jitsi Meet React SDK
-> **Note**<br>
+> [!note]
 > Additional SDKs can be found at https://jitsi.github.io/handbook/docs/category/sdks/
 | Name                           | Meet React SDK                                                      |
--- a/docs/baseline-requirements.md
+++ b/docs/baseline-requirements.md
@@ -38,7 +38,7 @@ As this is a comprehensive set of requirements most new components will not adhe
 This document can be used to assess the status and possible gaps for a component which might itself be the basis for a decision if a component should be integrated into openDesk by working on closing the identified gaps.
-> **Note**<br>
+> [!note]
 > Even an already integrated application might not adhere to all aspects of the documented requirements yet.
 > Closing the gaps for existing applications therefore is an openDesk priority.
@@ -147,8 +147,9 @@ Please find more context about the topic on the [website of the German CIO](http
 Each vendor must provide a certificate that their product - or the parts of the product relevant for openDesk - complies with at least WCAG 2.1 AA or [BITV 2.0](https://www.bundesfachstelle-barrierefreiheit.de/DE/Fachwissen/Informationstechnik/EU-Webseitenrichtlinie/BGG-und-BITV-2-0/Die-neue-BITV-2-0/die-neue-bitv-2-0_node.html). As the certification and related product improvements are time-consuming the focus of openDesk is that a supplier provides a plan and certification partner (contract) that shows the supplier is working towards the certification. While the aforementioned standard states the priority is the "A" level requirements, the "AA" level must be met at the end of the process.
-> **Note**<br>
+> [!note]
-> Please keep in mind that WCAG 2.2 and 3.0 are work in progress. If you already work on accessibility improvements you might want to take these standards already into consideration.
+> Please keep in mind that WCAG 2.2 and 3.0 are work in progress. If you already work on accessibility
 > improvements you might want to take these standards already into consideration.
 **Reference:** In the past the [accessibility evaluations](https://gitlab.opencode.de/bmi/opendesk/info/-/tree/main/24.03/Barrierefreiheit) have been executed by Dataport. But they do not do certifications.
@@ -185,7 +186,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.
 ### Pull: LDAP
@@ -194,8 +195,9 @@ Applications can access the IAM's LDAP to access all data necessary for managing
 **Reference:** Most applications use LDAP access as per https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/blob/main/docs/components.md?ref_type=heads#identity-data-flows
-> **Note**<br>
+> [!note]
-> The direct access to LDAP is going to be deprecated for most use cases. openDesk is looking into active provisioning of the user/group data into the applications using [SCIM](https://scim.cloud/).
+> The direct access to LDAP is going to be deprecated for most use cases. openDesk is looking into active
 > provisioning of the user/group data into the applications using [SCIM](https://scim.cloud/).
 ### Push: Provisioning
--- a/docs/data-storage.md
+++ b/docs/data-storage.md
@@ -31,8 +31,6 @@ sankey-beta
 ClamAV,PersistentVolume,1
 Dovecot,PersistentVolume,1
 Element/Synapse,PostgreSQL,1
 Element/Synapse,PersistentVolume,1
@@ -54,9 +52,15 @@ OpenProject,S3,1
 OpenProject,PersistentVolume,1
 OpenProject,Memcached,1
-Open-Xchange,MariaDB,1
+OX App Suite,MariaDB,1
-Open-Xchange,PersistentVolume,1
+OX App Suite,Redis,1
-Open-Xchange,Redis,1
+OX App Suite,S3,1
 OX Connector,PersistentVolume,1
 OX Dovecot,Cassandra,1
 OX Dovecot,PersistentVolume,1
 OX Dovecot,S3,1
 Postfix,PersistentVolume,1
@@ -67,9 +71,10 @@ XWiki,PersistentVolume,1
 # Details
 | Application          | Data Storage | Backup   | Content                                                                           | (Default) Identifier                           | Details                                                                                                   |
-|----------------------|--------------|----------|-----------------------------------------------------------------------------------|------------------------------------------------|-----------------------------------------------------------------------------------------------------------|
+| -------------------- | ------------ | -------- | --------------------------------------------------------------------------------- | ---------------------------------------------- | --------------------------------------------------------------------------------------------------------- |
 | **ClamAV**           | PVC          | No       | ClamAV Database                                                                   | `clamav-database-clamav-simple-0`              | `/var/lib/clamav`                                                                                         |
 | **Dovecot**          | PVC          | Yes      | openDesk CE only: User mail directories                                           | `dovecot`                                      | `/srv/mail`                                                                                               |
 |                      | PVC          | Yes       | openDesk EE only: Metacache directory                                             | `var-lib-dovecot-dovecot-0`                    | `/var/lib/dovecot`                                                                                        |
 |                      | S3           | Yes      | openDesk EE only: User mail                                                       | `dovecot`                                      | `dovecot`                                                                                                 |
 |                      | Cassandra    | Yes      | openDesk EE only: Metadata and ACLs                                               | `dovecot_dictmap`, `dovecot_acl`               |                                                                                                           |
 | **Element/Synapse**  | PostgreSQL   | Yes      | Application's main database                                                       | `matrix`                                       |                                                                                                           |
@@ -84,8 +89,8 @@ XWiki,PersistentVolume,1
 |                      |              | Yes      | Login actions and device-fingerprints                                             | `keycloak_extensions`                          |                                                                                                           |
 |                      |              | Optional | Store of the temporary password reset token                                       | `selfservice`                                  |                                                                                                           |
 |                      |              | Optional | OIDC session storage                                                              | `umsAuthSession`                               |                                                                                                           |
-|                      |              | No       | Notification features are not used in openDesk 1.1                                | `notificationsapi`                             |                                                                                                           |
+|                      |              | No       | At the moment the notification feature not enabled in openDesk                    | `notificationsapi`                             |                                                                                                           |
-|                      |              | No       | Guardian features are currently not used in openDesk 1.1                          | `guardianmanagementapi`                        |                                                                                                           |
+|                      |              | No       | At the moment the Guardian features are currently not enabled in openDesk         | `guardianmanagementapi`                        |                                                                                                           |
 |                      | S3           | No       | Static files for Portal                                                           | `ums`                                          |                                                                                                           |
 |                      | PVC          | Yes      | openLDAP database (primary R/W Pods), when restore select the one from the leader | `shared-data-ums-ldap-server-primary-0`        | `/var/lib/univention-ldap`                                                                                |
 |                      |              | Yes      | openLDAP process data                                                             | `shared-run-ums-ldap-server-primary-0`         | `/var/run/slapd`                                                                                          |
@@ -100,13 +105,17 @@ XWiki,PersistentVolume,1
 |                      | Memcached    | No       | Cache                                                                             |                                                |                                                                                                           |
 |                      | PVC          | No       | PVC backed `emptyDir` as K8s cannot set the sticky bit on standard emptyDirs      | `openproject-<web/worker>-*-tmp`               | `/tmp`                                                                                                    |
 |                      |              | No       | PVC backed `emptyDir` as K8s cannot set the sticky bit on standard emptyDirs      | `openproject-<web/worker>-app-*-tmp`           | `/app/tmp`                                                                                                |
-| **Open-Xchange**     | MariaDB      | Yes      | Application's control database to coordiate dynamically created ones              | `configdb`                                     |                                                                                                           |
+| **OX App Suite**     | MariaDB      | Yes      | Application's control database to coordiate dynamically created ones              | `configdb`                                     |                                                                                                           |
 |                      |              | Yes      | Dynamically creates databases of schema `PRIMARYDB_n`containing multiple contexts | `PRIMARYDB_*`                                  |                                                                                                           |
 |                      |              | Yes      | OX Guard related settings                                                         | `oxguard*`                                     |                                                                                                           |
 |                      | S3           | Yes      | Attachments of meetings, contacts and tasks                                       | `openxchange`                                  |                                                                                                           |
 |                      | Redis        | Optional | Cache, session related data, distributed maps                                     |                                                |                                                                                                           |
-|                      | PVC          | Yes      | OX Connector: OXAPI access details                                                | `ox-connector-appcenter-ox-connector-0`        | `/var/lib/univention-appcenter/apps/ox-connector`                                                         |
+| **OX Connector**     | PVC          | Optional | OX Connector: Caching of OX object data                                           | for backup                                     | `/var/lib/univention-appcenter/apps/ox-connector`                                                         |
-|                      |              | Yes      | OX Connector: Application's meta data                                             | `ox-connector-ox-contexts-ox-connector-0`      | `/etc/ox-secrets`                                                                                         |
+|                      |              | Yes      | OX Connector: OX SOAP API credentials                                             | `ox-connector-ox-contexts-ox-connector-0`      | `/etc/ox-secrets`                                                                                         |
 | **OX Dovecot**       | PVC          | Yes      | openDesk CE only: User mail directories                                           | `dovecot`                                      | `/srv/mail`                                                                                               |
 |                      | PVC          | Yes      | openDesk EE only: Various meta data and caches                                    | `var-lib-dovecot`                              | `/var/lib/dovecot`                                                                                        |
 |                      | S3           | Yes      | Dovecot Pro/openDesk EE only: User mail                                           | `dovecot`                                      | `dovecot`                                                                                                 |
 |                      | Cassandra    | Yes      | Dovecot Pro/openDesk EE only: Metadata and ACLs                                   | `dovecot_dictmap`, `dovecot_acl`               |                                                                                                           |
 | **Postfix**          | PVC          | Yes      | Mail spool                                                                        | `postfix`                                      | `/var/spool/postfix`                                                                                      |
 | **XWiki**            | PostgreSQL   | Yes      | Application's main database                                                       | `xwiki`                                        |                                                                                                           |
 |                      | PVC          | Yes      | Attachments                                                                       | `xwiki-data-xwiki-0`                           | `/usr/local/xwiki/data`                                                                                   |
--- a/docs/debugging.md
+++ b/docs/debugging.md
@@ -31,10 +31,10 @@ It will be extended over time as we deal with debugging cases.
 We for sure do not want to reinvent the wheel, so we might link to external sources that contain helpful
 information where available.
-> **Warning**<br>
+> [!warning]
-> You should never enable the debug option in production environments! By looking up `debug.enabled` in the deployment, you
+> You should never enable the debug option in production environments! By looking up `debug.enabled` in the
-will find the various places changes are applied when enabling debugging. So, outside of development and test
+> deployment, you will find the various places changes are applied when enabling debugging. So, outside of
-environments, you should use them thoughtfully and carefully if needed.
+> development and test environments, you should use them thoughtfully and carefully if needed.
 # Enable debugging
@@ -49,11 +49,13 @@ This will result in:
 - making the Keycloak admin console available by default at `https://id.<your_domain>/admin/`
 - ingress for `http://minio-console.<your_domain>` being configured
-> **Note**<br>
+> [!note]
-> When enabling debug mode and updating your deployment, you must manually delete all jobs before updating. In debug mode, we keep the jobs, and some job fields are immutable, leading to a deployment failure.
+> When enabling debug mode and updating your deployment, you must manually delete all jobs before updating. In
 > debug mode, we keep the jobs, and some job fields are immutable, leading to a deployment failure.
-> **Note**<br>
+> [!note]
-> All containers should write their log output to STDOUT; if you find (valuable) logs inside a container which were not in STDOUT, please let us know!
+> All containers should write their log output to STDOUT; if you find (valuable) logs inside a container which
 > were not in STDOUT, please let us know!
 # Adding containers to a pod for debugging purposes
@@ -215,11 +217,16 @@ kubectl patch -n ${NAMESPACE} configmap ${CONFIGMAP_NAME} --type merge -p '{"dat
 2. Restart the Keycloak Pod(s).
-> **Note**<br>
+> [!note]
-> Because the `ums-keycloak-extensions-handler` is sending frequent requests (one per second) to Keycloak for retrieval of the Keycloak event history, you might want to stop/remove the deployment while debugging/analysing Keycloak to not get your debug output spammed by these requests.
+> Because the `ums-keycloak-extensions-handler` is sending frequent requests (one per second) to Keycloak for
 > retrieval of the Keycloak event history, you might want to stop/remove the deployment while
 > debugging/analysing Keycloak to not get your debug output spammed by these requests.
-> **Note**<br>
+> [!note]
-> While you can set the standard log levels like `INFO`, `DEBUG`, `TRACE` etc. you can also set class specific logs by comma separating the details in the `KC_LOG_LEVEL` environment variable like e.g. `INFO,org.keycloak.protocol.oidc.endpoints:TRACE`. The example sets the overall loglevel to `INFO` but provides trace logs for `org.keycloak.protocol.oidc.endpoints`.
+> While you can set the standard log levels like `INFO`, `DEBUG`, `TRACE` etc. you can also set class specific
 > logs by comma separating the details in the `KC_LOG_LEVEL` environment variable like
 > e.g. `INFO,org.keycloak.protocol.oidc.endpoints:TRACE`. The example sets the overall loglevel to `INFO` but
 > provides trace logs for `org.keycloak.protocol.oidc.endpoints`.
 ### Accessing the Keycloak admin console
--- a/docs/developer/development.md
+++ b/docs/developer/development.md
@@ -84,9 +84,9 @@ In the project's CI, there is a step dedicated to lint the two yaml files, as we
 In the linting step, the [openDesk CI CLI](https://gitlab.opencode.de/bmi/opendesk/tooling/opendesk-ci-cli) is used to apply the
 aforementioned sorting, and the result is compared with the unsorted version. If there is a delta, the linting fails, and you can fix it by running the CLI tool locally, verifying and applying the result to your branch.
-> **Note**<br>
+> [!note]
-> Please ensure that in component blocks, you use comments only at the beginning of the block or at its end. Ideally, you stick
+> Please ensure that in component blocks, you use comments only at the beginning of the block or at its
-with the many available examples in the yaml files.
+> end. Ideally, you stick with the many available examples in the yaml files.
 Example:
 ```yaml
@@ -126,7 +126,7 @@ Checks for newer versions of the given artifact and creates an MR containing the
 - See also: https://gitlab.opencode.de/bmi/opendesk/tooling/oci-pull-mirror
-> **Note:**<br>
+> [!note]
 > The mirror is scheduled to run every hour at 42 minutes past the hour.
 openDesk strives to make all relevant artifacts available on openCode so there is a mirroring process
--- a/docs/developer/workflow.md
+++ b/docs/developer/workflow.md
@@ -85,7 +85,7 @@ The below rendering in [class diagram](https://en.wikipedia.org/wiki/Class_diagr
 - the first section below the name of the class shows the required **characteristics** of each component of the given class
 - the second section shows the **methods** like linting that must be applied to that class's artifacts
-> **Note**<br>
+> [!note]
 > The methods prefixed with '-' are not yet available in `gitlab-config`. You will learn about them later.
 ```mermaid
@@ -148,11 +148,14 @@ openDesk uses Apache 2.0 as the license for their work. A typical reuse copyrigh
 ```
 The way to mark the license header as a comment differs between the various file types. Please find matching examples for all types across the [deployment automation repository](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk).
-> **Note**<br>
+> [!note]
-> If a `SPDX-FileCopyrightText` already exists with the copyright owner described above but with a past year (e.g. 2024), please update this copyright header line to cover (up to and including) the current year, e.g. `2024-2025`.
+> If a `SPDX-FileCopyrightText` already exists with the copyright owner described above but with a past year
 > (e.g. 2024), please update this copyright header line to cover (up to and including) the current year,
 > e.g. `2024-2025`.
-> **Note**<br>
+> [!note]
-> If line(s) with `SPDX-FileCopyrightText` containing a different copyright owner exist in the file you are working on, do not replace existing one(s), but rather add another header above these.
+> If line(s) with `SPDX-FileCopyrightText` containing a different copyright owner exist in the file you are
 > working on, do not replace existing one(s), but rather add another header above these.
 ## Development workflow
@@ -348,14 +351,14 @@ Branches created from the `develop` branch have to adhere to the following notat
 Example: `tmueller/fix_jitsi_theming`.
-> **Note**<br>
+> [!note]
 > The above naming convention has yet to be enforced, but please ensure you use it.
 #### Commit messages / Conventional Commits
 Commit messages must adhere to the [Conventional Commit standard](https://www.conventionalcommits.org/en/v1.0.0/#summary). Commits that do not adhere to the standard get rejected by either [Gitlab push rules](https://docs.gitlab.com/ee/user/project/repository/push_rules.html) or the CI.
-> **Note**<br>
+> [!note]
 > The first letter after the `: ` must be uppercase.
 ```text
@@ -372,7 +375,7 @@ Commit messages must adhere to the [Conventional Commit standard](https://www.co
 Example: `fix(open-xchange): Bump to 8.26 to heal issue with functional mailbox provisioning.`
-> **Note**<br>
+> [!note]
 > The commit messages are an essential part of the [technical releases](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/releases) as the release notes are generated from these messages.
 #### Verified commits
--- a/docs/enhanced-configuration/gitops.md
+++ b/docs/enhanced-configuration/gitops.md
@@ -31,6 +31,11 @@ There are two options to deploy openDesk via Argo CD described in the following
 ## Option 1: Use YAML manifests
 > [!warning]
 > Pre-rendering the YAML files will also embed all referenced secrets into the resulting outputs.
 > You must ensure that these files are accessible solely to individuals who are expressly authorized
 > to view the corresponding secrets, as well as the infrastructure and data protected by them.
 This option requires a preprocessing step before using Argo CD. This step requires you to compile the Helmfile based
 deployment into Kubernetes YAML manifest, to do so you need to execute the helmfile binary:
@@ -44,9 +49,10 @@ References:
 Afterwards, you can use the resulting manifests within a standard Argo CD workflow.
-> **Note**<br>
+> [!note]
-> When creating the Argo CD application based on the resulting manifests, you must not use the `Automated Sync Policy`
+> When creating the Argo CD application based on the resulting manifests, you must not use the `Automated Sync
-> offered by Argo CD, as you have to manually ensure the applications are updated in the required sequence.
+> Policy` offered by Argo CD, as you have to manually ensure the applications are updated in the required
 > sequence.
 ## Option 2: Helmfile plugin
--- a/docs/enhanced-configuration/groupware-migration.md
+++ b/docs/enhanced-configuration/groupware-migration.md
@@ -41,8 +41,9 @@ You will have to select an existing user account that will be used as a service
 Please note that the account that shall serve as the service account requires a Microsoft 365/Exchange online license (mailbox).
-> **Note**<br>
+> [!note]
-> If you want to designate your admin account as a service account, you have to provide the admin with a license.
+> If you want to designate your admin account as a service account, you have to provide the admin with a
 > license.
 ***2. Register the audriga app in your tenant***
@@ -53,7 +54,7 @@ To register the audriga app in your tenant, log into your admin account and acce
 - Accept the App "audriga CloudMovr migration"
 - You will be redirected to an audriga page, which you can close - it does not require additional interaction.
-> **Note**<br>
+> [!note]
 > The audriga application is created under the "Enterprise application" tab in the AzureAD console.
 ***3. Create a "secret" group in the M365 tenant***
@@ -91,11 +92,15 @@ To validate the master authentication mode please read the appendix section at t
 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.migrationsMasterPassword` 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>
+> [!note]
-> 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. But you
 > have to restart the Dovecot Pod(s) manually when switching to/from the master authentication mode for the
 > changes to take effect.
-> **Note**<br>
+> [!note]
-> 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.
+> 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.
 # Migration configuration
@@ -107,7 +112,7 @@ Ensure you meet the prerequisites. For example, this document does not support u
 Choose [Microsoft 365 / Exchange Online (Admin)](https://umzug.audriga.com/SMESwitchWebApp/?client=groupware#src=onmicrosoft.com) as your current provider.
-> **Note**<br>
+> [!note]
 > You may need to start typing in "Microsoft Office 365/Exchange Online" for it to appear in the list.
 Configure openDesk as your destination server:
--- a/docs/enhanced-configuration/idp-federation.md
+++ b/docs/enhanced-configuration/idp-federation.md
@@ -152,7 +152,7 @@ If you just created the `fed-test-idp-realm`, you are already in the admin scree
 ## openDesk IdP
-> **Note**
+> [!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.
--- a/docs/enhanced-configuration/self-signed-certificates.md
+++ b/docs/enhanced-configuration/self-signed-certificates.md
@@ -52,9 +52,9 @@ CA certificate as X.509 encoded (`ca.crt`) and as jks trust store (`truststore.j
 5. Create a Kubernetes secret with name `opendesk-certificates-keystore-jks` with key `password` and as value the jks
 trust store password.
-> **Note**<br>
+> [!note]
-> XWiki does not support the use of an existing secret to access the keystore. Therefore you have to set the password
+> XWiki does not support the use of an existing secret to access the keystore. Therefore you have to set the
-> from step 5 also as `secrets.certificates.password`.
+> password from step 5 also as `secrets.certificates.password`.
 ## Option 2a: Use cert-manager.io with auto-generated namespace based root-certificate
--- a/docs/external-services.md
+++ b/docs/external-services.md
@@ -19,8 +19,10 @@ This document will cover the additional configuration for external services like
 When deploying this suite to production, you need to configure the applications to use your production-grade database
 service.
-> **Note**<br>
+> [!note]
-> openDesk supports PostgreSQL as alternative database backend for Nextcloud and XWiki. PostgreSQL is likely to become the preferred option/default in the future should MariaDB become deprecated. This would cause migration[^1] to be necessary if you do not select PostgreSQL for new installations.
+> openDesk supports PostgreSQL as alternative database backend for Nextcloud and XWiki. PostgreSQL is likely
 > to become the preferred option/default in the future should MariaDB become deprecated. This would cause
 > migration[^1] to be necessary if you do not select PostgreSQL for new installations.
 | Component          | Name               | Parameter | Key                                           | Default                      |
 | ------------------ | ------------------ | --------- | --------------------------------------------- | ---------------------------- |
--- a/docs/functional.md
+++ b/docs/functional.md
@@ -32,5 +32,9 @@ The following categories are available. Each category contains a set of options
 In case the options from [`functional.yaml.gotmpl`](../helmfile/environments/default/functional.yaml.gotmpl) are not sufficient, you might want to look into [`customization.yaml.gotmpl`](../helmfile/environments/default/customization.yaml.gotmpl). The customizations give you control over all templating that is being done in openDesk, but be aware it is an unsupported approach, so in case you have a strong need for customizations, please let us know by opening a ticket. We will check if it is a use case that can be supported by implementing it as part of the aforementioned [`functional.yaml.gotmpl`](../helmfile/environments/default/functional.yaml.gotmpl).
-> **Note<br>**
+> [!note]
-> You can not directly template your own values in the structure found in [`customization.yaml.gotmpl`](../helmfile/environments/default/customization.yaml.gotmpl), rather, you need to reference your custom value files to overwrite the openDesk defaults. In the app specific `helmfile-child.yaml.gotmpl` files, the openDesk value files are referenced first, then afterwards, the files you define in the customizations are read.
+> You can not directly template your own values in the structure found in
 > [`customization.yaml.gotmpl`](../helmfile/environments/default/customization.yaml.gotmpl), rather, you need
 > to reference your custom value files to overwrite the openDesk defaults. In the app specific
 > `helmfile-child.yaml.gotmpl` files, the openDesk value files are referenced first, then afterwards, the
 > files you define in the customizations are read.
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -32,8 +32,10 @@ This documentation lets you create an openDesk evaluation instance on your Kuber
  * [Install](#install)
  * [Install single app](#install-single-app)
  * [Install single release/chart](#install-single-releasechart)
 * [Access deployment](#access-deployment)
  * [Using from external repository](#using-from-external-repository)
 * [Access deployment](#access-deployment)
  * [Login](#login)
  * [Credentials](#credentials)
 * [Uninstall](#uninstall)
 <!-- TOC -->
@@ -63,7 +65,7 @@ For your convenience, we recommend creating a `*.domain.tld` A-Record for your c
 | Record name                   | Type | Value                                              | Additional information                                            |
 |-------------------------------|------|----------------------------------------------------|-------------------------------------------------------------------|
 | *.domain.tld                  | A    | IPv4 address of your Ingress Controller            |                                                                   |
-| *.domain.tld                  | AAAA | IPv6 address of your Ingress Controller            |                                                                   |
+| *.domain.tld                  | AAAA | IPv6 address of your Ingress Controller            | Optional                                                          |
 | mail.domain.tld               | A    | IPv4 address of your postfix NodePort/LoadBalancer | Optional, mail should directly be delivered to openDesk's Postfix |
 | mail.domain.tld               | AAAA | IPv6 address of your postfix NodePort/LoadBalancer | Optional, mail should directly be delivered to openDesk's Postfix |
 | domain.tld                    | MX   | `10 mail.domain.tld`                               |                                                                   |
@@ -77,6 +79,8 @@ For your convenience, we recommend creating a `*.domain.tld` A-Record for your c
 ## Domain
 As example base domain for your deployment we use `domain.tld` in this document.
 A list of all subdomains can be found in `helmfile/environments/default/global.yaml.gotmpl`.
 All subdomains can be customized. For example, _Nextcloud_ can be changed to `files.domain.tld` in `dev` environment:
@@ -100,6 +104,11 @@ or alternatively via environment variable:
 export DOMAIN=domain.tld
 ```
 > [!warning]
 > Due to a limitation caused by a [bug in the SSSD subcomponent](https://github.com/SSSD/sssd/issues/7246), there
 > is an upper bound on the total domain length used by openDesk. To avoid issues, we recommend keeping the openDesk
 > base domain length below 94 characters.
 ### Apps
 Depending on your ideal openDesk deployment, you may wish to disable or enable certain apps.
@@ -236,9 +245,9 @@ ingress:
  ingressClassName: "nginx"
 ```
-> **Note**<br>
+> [!note]
-> Currently, the only supported ingress controller is `ingress-nginx`
+> Currently, the only supported ingress controller is `ingress-nginx` (see
-> (see [requirements.md](./docs/requirements.md) for reference).
+> [requirements.md](./docs/requirements.md) for reference).
 ### Container runtime
@@ -279,8 +288,9 @@ 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
@@ -385,10 +395,15 @@ To prevent others from using your openDesk instance, you must set your individua
 export MASTER_PASSWORD="your_individual_master_password"
 ```
-> **Note**<br>
+> [!important]
-> Currently a [documented](https://docs.software-univention.de/nubus-kubernetes-operation/1.x/en/configuration/nats.html#configure-the-secrets) upstream [bug](https://forge.univention.org/bugzilla/show_bug.cgi?id=58357) causes a failure when passwords/secrets beginning with certain numbers are using for the Nubus subcomponent NATS.
+> Currently a
-> With openDesk 1.6.0 an update-aware workaround was implemented that prefixes the affected secrets in the openDesk included `secrets.yaml.gotmpl` that derives all secrets from the previously mentioned `MASTER_PASSWORD`.
+> [documented](https://docs.software-univention.de/nubus-kubernetes-operation/1.x/en/configuration/nats.html#configure-the-secrets)
-> If you are using externally provided passwords/secrets make sure that none of the ones listed below are starting with a number:
+> upstream [bug](https://forge.univention.org/bugzilla/show_bug.cgi?id=58357) causes a failure when
 > passwords/secrets beginning with certain numbers are using for the Nubus subcomponent NATS. With openDesk
 > 1.6.0 an update-aware workaround was implemented that prefixes the affected secrets in the openDesk included
 > `secrets.yaml.gotmpl` that derives all secrets from the previously mentioned `MASTER_PASSWORD`. If you are
 > using externally provided passwords/secrets make sure that none of the ones listed below are starting with a
 > number:
 >
 > - `secrets.nubus.provisioning.api.natsPassword`
 > - `secrets.nubus.provisioning.dispatcherNatsPassword`
@@ -435,17 +450,37 @@ Instead of iterating through all services, you can also deploy a single release
 helmfile apply -e dev -n <NAMESPACE> -l name=mariadb
 ```
 ## Using from external repository
 Referring to `./helmfile_generic.yaml.gotmpl` from an external
 directory or repository is possible. The `helmfile.yaml.gotmpl` that refers to
 `./helmfile_generic.yaml.gotmpl` may define custom environments. These custom
 environments may overwrite specific configuration values. These
 configuration values are:
 * `global.domain`
 * `global.helmRegistry`
 * `global.master_password`
 # Access deployment
 ## Login
 When all apps are successfully deployed, and their Pod status is `Running` or `Succeeded`, you can navigate to
 ```text
 https://domain.tld
 ```
 which will redirect you to the actual URL of the openDesk portal:
 ```text
 https://portal.domain.tld
 ```
-If you change the subdomain of `nubus`, you must replace the subdomain of `portal` with the same subdomain.
+By default the portal will send you to openDesk's login screen.
-**Credentials:**
+## Credentials
 openDesk deploys with the standard user account `Administrator`, the password for which can be retrieved as follows:
@@ -477,18 +512,6 @@ docker run --rm registry.opencode.de/bmi/opendesk/components/platform-developmen
    --create_admin_accounts True
 ```
 ## Using from external repository
 Referring to `./helmfile_generic.yaml.gotmpl` from an external
 directory or repository is possible. The `helmfile.yaml.gotmpl` that refers to
 `./helmfile_generic.yaml.gotmpl` may define custom environments. These custom
 environments may overwrite specific configuration values. These
 configuration values are:
 * `global.domain`
 * `global.helmRegistry`
 * `global.master_password`
 # Uninstall
 You can uninstall the deployment by executing the following:
@@ -497,7 +520,7 @@ You can uninstall the deployment by executing the following:
 helmfile destroy -n <NAMESPACE>
 ```
-> **Note**<br>
+> [!note]
 > Not all Jobs, PersistentVolumeClaims, or Certificates are deleted; you have to delete them manually
 **'Sledgehammer destroy'** - for fast development turn-around times (at your own risk):
@@ -516,5 +539,5 @@ kubectl delete jobs --all --namespace ${NAMESPACE};
 kubectl delete configmaps --all --namespace ${NAMESPACE};
 ```
-> **Warning**<br>
+> [!warning]
 > Without specifying a `--namespace` flag, or by leaving it empty, cluster-wide components will get deleted!
--- a/docs/migrations.md
+++ b/docs/migrations.md
@@ -8,10 +8,27 @@ SPDX-License-Identifier: Apache-2.0
 <!-- TOC -->
 * [Disclaimer](#disclaimer)
 * [Deprecation warnings](#deprecation-warnings)
-* [Automated migrations - Overview and mandatory upgrade path](#automated-migrations---overview-and-mandatory-upgrade-path)
+* [Overview and mandatory upgrade path](#overview-and-mandatory-upgrade-path)
 * [Manual checks/actions](#manual-checksactions)
-  * [v1.7.1+](#v171)
+  * [Versions ≥ v1.11.0](#versions--v1110)
-    * [Pre-upgrade to v1.7.1+](#pre-upgrade-to-v171)
+    * [Pre-upgrade to versions ≥ v1.11.0](#pre-upgrade-to-versions--v1110)
      * [Helmfile new option: Annotations for external services (Dovecot, Jitsi JVB, Postfix)](#helmfile-new-option-annotations-for-external-services-dovecot-jitsi-jvb-postfix)
  * [Versions ≥ v1.10.0](#versions--v1100)
    * [Pre-upgrade to versions ≥ v1.10.0](#pre-upgrade-to-versions--v1100)
      * [Deployment cleanup: Collabora Controller](#deployment-cleanup-collabora-controller)
      * [Helmfile new secret: `secrets.nubus.ldapSearch.postfix`](#helmfile-new-secret-secretsnubusldapsearchpostfix)
      * [Helmfile new secret: `secrets.doveocot.sharedMailboxesMasterPassword`](#helmfile-new-secret-secretsdoveocotsharedmailboxesmasterpassword)
      * [New Helmfile default: Nubus provisioning debug container no longer deployed](#new-helmfile-default-nubus-provisioning-debug-container-no-longer-deployed)
      * [New Helmfile default: Postfix SMTP SASL security options](#new-helmfile-default-postfix-smtp-sasl-security-options)
    * [Post-upgrade to versions ≥ v1.10.0](#post-upgrade-to-versions--v1100)
      * [New application default: Dovecot full-text search index configuration](#new-application-default-dovecot-full-text-search-index-configuration)
  * [Versions ≥ v1.9.0](#versions--v190)
    * [Pre-upgrade to versions ≥ v1.9.0](#pre-upgrade-to-versions--v190)
      * [New application default: Postfix SMTP SASL security option](#new-application-default-postfix-smtp-sasl-security-option)
      * [Helmfile fix: Cassandra passwords read from `databases.*`](#helmfile-fix-cassandra-passwords-read-from-databases)
      * [Helmfile new feature: `functional.groupware.externalClients.*`](#helmfile-new-feature-functionalgroupwareexternalclients)
  * [Versions ≥ v1.8.0](#versions--v180)
    * [Pre-upgrade to versions ≥ v1.8.0](#pre-upgrade-to-versions--v180)
      * [New application default: Default group for two-factor authentication is now "2FA Users"](#new-application-default-default-group-for-two-factor-authentication-is-now-2fa-users)
      * [New database and secrets: Portal now uses OIDC](#new-database-and-secrets-portal-now-uses-oidc)
      * [New application default: XWiki blocks self-registration of user accounts](#new-application-default-xwiki-blocks-self-registration-of-user-accounts)
@@ -20,37 +37,39 @@ SPDX-License-Identifier: Apache-2.0
      * [Helmfile new default: New groupware settings changing current behaviour](#helmfile-new-default-new-groupware-settings-changing-current-behaviour)
      * [New application default: Nextcloud apps "Spreed" and "Comments" no longer enabled by default](#new-application-default-nextcloud-apps-spreed-and-comments-no-longer-enabled-by-default)
      * [New application default: Gravatar is switched off for Jitsi and OpenProject](#new-application-default-gravatar-is-switched-off-for-jitsi-and-openproject)
-  * [v1.7.0+](#v170)
+  * [Versions ≥ v1.7.0](#versions--v170)
-    * [Pre-upgrade to v1.7.0+](#pre-upgrade-to-v170)
+    * [Pre-upgrade to versions ≥ v1.7.0](#pre-upgrade-to-versions--v170)
      * [Helmfile fix: Ensure enterprise overrides apply when deploying from project root](#helmfile-fix-ensure-enterprise-overrides-apply-when-deploying-from-project-root)
      * [Replace Helm chart: New Notes Helm chart with support for self-signed deployments](#replace-helm-chart-new-notes-helm-chart-with-support-for-self-signed-deployments)
-    * [Post-upgrade to v1.7.0+](#post-upgrade-to-v170)
+    * [Post-upgrade to versions ≥ v1.7.0](#post-upgrade-to-versions--v170)
      * [Upstream fix: Provisioning of functional mailboxes](#upstream-fix-provisioning-of-functional-mailboxes)
-  * [v1.6.0+](#v160)
+  * [Versions ≥ v1.6.0](#versions--v160)
-    * [Pre-upgrade to v1.6.0+](#pre-upgrade-to-v160)
+    * [Pre-upgrade to versions ≥ v1.6.0](#pre-upgrade-to-versions--v160)
      * [Upstream constraint: Nubus' external secrets](#upstream-constraint-nubus-external-secrets)
      * [Helmfile new secret: `secrets.minio.openxchangeUser`](#helmfile-new-secret-secretsminioopenxchangeuser)
      * [Helmfile new object storage: `objectstores.openxchange.*`](#helmfile-new-object-storage-objectstoresopenxchange)
      * [OX App Suite fix-up: Using S3 as storage for non mail attachments (pre-upgrade)](#ox-app-suite-fix-up-using-s3-as-storage-for-non-mail-attachments-pre-upgrade)
-    * [Post-upgrade to v1.6.0+](#post-upgrade-to-v160)
+    * [Post-upgrade to versions ≥ v1.6.0](#post-upgrade-to-versions--v160)
      * [OX App Suite fix-up: Using S3 as storage for non mail attachments (post-upgrade)](#ox-app-suite-fix-up-using-s3-as-storage-for-non-mail-attachments-post-upgrade)
-  * [v1.4.0+](#v140)
+  * [Versions ≥ v1.4.0](#versions--v140)
-    * [Pre-upgrade to v1.4.0+](#pre-upgrade-to-v140)
+    * [Pre-upgrade to versions ≥ v1.4.0](#pre-upgrade-to-versions--v140)
      * [Helmfile new feature: `functional.authentication.ssoFederation`](#helmfile-new-feature-functionalauthenticationssofederation)
      * [Helmfile cleanup: `global.additionalMailDomains` as list](#helmfile-cleanup-globaladditionalmaildomains-as-list)
-  * [v1.2.0+](#v120)
+  * [Versions ≥ v1.3.0](#versions--v130)
-    * [Pre-upgrade to v1.2.0+](#pre-upgrade-to-v120)
+    * [Pre-upgrade to versions ≥ v1.3.0](#pre-upgrade-to-versions--v130)
      * [Helmfile new feature: `functional.authentication.ssoFederation`](#helmfile-new-feature-functionalauthenticationssofederation)
  * [Versions ≥ v1.2.0](#versions--v120)
    * [Pre-upgrade to versions ≥ v1.2.0](#pre-upgrade-to-versions--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)
+  * [Versions ≥ v1.1.2](#versions--v112)
-    * [Pre-upgrade to v1.1.2+](#pre-upgrade-to-v112)
+    * [Pre-upgrade to versions ≥ v1.1.2](#pre-upgrade-to-versions--v112)
      * [Helmfile feature update: App settings wrapped in `apps.` element](#helmfile-feature-update-app-settings-wrapped-in-apps-element)
-  * [v1.1.1+](#v111)
+  * [Versions ≥ v1.1.1](#versions--v111)
-    * [Pre-upgrade to v1.1.1](#pre-upgrade-to-v111)
+    * [Pre-upgrade to versions ≥ v1.1.1](#pre-upgrade-to-versions--v111)
      * [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)
+  * [Versions ≥ v1.1.0](#versions--v110)
-    * [Pre-upgrade to v1.1.0](#pre-upgrade-to-v110)
+    * [Pre-upgrade to versions ≥ v1.1.0](#pre-upgrade-to-versions--v110)
      * [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-)
@@ -60,10 +79,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 to versions ≥ v1.1.0](#post-upgrade-to-versions--v110)
      * [XWiki fix-ups](#xwiki-fix-ups)
-  * [v1.1.0](#v110-1)
+  * [Versions ≥ v1.0.0](#versions--v100)
-    * [Pre-upgrade to v1.1.0](#pre-upgrade-to-v110-1)
+    * [Pre-upgrade to versions ≥ v1.0.0](#pre-upgrade-to-versions--v100)
      * [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)
@@ -71,17 +90,17 @@ 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 to versions ≥ v1.0.0](#post-upgrade-to-versions--v100)
      * [Configuration Improvement: Separate user permission for using Video Conference component](#configuration-improvement-separate-user-permission-for-using-video-conference-component)
      * [Optional Cleanup](#optional-cleanup)
 * [Automated migrations - Details](#automated-migrations---details)
-  * [v1.6.0+ (automated)](#v160-automated)
+  * [Versions ≥ v1.6.0 (automated)](#versions--v160-automated)
-    * [v1.6.0+ migrations-post](#v160-migrations-post)
+    * [Versions ≥ v1.6.0 migrations-post](#versions--v160-migrations-post)
-  * [v1.2.0+ (automated)](#v120-automated)
+  * [Versions ≥ v1.2.0 (automated)](#versions--v120-automated)
-    * [v1.2.0+ migrations-pre](#v120-migrations-pre)
+    * [Versions ≥ v1.2.0 migrations-pre](#versions--v120-migrations-pre)
-    * [v1.2.0+ migrations-post](#v120-migrations-post)
+    * [Versions ≥ v1.2.0 migrations-post](#versions--v120-migrations-post)
-  * [v1.1.0+ (automated)](#v110-automated)
+  * [Versions ≥ v1.1.0 (automated)](#versions--v110-automated)
-  * [v1.0.0+ (automated)](#v100-automated)
+  * [Versions ≥ v1.0.0 (automated)](#versions--v100-automated)
  * [Related components and artifacts](#related-components-and-artifacts)
  * [Development](#development)
 <!-- TOC -->
@@ -96,12 +115,14 @@ These automated migrations have limitations in the sense that they require a cer
 Manual checks and possible activities are also required by openDesk updates, they are described in the section [Manual update steps](#manual-update-steps).
-> **Note**<br>
+> [!important]
-> Please be sure to _thoroughly_ read / follow the requirements before you update / upgrade.
+> Please be sure to _thoroughly_ read / follow the requirements before you update / upgrade and assure that
 > you are reading the correct version of this document (change branch / version if necessary).
-> **Known limitations**<br>
+> [!warning]
 > We assume that the PV reclaim policy is set to `delete`, resulting in PVs getting deleted as soon as the related PVC is deleted; we will not address explicit deletion for PVs.
 # Deprecation warnings
 We cannot hold back all migrations as some are required e.g. due to a change in a specific component that we want/need to update, we try to bundle others only with major releases.
@@ -115,31 +136,255 @@ This section provides an overview of potential changes to be part of the next ma
  - `persistence.storages.nubusUdmListener.storageClassName`
  - `persistence.storages.nubusProvisioningNats.storageClassName`
-# Automated migrations - Overview and mandatory upgrade path
+# Overview and mandatory upgrade path
 The following table gives an overview of the mandatory upgrade path of openDesk, required in order for the automated migrations to work as expected.
-To upgrade existing deployments, you cannot skip any version mentioned in the column *Mandatory version*. When a version number is not fully defined (e.g. `v1.1.x`), you can install any version matching that constraint.
+To upgrade existing deployments, you _cannot_ skip any version denoted with `yes` in the column
 *Mandatory*. This ensures [automated migrations](#automated-migrations---details) have the required previous
 state of openDesk. When a version number is not fully defined (e.g. `v1.1.x`), you can install any version
 matching that constraint, though our links always point to the newest patch release for that minor version.
-| Mandatory version |
+> [!warning]
-| ----------------- |
+> You must perform **all** manual pre and post upgrade steps for **any** major, minor and patch version up to your desired openDesk version!
 | v1.5.0            |
 | v1.1.x            |
 | v1.0.0            |
 | v0.9.0            |
 | v0.8.1            |
 <!-- | 1.x.x        |  add the entry to the table as soon as we get new migration requiring that the former migration was executed -->
-> **Note**<br>
+> [!note]
 > An exemplary update path for an upgrade from v1.3.2 to v1.7.1 would be:
 > 1. You are at v1.3.2 → pre steps for v1.4.0 to v1.5.0
 > 1. Upgrade to v1.5.0 → post steps for v1.4.0 to v1.5.0
 > 1. You are at v1.5.0 → pre steps for v1.6.0 to 1.7.1
 > 1. Upgrade to v1.7.1 → post steps for v1.6.0 to v1.7.1
 <!-- IMPORTANT: Make sure to mark mandatory releases if an automatic migration requires a previous update to be installed -->
 | Version                                                                                  | Mandatory | Pre-Upgrade                                                                                                                    | Post-Upgrade                             | Minimum Required Previous Version                    |
 | ---------------------------------------------------------------------------------------- | --------- | ------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------- | ---------------------------------------------------- |
 | [v1.10.0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/releases/v1.9.0) | --        | [Pre](#pre-upgrade-to-versions--v1100)                                                                                         | [Post](#post-upgrade-to-versions--v1100) | ⬇ Install ≥ v1.5.0 first                            |
 | [v1.9.0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/releases/v1.9.0)  | --        | [Pre](#pre-upgrade-to-versions--v190)                                                                                          | --                                       | ⬇ Install ≥ v1.5.0 first                            |
 | [v1.8.0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/releases/v1.8.0)  | --        | [Pre](#pre-upgrade-to-versions--v180)                                                                                          | --                                       | ⬇ Install ≥ v1.5.0 first                            |
 | [v1.7.x](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/releases/v1.7.1)  | --        | [Pre](#pre-upgrade-to-versions--v170)                                                                                          | [Post](#post-upgrade-to-versions--v170)  | ⬇ Install ≥ v1.5.0 first                            |
 | [v1.6.0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/releases/v1.6.0)  | --        | [Pre](#pre-upgrade-to-versions--v160)                                                                                          | [Post](#post-upgrade-to-versions--v160)  | [⚠ Install v1.5.0 first](#versions--v160-automated) |
 | [v1.5.0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/releases/v1.5.0)  | **yes**   | --                                                                                                                             | --                                       | ⬇ Install ≥ v1.1.x first                            |
 | [v1.4.x](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/releases/v1.4.1)  | --        | [Pre](#pre-upgrade-to-versions--v140)                                                                                          | --                                       | ⬇ Install ≥ v1.1.x first                            |
 | [v1.3.x](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/releases/v1.3.2)  | --        | [Pre](#pre-upgrade-to-versions--v130)                                                                                          | --                                       | ⬇ Install ≥ v1.1.x first                            |
 | [v1.2.x](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/releases/v1.2.1)  | --        | [Pre](#pre-upgrade-to-versions--v120)                                                                                          | --                                       | [⚠ Install v1.1.x first](#versions--v120-automated) |
 | [v1.1.x](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/releases/v1.1.2)  | **yes**   | [Pre .0](#pre-upgrade-to-versions--v110) → [Pre .1](#pre-upgrade-to-versions--v111) → [Pre .2](#pre-upgrade-to-versions--v112) | [Post](#post-upgrade-to-versions--v110)  | [⚠ Install v1.0.0 first](#versions--v110-automated) |
 | [v1.0.0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/releases/v1.0.0)  | **yes**   | [Pre](#pre-upgrade-to-versions--v100)                                                                                          | [Post](#post-upgrade-to-versions--v100)  | [⚠ Install v0.9.0 first](#versions--v100-automated) |
 | [v0.9.0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/releases/v0.9.0)  | **yes**   | --                                                                                                                             | --                                       | --                                                   |
 > [!warning]
 > Be sure to check out the table in the release version you are going to install, and not the currently installed version.
 If you would like more details about the automated migrations, please read section [Automated migrations - Details](#automated-migrations---details).
 # Manual checks/actions
-## v1.7.1+
+> [!note]
 > We **only** use the mathematical symbol ≥ to denote for which versions manual steps must be
 > applied. For example, "Versions ≥ v1.7.0" refers to all openDesk versions (major, minor and
 > patch) starting from 1.7.0, e.g. 1.7.0, 1.7.1, 1.8.0, etc. Furthermore, if a version is not explicitly
 > listed no extra manual steps are required when upgrading to that version, e.g. in the case of an update from
 > version 1.7.0 to version 1.7.1.
-### Pre-upgrade to v1.7.1+
+## Versions ≥ v1.11.0
 ### Pre-upgrade to versions ≥ v1.11.0
 #### Helmfile new option: Annotations for external services (Dovecot, Jitsi JVB, Postfix)
 **Target group:** Existing deployments using `service` annotations.
 The three non-HTTP external services support now explicit annotations.
 See [`annotations.yaml.gomtpl`](../helmfile/environments/default/annotations.yaml.gotmpl) for reference.
 **Jitsi JVB**
 The already existing annotation key `annotations.jitsiJVB.service` has been renamed to
 `annotations.jitsiJVB.serviceExternal` be in line with the newly added ones for Postfix and Dovecot.
 If you make use of the JVB service annotation please rename the attribute to the new `serviceExternal` standard.
 **Dovecot**
 Setting service annotation by `annotations.openxchangeDovecot.service` applied the annotations to the internal
 and external service. This key now only sets annotations for the internal service. If you want to set
 annotations for the external service use the newly introduced key `annotations.openxchangeDovecot.serviceExternal`.
 **Postfix**
 Setting service annotation by `annotations.openxchangePostfix.service` applied the annotations to the internal
 and external service. This key now only sets annotations for the internal service. If you want to set
 annotations for the external service use the newly introduced key `annotations.openxchangePostfix.serviceExternal`.
 ## Versions ≥ v1.10.0
 ### Pre-upgrade to versions ≥ v1.10.0
 #### Deployment cleanup: Collabora Controller
 **Target group:** Existing openDesk Enterprise deployments using Collabora Controller. Actually only long running
 deployments are affected, but following the instructions won't hurt.
 As per upstream release notes for [Collabora Online Controller 1.1.4](https://www.collaboraonline.com/cool-controller-release-notes/)
 you have to remove the existing leases of the Controller. You can do so by setting `<your_namespace>` and executing
 the commands below.
 ```shell
 export NAMESPACE=<your_namespace>
 export COLLABORA_CONTROLLER_DEPLOYMENT_NAME=collabora-controller-cool-controller
 kubectl -n ${NAMESPACE} scale deployment/${COLLABORA_CONTROLLER_DEPLOYMENT_NAME} --replicas=0
 kubectl -n ${NAMESPACE} delete -n collabora leases.coordination.k8s.io collabora-online
 ```
 > [!note]
 > The Collabora Online Controller is not scaled up again, as this would happen as part of the upgrade deployment.
 #### Helmfile new secret: `secrets.nubus.ldapSearch.postfix`
 **Target group:** All existing deployments that use self-defined secrets.
 The updated Postfix configuration supporting LDAP group based mailing list requires a new secret that is
 declared in [`secrets.yaml.gotmpl`](../helmfile/environments/default/secrets.yaml.gotmpl) by the key
 `secrets.nubus.ldapSearch.postfix`.
 If you define your own secrets, please ensure that you provide a value for this secret, otherwise it will
 be derived from the `MASTER_PASSWORD`.
 #### Helmfile new secret: `secrets.doveocot.sharedMailboxesMasterPassword`
 **Target group:** All existing deployments that have OX App Suite enabled and that use self-defined secrets.
 The revised Dovecot configuration requires a new secret that is declared in
 [`secrets.yaml.gotmpl`](../helmfile/environments/default/secrets.yaml.gotmpl) by the key
 `secrets.doveocot.sharedMailboxesMasterPassword`.
 If you define your own secrets, please ensure that you provide a value for this secret, otherwise it will
 be derived from the `MASTER_PASSWORD`.
 #### New Helmfile default: Nubus provisioning debug container no longer deployed
 **Target group:** All deployments that make use of the debugging container for Nubus' provisioning stack called "nats-box",
 The [nats-box](https://github.com/nats-io/nats-box), a handy tool when it comes to debugging the Nubus provisioning stack, is no longer enabled in openDesk by default.
 To re-enable the nats-box for your deployment you have to set:
 ```yaml
 technical:
  nubus:
    provisioning:
      nats:
        natsBox:
          enabled: true
 ```
 > [!note]
 > The nats-box also gets enabled when setting `debug.enabled: true`, but that should only be used in non-production scenarios and enabled debug
 > accross the whole deployment.
 #### New Helmfile default: Postfix SMTP SASL security options
 **Target group:** All openDesk deployments using an external SMTP relay that does not support
 [Postfix's default `smtpSASLSecurityOptions`](https://www.postfix.org/postconf.5.html#smtp_sasl_security_options).
 Starting from openDesk v1.9.0, the SMTP SASL security options set within openDesk are aligned with the
 recommended defaults. This might break currently working connections with external SMTP relays.
 > [!warning]
 > Please check your mail relays supported SASL security options and adjust your deployment accordingly to
 > prevent the disruption of mail delivery.
 To fall back to the behavior of openDesk < v1.9.0 (no security options at all) set the following in
 `smtp.yaml.gotmpl`
 ``` yaml
 smtp:
  security:
    smtpdSASLSecurityOptions: ~
    smtpSASLSecurityOptions: ~
 ```
 To set specific options consult the official Postfix documentation for
 [smtpd](https://www.postfix.org/postconf.5.html#smtpd_sasl_security_options) or
 [smtp](https://www.postfix.org/postconf.5.html#smtp_sasl_security_options) and set the string options via the
 yaml array notation:
 ``` yaml
 smtp:
  security:
    smtpdSASLSecurityOptions:
      - "noanonymous"
    smtpSASLSecurityOptions:
      - "noanonymous"
      - "noplaintext"
 ```
 ### Post-upgrade to versions ≥ v1.10.0
 #### New application default: Dovecot full-text search index configuration
 **Target group:** All openDesk Enterprise deployments using the groupware module.
 Due to a configurational change the full-text search indexes of Dovecot Pro need to be rebuilt.
 Run the following command inside the Dovecot container:
 ```shell
 set -x; for d in /var/lib/dovecot/*/*; do uuid=$(basename "$d"); [[ $uuid =~ ^[0-9a-fA-F]{8}-([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}$ ]] || continue; doveadm fts rescan -u "$uuid"; doveadm index -u "$uuid" -q '*'; done
 ```
 ## Versions ≥ v1.9.0
 ### Pre-upgrade to versions ≥ v1.9.0
 #### New application default: Postfix SMTP SASL security option
 **Target group:** All openDesk deployments using an external SMTP relay that does not support
 [Postfix's default `smtpSASLSecurityOptions`](https://www.postfix.org/postconf.5.html#smtp_sasl_security_options).
 Starting from openDesk v1.9.0, the SMTP SASL security options set within openDesk are aligned with the
 recommended defaults. This might break currently working connections with external SMTP relays. To prevent
 this you have to configure the supported options for your mail relay one of the following ways:
 - Recommended: Directly upgrade to v1.10.0 and set SMTP SASL options through `smtp.security.*`.
 - Configure a customization for `smtpSASLSecurityOptions`.
 #### Helmfile fix: Cassandra passwords read from `databases.*`
 **Target group:** All of the below must apply to your deployment:
 1. Enterprise Edition
 2. Using external Cassandra DB
 3. Defined the Cassandra passwords in `databases.*` (`database.yaml.gotmpl`) which got ignored until now
 4. Defined the Cassandra passwords then in `secrets.*` (`secrets.yaml.gotmpl`)
 The Cassandra passwords
 - `databases.dovecotDictmap.password`
 - `databases.dovecotACL.password`
 are no longer ignored. So please move the passwords from
 - `secrets.cassandra.dovecotDictmapUser`
 - `secrets.cassandra.dovecotACLUser`
 to the `databases.*` structure.
 #### Helmfile new feature: `functional.groupware.externalClients.*`
 **Target group:**
 Deployments that allow access to groupware emails via external mail clients (e.g. Thunderbird) using IMAP and SMTP.
 OX App Suite can display a dialog with configuration details for connecting external mail clients. In previous versions,
 this dialog was automatically enabled when Dovecot was deployed with a service type of `NodePort` or `LoadBalancer`.
 From now on, the dialog can be explicitly controlled via the setting
 `functional.groupware.externalClients.enabledOnboardingInfo`, which is set to `false` by default.
 If you want your users to see this dialog, set the attribute to `true`.
 Additionally, it is now possible to explicitly define the hostnames shown in the client onboarding dialog using the following values:
 - `functional.groupware.externalClients.fqdnImap`
 - `functional.groupware.externalClients.fqdnSmtp`
 If these values are not explicitly set, openDesk will use `.Values.global.domain` as in previous releases.
 ## Versions ≥ v1.8.0
 ### Pre-upgrade to versions ≥ v1.8.0
 #### New application default: Default group for two-factor authentication is now "2FA Users"
@@ -162,8 +407,8 @@ The portal has been migrated to use OIDC for single sign-on by default. This int
  - `secrets.keycloak.clientSecret.portal`: The OIDC client secret for the portal.
  - `secrets.postgresql.umsAuthSessionUser`: For internal databases, set the secret for the database user here. If you are using an external database, you already provide these credentials in the New database step above.
-> **Note**<br>
+> [!note]
-> The SAML Client for the Nubus portal is still preserved in Keycloak and will be removed in one of the next openDesk releases.
+> The SAML Client for the Nubus portal is still preserved in Keycloak and is going to be removed with openDesk 1.10.0.
 #### New application default: XWiki blocks self-registration of user accounts
@@ -199,7 +444,7 @@ To preserve as much data as possible, dedicated upgrade guidelines for each of t
 - Matrix Meetings widget: https://github.com/nordeck/matrix-meetings?tab=readme-ov-file#matrix-room-upgrades
 - Matrix Poll widget: https://github.com/nordeck/matrix-poll?tab=readme-ov-file#matrix-room-upgrades
-> **Note**<br>
+> [!note]
 > These instructions apply to any room upgrades, not just upgrade to `v12`.
 #### New Helmfile default: Restricting characters for directory and filenames in fileshare module
@@ -252,7 +497,7 @@ The following options, newly introduced in `functional.yaml.gotmpl`, modify the
  The display name is centrally managed by the openDesk IAM.
  To allow users to change it within OX App Suite, set this option to `true`.
-> **Note**<br>
+> [!note]
 > openDesk v1.8.0 adds even more options under `functional.groupware.*` while retaining the current default behaviour.
 #### New application default: Nextcloud apps "Spreed" and "Comments" no longer enabled by default
@@ -294,9 +539,9 @@ Gravatar support is no longer enabled by default in Jitsi and OpenProject. In ca
    OPENPROJECT_PLUGIN__OPENPROJECT__AVATARS: '{enable_gravatars: true, enable_local_avatars: true}'
  ```
-## v1.7.0+
+## Versions ≥ v1.7.0
-### Pre-upgrade to v1.7.0+
+### Pre-upgrade to versions ≥ v1.7.0
 #### Helmfile fix: Ensure enterprise overrides apply when deploying from project root
@@ -327,7 +572,7 @@ annotation:
  notesYProvider: {}
 ```
-### Post-upgrade to v1.7.0+
+### Post-upgrade to versions ≥ v1.7.0
 #### Upstream fix: Provisioning of functional mailboxes
@@ -354,16 +599,18 @@ kill ${PROVISIONING_PORT_FORWARD_PID}
 rm ${TEMPORARY_CONSUMER_JSON}
 ```
-## v1.6.0+
+## Versions ≥ v1.6.0
-### Pre-upgrade to v1.6.0+
+### Pre-upgrade to versions ≥ v1.6.0
 #### Upstream constraint: Nubus' external secrets
 **Target group:** Operators that use external secrets for Nubus.
-> **Note**<br>
+> [!note]
-> External Secrets are not yet a supported feature. We are working on making it available in 2025, though it is possible to make use of the support for external secrets within single applications using the openDesk [customization](../helmfile/environments/default/customization.yaml.gotmpl) options.
+> External secrets are not yet a supported feature. We are working on making it available in 2025,
 > though it is possible to make use of the support for external secrets within single applications using the
 > openDesk [customization](../helmfile/environments/default/customization.yaml.gotmpl) options.
 Please ensure you read the [Nubus 1.10.0 "Migration steps" section](https://docs.software-univention.de/nubus-kubernetes-release-notes/1.x/en/changelog.html#v1-10-0-migration-steps) with focus on the paragraph "Operators that make use of the following UDM Listener secrets variables" and act accordingly.
@@ -373,7 +620,7 @@ Please ensure you read the [Nubus 1.10.0 "Migration steps" section](https://docs
 For OX App Suite to access the object storage a new secret has been introduced.
-It is declared in [`secrets.yaml.gotmpl`](../helmfile/environments/default/secrets.yaml.gotmpl) by the key: `secrets.minio.openxchangeUser`. If you define your own secrets, please ensure that you provide a value for this secret as well, otherwise the aforementioned secret will be derived from the `MASTER_PASSWORD`.
+It is declared in [`secrets.yaml.gotmpl`](../helmfile/environments/default/secrets.yaml.gotmpl) by the key: `secrets.minio.openxchangeUser`. If you define your own secrets, please ensure that you provide a value for this secret as well, otherwise it will be derived from the `MASTER_PASSWORD`.
 #### Helmfile new object storage: `objectstores.openxchange.*`
@@ -409,7 +656,7 @@ kubectl cp -n ${NAMESPACE} open-xchange-core-mw-default-0:/opt/open-xchange/ox-f
 2. Run the upgrade.
 3. Continue with the [related post-upgrade steps](#ox-app-suite-fix-up-using-s3-as-storage-for-non-mail-attachments-post-upgrade)
-### Post-upgrade to v1.6.0+
+### Post-upgrade to versions ≥ v1.6.0
 #### OX App Suite fix-up: Using S3 as storage for non mail attachments (post-upgrade)
@@ -450,15 +697,9 @@ ID    Type of Job                              Status     Further Information
 /opt/open-xchange/sbin/unregisterfilestore -A $MASTER_ADMIN_USER -P $MASTER_ADMIN_PW -i <your_old_filestore_id_from_step_3>
 ```
-## v1.4.0+
+## Versions ≥ v1.4.0
-### Pre-upgrade to v1.4.0+
+### Pre-upgrade to versions ≥ v1.4.0
 #### Helmfile new feature: `functional.authentication.ssoFederation`
 **Target group:** Deployments that make use of IdP federation as described in [`idp-federation.md`](./enhanced-configuration/idp-federation.md).
 Please ensure to configure your IdP federation config details as part of `functional.authentication.ssoFederation`. You can find more details in the "Example configuration" section of [`idp-federation.md`](./enhanced-configuration/idp-federation.md).
 #### Helmfile cleanup: `global.additionalMailDomains` as list
@@ -482,9 +723,19 @@ global:
    - "sub2.maildomain.de"
 ```
-## v1.2.0+
+## Versions ≥ v1.3.0
-### Pre-upgrade to v1.2.0+
+### Pre-upgrade to versions ≥ v1.3.0
 #### Helmfile new feature: `functional.authentication.ssoFederation`
 **Target group:** Deployments that make use of IdP federation as described in [`idp-federation.md`](./enhanced-configuration/idp-federation.md).
 Please ensure to configure your IdP federation config details as part of `functional.authentication.ssoFederation`. You can find more details in the "Example configuration" section of [`idp-federation.md`](./enhanced-configuration/idp-federation.md).
 ## Versions ≥ v1.2.0
 ### Pre-upgrade to versions ≥ v1.2.0
 #### Helmfile cleanup: Do not configure OX provisioning when no OX installed
@@ -545,9 +796,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+
+## Versions ≥ v1.1.2
-### Pre-upgrade to v1.1.2+
+### Pre-upgrade to versions ≥ v1.1.2
 #### Helmfile feature update: App settings wrapped in `apps.` element
@@ -576,9 +827,9 @@ apps:
    enabled: true
 ```
-## v1.1.1+
+## Versions ≥ v1.1.1
-### Pre-upgrade to v1.1.1
+### Pre-upgrade to versions ≥ v1.1.1
 #### Helmfile feature update: Component specific `storageClassName`
@@ -631,9 +882,9 @@ persistence:
 A not yet templated secret was discovered in the Nubus deployment. It is now declared in [`secrets.yaml.gotmpl`](../helmfile/environments/default/secrets.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+
+## Versions ≥ v1.1.0
-### Pre-upgrade to v1.1.0
+### Pre-upgrade to versions ≥ v1.1.0
 #### Helmfile cleanup: Restructured `/helmfile/files/theme` folder
@@ -796,7 +1047,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 to versions ≥ v1.1.0
 #### XWiki fix-ups
@@ -822,13 +1073,13 @@ 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
+## Versions ≥ v1.0.0
-### Pre-upgrade to v1.1.0
+### Pre-upgrade to versions ≥ v1.0.0
 #### Configuration Cleanup: Removal of unnecessary OX-Profiles in Nubus
-> **Warning**<br>
+> [!warning]
 > The upgrade will fail if you do not address this section in your current deployment.
 The update will remove unnecessary OX-Profiles in Nubus, so long as these profiles are in use.
@@ -1006,7 +1257,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 to versions ≥ v1.0.0
 #### Configuration Improvement: Separate user permission for using Video Conference component
@@ -1022,7 +1273,7 @@ This can be done as IAM admin:
 - Check the checkbox for *Video Conference* and the directly below check box for *Overwrite*.
 - Click on the green *Save* button at the top of the screen to apply the change.
-> **Hint**<br>
+> [!tip]
 > If you have a lot of users and want to update (almost) all them, you can select all users by clicking the checkbox in the user's table header and then de-selecting the users you do not want to update.
 #### Optional Cleanup
@@ -1038,33 +1289,33 @@ kubectl -n ${NAMESPACE} delete pvc ox-connector-ox-contexts-ox-connector-0
 # Automated migrations - Details
-## v1.6.0+ (automated)
+## Versions ≥ v1.6.0 (automated)
-> **Note**<br>
+> [!note]
 > Details can be found in [run_5.py](https://gitlab.opencode.de/bmi/opendesk/components/platform-development/images/opendesk-migrations/-/blob/main/odmigs-python/odmigs_runs/run_5.py).
-### v1.6.0+ migrations-post
+### Versions ≥ v1.6.0 migrations-post
-Restarting the StatefulSets `ums-provisioning-nats` and `ox-connector` due to a workaround applied on the NATS secrets, see the "Notes" segment of the ["Password seed" heading in getting-started.md](./docs/getting-started.md#password-seed)
+- Automatically restarts the StatefulSets `ums-provisioning-nats` and `ox-connector` due to a workaround applied on the NATS secrets, see the "Notes" segment of the ["Password seed" heading in getting-started.md](./docs/getting-started.md#password-seed)
-> **Note**<br>
+> [!note]
 > This change aims to prevent authentication failures with NATS in some Pods, which can lead to errors such as: `wait-for-nats Unavailable, waiting 2 seconds. Error: nats: 'Authorization Violation'`.
-## v1.2.0+ (automated)
+## Versions ≥ v1.2.0 (automated)
-> **Note**<br>
+> [!note]
 > 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).
-### v1.2.0+ migrations-pre
+### Versions ≥ v1.2.0 migrations-pre
- Delete PVC `group-membership-cache-ums-portal-consumer-0`: With the upgrade the Nubus Portal Consumer no longer requires to be executed with root privileges. The PVC contains files that require root permission to access them, therefore the PVC gets deleted (and re-created) during the upgrade.
+- Automatically deletes PVC `group-membership-cache-ums-portal-consumer-0`: With the upgrade the Nubus Portal Consumer no longer requires to be executed with root privileges. The PVC contains files that require root permission to access them, therefore the PVC gets deleted (and re-created) during the upgrade.
- Delete StatefulSet `ums-portal-consumer`: A bug was fixed in the templating of the Portal Consumer's PVC causing the values in `persistence.storages.nubusPortalConsumer.*` to be ignored. As these values are immutable, we had to delete the whole StatefulSet.
+- Automatically deletes StatefulSet `ums-portal-consumer`: A bug was fixed in the templating of the Portal Consumer's PVC causing the values in `persistence.storages.nubusPortalConsumer.*` to be ignored. As these values are immutable, we had to delete the whole StatefulSet.
-### v1.2.0+ migrations-post
+### Versions ≥ v1.2.0 migrations-post
- 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.
+- Automatically restarts the Deployment `ums-provisioning-udm-transformer` and StatefulSet `ums-provisioning-udm-listener` and deletes 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)
+## Versions ≥ v1.1.0 (automated)
 With openDesk v1.1.0 the IAM stack supports HA LDAP primary as well as scalable LDAP secondary pods.
@@ -1072,16 +1323,16 @@ openDesk's automated migrations takes care of this upgrade requirement described
 [Nubus 1.5.1](https://docs.software-univention.de/nubus-kubernetes-release-notes/1.5.1/en/changelog.html#migrate-existing-ldap-server-to-mirror-mode-readiness),
 creating the config map with the mentioned label.
-> **Note**<br>
+> [!note]
 > 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)
+## Versions ≥ v1.0.0 (automated)
 The `migrations-pre` and `migrations-post` jobs in the openDesk deployment address the automated migration tasks.
 The permissions required to execute the migrations can be found in the migration's Helm chart [`role.yaml'](https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-migrations/-/blob/v1.3.5/charts/opendesk-migrations/templates/role.yaml?ref_type=tags#L29).
-> **Note**<br>
+> [!note]
 > Details can be found in [run_2.py](https://gitlab.opencode.de/bmi/opendesk/components/platform-development/images/opendesk-migrations/-/blob/main/odmigs-python/odmigs_runs/run_3.py).
 ## Related components and artifacts
--- a/docs/monitoring.md
+++ b/docs/monitoring.md
@@ -23,8 +23,7 @@ openDesk includes integration with Prometheus-based monitoring.
 Together with [kube-prometheus-stack](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack), you can easily leverage the full potential of the open-source cloud-native observability stack.
-Before enabling the following options, you need to install the respective custom resource definitions (CRDs) from the kube-prometheus-stack
+Before enabling the following options, you need to install the respective custom resource definitions (CRDs) from the kube-prometheus-stack repository which should at least include the Prometheus Operator.
 repository or Prometheus operator.
 # Defaults
@@ -33,14 +32,16 @@ All configurable options and their defaults can be found in
 # Metrics
-To deploy `podMonitor` and `serviceMonitor` custom resources, enable it by:
+To deploy `podMonitor` and `serviceMonitor` custom resources, enable them by:
 ```yaml
-prometheus:
+monitoring:
-  serviceMonitors:
+  prometheus:
-    enabled: true
+    serviceMonitors:
-  podMonitors:
+      enabled: true
-    enabled: true
+    podMonitors:
      enabled: true
 ```
 ```
 # Alerts
@@ -51,19 +52,23 @@ Some of these are created by our partners while others are defined in [opendesk-
 All alert rules are deployed as [PrometheusRule](https://prometheus-operator.dev/docs/api-reference/api/#monitoring.coreos.com/v1.PrometheusRule) and can be enabled like this:
 ```yaml
-prometheus:
+monitoring:
-  prometheusRules:
+  prometheus:
-    enabled: true
+    prometheusRules:
      enabled: true
 ```
 # Dashboards for Grafana
-To deploy optional Grafana dashboards with ConfigMaps, enable the functionality with:
+If your Grafana instance is deployed via kube-prometheus-stack, or you have deployed the [Sidecar for datasources](https://github.com/grafana/helm-charts/blob/main/charts/grafana/README.md#sidecar-for-datasources), openDesk can make dashboards available via ConfigMap resources. 
 Enable the functionality with the following snippet:
 ```yaml
-grafana:
+monitoring:
-  dashboards:
+  grafana:
-    enabled: true
+    dashboards:
      enabled: true
 ```
 Please find further details in the [related Helm chart](https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-dashboards).
--- a/docs/permissions.md
+++ b/docs/permissions.md
@@ -52,8 +52,9 @@ Roles are defined sets of permissions that can be assigned to users. Each role c
 - **openDesk Administrator**: Manages openDesk-global settings, such as users and groups.
 - **openDesk User**: Can log in to openDesk to make use of defined openDesk applications.
-> **Note**<br>
+> [!note]
-> Although it is not enforced by openDesk, it is strongly recommended that a user account is not granted both roles at the same time. This is to maintain the separation of duties.
+> Although it is not enforced by openDesk, it is strongly recommended that a user account is not granted both
 > roles at the same time. This is to maintain the separation of duties.
 ### Application usage
@@ -93,15 +94,20 @@ When editing a user in the IAM, you can select if a user can access or get eleva
 To easily identify these groups, all of them are prefixed with `managed-by-Attribute-`.
-> **Note**<br>
+> [!note]
-> The membership of these groups is automatically managed based on the user's attributes from the "openDesk" tab. Any changes directly to the groups will be overwritten, so please always use the "openDesk" tab of the respective user. The IAM supports editing user attributes across multiple accounts simultaneously.
+> The membership of these groups is automatically managed based on the user's attributes from the "openDesk"
 > tab. Any changes directly to the groups will be overwritten, so please always use the "openDesk" tab of the
 > respective user. The IAM supports editing user attributes across multiple accounts simultaneously.
 #### Standard access to applications
 Unless a user is a member of a group, the respective application is not shown in the portal.
-> **Note**<br>
+> [!note]
-> In openDesk's identity provider, the required OIDC claims to access an application are only granted when the respective group membership is available. This means that even if a user who is not a member of an application group knows the link to the application and calls it directly, the single sign-on will be unsuccessful.
+> In openDesk's identity provider, the required OIDC claims to access an application are only granted when the
 > respective group membership is available. This means that even if a user who is not a member of an
 > application group knows the link to the application and calls it directly, the single sign-on will be
 > unsuccessful.
 - **managed-by-Attribute-Groupware**: Members of this group have access to the groupware applications.
 - **managed-by-Attribute-Fileshare**: Members of this group have access to the file sharing application.
@@ -130,7 +136,7 @@ Users get roles assigned based on their responsibilities and the tasks they need
 openDesk defines [templates](https://gitlab.opencode.de/bmi/opendesk/components/platform-development/images/opendesk-nubus/-/blob/main/udm/udm-data-loader/65-usertemplate.yaml) for the *User* and *Administrator* roles. The templates can be used by an *openDesk Administrator* to create users with these roles using the [administration portal](https://docs.opendesk.eu/administration/).
-> **Note**<br>
+> [!note]
 > Additional/custom templates can be created using the UDM REST API.
 ### *openDesk User*
@@ -195,8 +201,10 @@ Managing all application permissions within the IAM would require a superset of
 Within IAM groups, the visibility of openDesk applications can be configured. Like with users, this is done in the "openDesk" tab of the [group administration](https://docs.opendesk.eu/administration/gruppen/).
-> **Note**<br>
+> [!note]
-> Currently the openDesk applications do not support nested groups. As a result only direct group memberships of users are processed in the application.<br>
+> Currently the openDesk applications do not support nested groups. As a result only direct group memberships
-> The plan is to enable the openDesk applications to either support nested groups or to actively provision users into an application while resolving the nested group memberships for the application.
+> of users are processed in the application.<br> The plan is to enable the openDesk applications to either
 > support nested groups or to actively provision users into an application while resolving the nested group
 > memberships for the application.
 Within an application, each available group can have a set of application specific permissions assigned.
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -34,7 +34,10 @@ openDesk follows a structured release cycle to ensure predictability and reliabi
 | **Minor**      | Monthly        | New features, enhancements, may contain breaking changes or refactors (clearly flagged in the notes)              |
 | **Patch**      | On demand      | Bug fixes, security updates, minor improvements, no intended breaking changes               |
-> **Note:** openDesk does **not** guarantee that minor releases are 100% backward‑compatible. When a breaking change is unavoidable it is announced in the release notes under a dedicated header **“Breaking Changes”** and a migration guide is provided.
+> [!note]
 > openDesk does **not** guarantee that minor releases are 100% backward‑compatible. When a breaking > change
 > is unavoidable it is announced in the release notes under a dedicated header **“Breaking Changes”** > and a
 > migration guide is provided.
 ## Release schedule
@@ -52,7 +55,7 @@ openDesk follows a structured release cycle to ensure predictability and reliabi
 - openDesk does not guarantee an in‑place upgrade between two major versions. Always consult the release notes and plan appropriate migration efforts.
 - Even within the same major line, skipping multiple monthly minor versions is not guaranteed to work without intermediate upgrade steps.
 - All breaking changes, including those in monthly minor releases, are highlighted in the release notes under Breaking Changes.
- Additional, non‑binding migration hints are collected in `migrations.md`
+- Additional, non‑binding migration hints are collected in [migrations.md](./migrations.md)
 # Patch management process
--- a/docs/requirements.md
+++ b/docs/requirements.md
@@ -29,14 +29,14 @@ 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)
- [Helm](https://helm.sh/) >= v3.17.3, but not v3.18.0[^1]
+- [Helm](https://helm.sh/) >= v3.17.3 (but not v3.18.0[^1]) and < v4[^2],
 - [Helmfile](https://helmfile.readthedocs.io/en/latest/) >= v1.0.0
 - [HelmDiff](https://github.com/databus23/helm-diff) >= v3.11.0
- Volume provisioner supporting RWO (read-write-once)[^2]
+- Volume provisioner supporting RWO (read-write-once)[^3]
 - Certificate handling with [cert-manager](https://cert-manager.io/)
 **Additional openDesk Enterprise requirements**
- [OpenKruise](https://openkruise.io/)[^3] >= v1.6
+- [OpenKruise](https://openkruise.io/)[^4] >= v1.6
 # Hardware
@@ -55,7 +55,7 @@ Any self-hosted or managed K8s cluster >= v1.24 listed in
 The deployment is tested against [kubespray](https://github.com/kubernetes-sigs/kubespray) based clusters.
-> **Note**<br>
+> [!note]
 > The deployment is not tested against OpenShift.
 # Ingress controller
@@ -67,7 +67,7 @@ configured ingress controller deployed in your cluster.
 - [Ingress NGINX Controller](https://github.com/kubernetes/ingress-nginx)
-> **Note**<br>
+> [!note]
 > The platform development team is evaluating the use of [Gateway API](https://gateway-api.sigs.k8s.io/).
 **Compatibility with Ingress NGINX >= 1.12.0**
@@ -79,8 +79,9 @@ 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>
+> [!warning]
-> 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.11.5 or 1.12.1 due to [security
 > issues](https://www.wiz.io/blog/ingress-nginx-kubernetes-vulnerabilities) in earlier versions.
 ## Minimal configuration
@@ -96,7 +97,7 @@ See the [`allowSnippetAnnotations` documentation](https://kubernetes.github.io/i
 Initial evaluation deployment requires a `ReadWriteOnce` volume provisioner. For local deployment, a local- or hostPath-
 provisioner is sufficient.
-> **Note**<br>
+> [!note]
 > Some components require a `ReadWriteMany` volume provisioner for distributed mode or horizontal scaling.
 # Certificate management
@@ -137,8 +138,11 @@ Helmfile requires [HelmDiff](https://github.com/databus23/helm-diff) to compare
 # Footnotes
-[^1]: Due to a [Helm bug](https://github.com/helm/helm/issues/30890) Helm 3.18.0 is not supported.
+[^1]: Due to a [Helm bug](https://github.com/helm/helm/issues/30890) Helm v3.18.0 is not supported.
-[^2]: 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. E.g. the `local-path-provisioner` does not have sticky bit support.
+[^2]: Helm v4 introduced stricter flag grouping that is not yet supported by the helmdiff plugin.
 [^3]: 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. E.g. the `local-path-provisioner` does not have sticky bit support.
 [^4]: Required for Dovecot Pro as part of openDesk Enterprise Edition.
 [^3]: Required for Dovecot Pro as part of openDesk Enterprise Edition.
--- a/docs/security.md
+++ b/docs/security.md
@@ -21,9 +21,10 @@ For more details on Chart validation, please visit: https://helm.sh/docs/topics/
 All charts except the ones mentioned below are verifiable:
-| Repository        | Verifiable |
+| Repository                | Verifiable |
-|-------------------|:----------:|
+| ------------------------- | :--------: |
-| open-xchange-repo |     no     |
+| collabora-controller-repo |     no     |
 | open-xchange-repo         |     no     |
 # Kubernetes security enforcements
--- a/docs/theming.md
+++ b/docs/theming.md
@@ -20,9 +20,9 @@ Please review the default configuration that is applied to understand your custo
 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.
-> **Note**<br>
+> [!note]
-> Theming focuses on colors, iconography and imagery. If you like to adapt the default links in the portal pointing to external
+> Theming focuses on colors, iconography and imagery. If you like to adapt the default links in the portal
-> resources (like "Support", "Legal Notice") please check the `functional.portal` section
+> pointing to external resources (like "Support", "Legal Notice") please check the `functional.portal` section
 > in [`functional.yaml.gotmpl`](../helmfile/environments/default/functional.yaml.gotmpl)
 # Known limitations
--- a/helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl
+++ b/helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl
@@ -47,7 +47,10 @@ ingress:
        - "{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}"
 podAnnotations:
-  {{ .Values.annotations.coco.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "collabora-controller"
  {{- with .Values.annotations.coco.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 securityContext:
  allowPrivilegeEscalation: false
--- a/helmfile/apps/collabora/values.yaml.gotmpl
+++ b/helmfile/apps/collabora/values.yaml.gotmpl
@@ -35,7 +35,7 @@ collabora:
    {{- end }}
    {{- if .Values.apps.collaboraController.enabled }}
    --o:indirection_endpoint.url=https://{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}/controller/routeToken
-    --o:monitors.monitor[0]=ws://collabora-controller-cool-controller:9000/controller/ws
+    --o:monitors.monitor[0]=ws://collabora-controller-cool-controller.{{ .Release.Namespace }}.svc.{{ .Values.cluster.networking.domain }}:9000/controller/ws
    --o:monitors.monitor[0][@retryInterval]=5
    {{- end }}
  username: "collabora-internal-admin"
@@ -110,7 +110,10 @@ ingress:
        - "{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}"
 podAnnotations:
-  {{ .Values.annotations.collabora.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "collabora"
  {{- with .Values.annotations.collabora.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  fsGroup: 1001
--- a/helmfile/apps/cryptpad/values.yaml.gotmpl
+++ b/helmfile/apps/cryptpad/values.yaml.gotmpl
@@ -55,7 +55,10 @@ persistence:
  enabled: false
 podAnnotations:
-  {{ .Values.annotations.cryptpad.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "cryptpad"
  {{- with .Values.annotations.cryptpad.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  fsGroup: 4001
--- a/helmfile/apps/element/values-element.yaml.gotmpl
+++ b/helmfile/apps/element/values-element.yaml.gotmpl
@@ -143,7 +143,10 @@ ingress:
    {{ .Values.annotations.element.ingress | toYaml | nindent 4 }}
 podAnnotations:
-  {{ .Values.annotations.element.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-element"
  {{- with .Values.annotations.element.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  enabled: true
--- a/helmfile/apps/element/values-matrix-neoboard-widget.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-neoboard-widget.yaml.gotmpl
@@ -44,7 +44,10 @@ ingress:
    {{ .Values.annotations.elementMatrixNeoboardWidget.ingress | toYaml | nindent 4 }}
 podAnnotations:
-  {{ .Values.annotations.elementMatrixNeoboardWidget.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "matrix-neoboard-widget"
  {{- with .Values.annotations.elementMatrixNeoboardWidget.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  enabled: true
--- a/helmfile/apps/element/values-matrix-neochoice-widget.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-neochoice-widget.yaml.gotmpl
@@ -44,7 +44,10 @@ ingress:
    {{ .Values.annotations.elementMatrixNeochoiceWidget.ingress | toYaml | nindent 4 }}
 podAnnotations:
-  {{ .Values.annotations.elementMatrixNeochoiceWidget.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "matrix-neochoice-widget"
  {{- with .Values.annotations.elementMatrixNeochoiceWidget.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  enabled: true
--- a/helmfile/apps/element/values-matrix-neodatefix-bot-bootstrap.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-neodatefix-bot-bootstrap.yaml.gotmpl
@@ -25,7 +25,10 @@ image:
 fullnameOverride: "matrix-neodatefix-bot-bootstrap"
 podAnnotations:
-  {{ .Values.annotations.elementMatrixNeodatefixBotBootstrap.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "values-matrix-neodatefix-bot-bootstrap"
  {{- with .Values.annotations.elementMatrixNeodatefixBotBootstrap.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 securityContext:
  allowPrivilegeEscalation: false
@@ -42,7 +45,7 @@ securityContext:
  seLinuxOptions:
    {{ .Values.seLinuxOptions.synapseCreateUser | toYaml | nindent 4 }}
-podAnnotations:
+serviceAccount:
-  {{ .Values.annotations.elementMatrixNeodatefixBotBootstrap.serviceAccount | toYaml | nindent 2 }}
+  annotations:
-
+    {{ .Values.annotations.elementMatrixNeodatefixBotBootstrap.serviceAccount | toYaml | nindent 4 }}
 ...
--- a/helmfile/apps/element/values-matrix-neodatefix-bot.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-neodatefix-bot.yaml.gotmpl
@@ -90,7 +90,10 @@ persistence:
    {{ .Values.annotations.elementMatrixNeodatefixBot.persistence | toYaml | nindent 4 }}
 podAnnotations:
-  {{ .Values.annotations.elementMatrixNeodatefixBot.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "matrix-neodatefix-bot"
  {{- with .Values.annotations.elementMatrixNeodatefixBot.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  enabled: true
--- a/helmfile/apps/element/values-matrix-neodatefix-widget.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-neodatefix-widget.yaml.gotmpl
@@ -49,7 +49,10 @@ ingress:
    {{ .Values.annotations.elementMatrixNeodatefixWidget.ingress | toYaml | nindent 4 }}
 podAnnotations:
-  {{ .Values.annotations.elementMatrixNeodatefixWidget.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "matrix-neodatefix-widget"
  {{- with .Values.annotations.elementMatrixNeodatefixWidget.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  enabled: true
--- a/helmfile/apps/element/values-matrix-user-verification-service-bootstrap.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-user-verification-service-bootstrap.yaml.gotmpl
@@ -25,7 +25,10 @@ image:
 fullnameOverride: "opendesk-matrix-user-verification-service-bootstrap"
 podAnnotations:
-  {{ .Values.annotations.elementMatrixUserVerificationServiceBootstrap.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-matrix-user-verification-service-bootstrap"
  {{- with .Values.annotations.elementMatrixUserVerificationServiceBootstrap.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 securityContext:
  allowPrivilegeEscalation: false
--- a/helmfile/apps/element/values-matrix-user-verification-service.yaml.gotmpl
+++ b/helmfile/apps/element/values-matrix-user-verification-service.yaml.gotmpl
@@ -44,7 +44,10 @@ image:
  tag: {{ .Values.images.matrixUserVerificationService.tag | quote }}
 podAnnotations:
-  {{ .Values.annotations.elementMatrixUserVerificationService.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-matrix-user-verification-service"
  {{- with .Values.annotations.elementMatrixUserVerificationService.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  enabled: true
--- a/helmfile/apps/element/values-synapse-admin.yaml.gotmpl
+++ b/helmfile/apps/element/values-synapse-admin.yaml.gotmpl
@@ -56,7 +56,12 @@ cron:
    repository: {{ .Values.images.elementSyncAdmins.repository | quote }}
    tag: {{ .Values.images.elementSyncAdmins.tag | quote }}
    imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
  podAnnotations:
    intents.otterize.com/service-name: "opendesk-synapse-admin-cron"
 #fullnameOverride: "opendesk-synapse-admin"
 podAnnotations:
  intents.otterize.com/service-name: "opendesk-synapse-admin"
 image:
  registry: {{ coalesce .Values.repositories.image.registryOpencodeDeEnterprise .Values.global.imageRegistry .Values.images.elementSynapseAdmin.registry | quote }}
  repository: {{ .Values.images.elementSynapseAdmin.repository | quote }}
--- a/helmfile/apps/element/values-synapse-adminbot-pipe.yaml.gotmpl
+++ b/helmfile/apps/element/values-synapse-adminbot-pipe.yaml.gotmpl
@@ -16,4 +16,6 @@ image:
  tag: {{ .Values.images.elementPipe.tag | quote }}
  imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 fullnameOverride: "opendesk-synapse-adminbot-pipe"
 podAnnotations:
  intents.otterize.com/service-name: "opendesk-synapse-adminbot-pipe"
 ...
--- a/helmfile/apps/element/values-synapse-adminbot-web.yaml.gotmpl
+++ b/helmfile/apps/element/values-synapse-adminbot-web.yaml.gotmpl
@@ -20,4 +20,6 @@ ingress:
  enabled: {{ .Values.ingress.enabled }}
  tls:
    secretName: {{ .Values.ingress.tls.secretName | quote }}
 podAnnotations:
  intents.otterize.com/service-name: "opendesk-synapse-adminbot-web"
 ...
--- a/helmfile/apps/element/values-synapse-auditbot-pipe.yaml.gotmpl
+++ b/helmfile/apps/element/values-synapse-auditbot-pipe.yaml.gotmpl
@@ -16,4 +16,6 @@ image:
  tag: {{ .Values.images.elementPipe.tag | quote }}
  imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 fullnameOverride: "opendesk-synapse-auditbot-pipe"
 podAnnotations:
  intents.otterize.com/service-name: "opendesk-synapse-auditbot-pipe"
 ...
--- a/helmfile/apps/element/values-synapse-groupsync.yaml.gotmpl
+++ b/helmfile/apps/element/values-synapse-groupsync.yaml.gotmpl
@@ -51,4 +51,6 @@ image:
  url: {{ .Values.images.elementGroupsync.repository | quote }}
  tag: {{ .Values.images.elementGroupsync.tag | quote }}
  imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 podAnnotations:
  intents.otterize.com/service-name: "opendesk-synapse-groupsync"
 ...
--- a/helmfile/apps/element/values-synapse-web.yaml.gotmpl
+++ b/helmfile/apps/element/values-synapse-web.yaml.gotmpl
@@ -56,7 +56,10 @@ ingress:
    secretName: {{ .Values.ingress.tls.secretName | quote }}
 podAnnotations:
-  {{ .Values.annotations.elementSynapseWeb.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-synapse-web"
  {{- with .Values.annotations.elementSynapseWeb.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  enabled: true
--- a/helmfile/apps/element/values-synapse.yaml.gotmpl
+++ b/helmfile/apps/element/values-synapse.yaml.gotmpl
@@ -25,6 +25,14 @@ configuration:
      address:
        per_second: 2
        burst_count: 12
    # Set higher limits for messages and media due to non-chat Matrix apps and widgets (such as NeoBoard)
    # https://github.com/nordeck/matrix-neoboard/blob/main/docs/configuration.md#rate-limiting-settings
    rc_message:
      per_second: 5
      burst_count: 25
    rc_media_create:
      per_second: 20
      burst_count: 100
  database:
    host: {{ .Values.databases.synapse.host | quote }}
@@ -242,7 +250,10 @@ persistence:
    {{ .Values.annotations.elementSynapse.persistence | toYaml | nindent 4 }}
 podAnnotations:
-  {{ .Values.annotations.elementSynapse.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-synapse"
  {{- with .Values.annotations.elementSynapse.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  enabled: true
--- a/helmfile/apps/element/values-well-known.yaml.gotmpl
+++ b/helmfile/apps/element/values-well-known.yaml.gotmpl
@@ -49,7 +49,10 @@ ingress:
    {{ .Values.annotations.elementWellKnown.ingress | toYaml | nindent 4 }}
 podAnnotations:
-  {{ .Values.annotations.elementWellKnown.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-well-known"
  {{- with .Values.annotations.elementWellKnown.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  enabled: true
--- a/helmfile/apps/jitsi/values-jitsi.yaml.gotmpl
+++ b/helmfile/apps/jitsi/values-jitsi.yaml.gotmpl
@@ -111,10 +111,11 @@ jitsi:
        type: "RuntimeDefault"
      seLinuxOptions:
        {{ .Values.seLinuxOptions.jitsi | toYaml | nindent 8 }}
    {{- if .Values.annotations.jitsiWeb.pod }}
    podAnnotations:
-      {{ .Values.annotations.jitsiWeb.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "jitsi-web"
-    {{- end }}
+      {{- with .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 }}"
@@ -164,10 +165,11 @@ jitsi:
        type: "RuntimeDefault"
      seLinuxOptions:
        {{ .Values.seLinuxOptions.prosody | toYaml | nindent 8 }}
    {{- if .Values.annotations.jitsiProsody.pod }}
    podAnnotations:
-      {{ .Values.annotations.jitsiProsody.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "jitsi-prosody"
-    {{- end }}
+      {{- with .Values.annotations.jitsiProsody.pod }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
  jicofo:
    replicaCount: {{ .Values.replicas.jicofo }}
    image:
@@ -191,10 +193,11 @@ jitsi:
        type: "RuntimeDefault"
      seLinuxOptions:
        {{ .Values.seLinuxOptions.jicofo | toYaml | nindent 8 }}
    {{- if .Values.annotations.jitsiJicofo.pod }}
    podAnnotations:
-      {{ .Values.annotations.jitsiJicofo.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "jitsi-jicofo"
-    {{- end }}
+      {{- with .Values.annotations.jitsiJicofo.pod }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
  jigasi:
    replicaCount: {{ .Values.replicas.jigasi }}
    enabled: {{ .Values.sip.jigasi.enabled }}
@@ -224,10 +227,11 @@ jitsi:
        type: "RuntimeDefault"
      seLinuxOptions:
        {{ .Values.seLinuxOptions.jigasi | toYaml | nindent 8 }}
    {{- if .Values.annotations.jitsiJigasi.pod }}
    podAnnotations:
-      {{ .Values.annotations.jitsiJigasi.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "jitsi-jigasi"
-    {{- end }}
+      {{- with .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
@@ -244,9 +248,9 @@ jitsi:
      {{ .Values.resources.jvb | toYaml | nindent 6 }}
    service:
      type: {{ coalesce .Values.service.type.jitsiVideoBridge .Values.cluster.service.type | quote }}
-    {{- if .Values.annotations.jitsiJvb.service }}
+    {{- if .Values.annotations.jitsiJvb.serviceExternal }}
      annotations:
-        {{ .Values.annotations.jitsiJvb.service | toYaml | nindent 8 }}
+        {{ .Values.annotations.jitsiJvb.serviceExternal | toYaml | nindent 8 }}
    {{- end }}
    securityContext:
      allowPrivilegeEscalation: false
@@ -260,10 +264,11 @@ jitsi:
        type: "RuntimeDefault"
      seLinuxOptions:
        {{ .Values.seLinuxOptions.jvb | toYaml | nindent 8 }}
    {{- if .Values.annotations.jitsiJvb.pod }}
    podAnnotations:
-      {{ .Values.annotations.jitsiJvb.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "jitsi-jvb"
-    {{- end }}
+      {{- with .Values.annotations.jitsiJvb.pod }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
    metrics:
      prometheusAnnotations:
        {{ .Values.annotations.jitsiJvb.metricsPrometheus | toYaml | nindent 8 }}
@@ -288,10 +293,11 @@ 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 }}
+      intents.otterize.com/service-name: "jitsi-jibri"
-    {{- end }}
+      {{- with .Values.annotations.jitsiJibri.pod }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
  imagePullSecrets:
  {{- range .Values.global.imagePullSecrets }}
    - name: {{ . | quote }}
--- a/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl
+++ b/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl
@@ -10,7 +10,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 }}
--- a/helmfile/apps/nextcloud/values-nextcloud-notifypush.yaml.gotmpl
+++ b/helmfile/apps/nextcloud/values-nextcloud-notifypush.yaml.gotmpl
@@ -10,7 +10,6 @@ global:
    {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 additionalAnnotations:
  intents.otterize.com/service-name: "opendesk-nextcloud-notifypush"
  {{- with .Values.annotations.nextcloudNotifyPush.additional }}
  {{ . | toYaml | nindent 4 }}
  {{- end }}
@@ -114,7 +113,10 @@ metrics:
      {{ .Values.annotations.nextcloudNotifyPush.serviceMetrics | toYaml | nindent 6 }}
 podAnnotations:
-  {{ .Values.annotations.nextcloudNotifyPush.pod | toYaml | nindent 4 }}
+  intents.otterize.com/service-name: "opendesk-nextcloud-notifypush"
  {{- with .Values.annotations.nextcloudNotifyPush.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  fsGroup: 101
 # prometheus:
--- a/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl
+++ b/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl
@@ -39,7 +39,10 @@ exporter:
    imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
    tag: {{ .Values.images.nextcloudExporter.tag | quote }}
  podAnnotations:
-    {{ .Values.annotations.nextcloudExporter.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "opendesk-nextcloud-exporter"
    {{- with .Values.annotations.nextcloudExporter.pod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  prometheus:
    serviceMonitor:
      enabled: {{ .Values.monitoring.prometheus.serviceMonitors.enabled }}
@@ -76,7 +79,7 @@ aio:
            topologyKey: "kubernetes.io/hostname"
  additionalAnnotations:
-    intents.otterize.com/service-name: "opendesk-nextcloud-aio"
+    intents.otterize.com/service-name: "opendesk-nextcloud-aio-cron"
    {{- with .Values.annotations.nextcloudAio.additional }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
@@ -177,7 +180,10 @@ aio:
    tls:
      secretName: {{ .Values.ingress.tls.secretName | quote }}
  podAnnotations:
-    {{ .Values.annotations.nextcloudAio.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "opendesk-nextcloud-aio"
    {{- with .Values.annotations.nextcloudAio.pod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  podSecurityContext:
    fsGroup: 101
  prometheus:
--- a/helmfile/apps/notes/values.yaml.gotmpl
+++ b/helmfile/apps/notes/values.yaml.gotmpl
@@ -117,11 +117,20 @@ backend:
    seLinuxOptions:
      {{ .Values.seLinuxOptions.notesBackend | toYaml | nindent 6 }}
  podAnnotations:
-    {{ .Values.annotations.notesBackend.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "impress-backend"
    {{- with .Values.annotations.notesBackend.pod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  podAnnotationsCreateUser:
-    {{ .Values.annotations.notesBackend.createUserJob | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "impress-create-user"
    {{- with .Values.annotations.notesBackend.createUserJob }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  podAnnotationsMigrate:
-    {{ .Values.annotations.notesBackend.migrateJob | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "impress-migrate"
    {{- with .Values.annotations.notesBackend.migrateJob }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  podSecurityContext:
    enabled: true
    fsGroup: 1000
@@ -189,7 +198,10 @@ frontend:
    seLinuxOptions:
      {{ .Values.seLinuxOptions.notesFrontend | toYaml | nindent 6 }}
  podAnnotations:
-    {{ .Values.annotations.notesFrontend.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "impress-frontend"
    {{- with .Values.annotations.notesFrontend.pod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  podSecurityContext:
    enabled: true
    fsGroup: 1000
@@ -257,7 +269,10 @@ y-provider:
      {{ .Values.annotations.notesYProvider.ingressCollaborationWS | toYaml | nindent 6 }}
    ingressClassName: {{ .Values.ingress.ingressClassName }}
  podAnnotations:
-    {{ .Values.annotations.notesYProvider.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "impress-y-provider"
    {{- with .Values.annotations.notesYProvider.pod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  podSecurityContext:
    enabled: true
    fsGroup: 1001
--- a/helmfile/apps/nubus/values-intercom-service.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-intercom-service.yaml.gotmpl
@@ -109,7 +109,10 @@ ingress:
    {{ .Values.annotations.nubusIntercomService.ingress | toYaml | nindent 4 }}
 podAnnotations:
-  {{ .Values.annotations.nubusIntercomService.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "intercom-service"
  {{- with .Values.annotations.nubusIntercomService.pod }}
  {{ . | toYaml | nindent 2}}
  {{- end }}
 podSecurityContext:
  enabled: true
--- a/helmfile/apps/nubus/values-nginx-s3-gateway.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-nginx-s3-gateway.yaml.gotmpl
@@ -42,7 +42,10 @@ configuration:
      value: {{ .Values.objectstores.nubus.secretKey | default .Values.secrets.minio.umsUser | quote }}
 podAnnotations:
-  {{ .Values.annotations.nubusNginxS3Gateway.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "nubus-nginx-s3-gateway"
  {{- with .Values.annotations.nubusNginxS3Gateway.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 resources:
  {{ .Values.resources.nginxS3Gateway | toYaml | nindent 2 }}
--- a/helmfile/apps/nubus/values-nubus.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-nubus.yaml.gotmpl
@@ -183,20 +183,12 @@ keycloak:
    registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusKeycloak.registry | quote }}
    repository: {{ .Values.images.nubusKeycloak.repository }}
    tag: {{ .Values.images.nubusKeycloak.tag }}
    # NOTE: The subchart "keycloak" does not yet support
    # "global.imagePullPolicy". The local configuration can be removed once it
    # does have this feature.
    imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
  ingress:
    enabled: false
  keycloak:
    auth:
      username: "kcadmin"
-      # TODO: Pending secrets refactoring to be able to provide the value directly
+      password: {{ .Values.secrets.keycloak.adminPassword | quote }}
      existingSecret:
        name: "ums-opendesk-keycloak-credentials"
        keyMapping:
          adminPassword: "admin_password"
    login:
      messages:
        de:
@@ -274,7 +266,6 @@ nubusTwofaHelpdesk:
 nubusNotificationsApi:
  enabled: false
  additionalAnnotations:
    intents.otterize.com/service-name: "ums-notifications-api"
    {{- with .Values.annotations.nubusNotificationsApi.additional }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
@@ -312,7 +303,10 @@ nubusNotificationsApi:
    annotations:
      {{ .Values.annotations.nubusNotificationsApi.persistence | toYaml | nindent 6 }}
  podAnnotations:
-    {{ .Values.annotations.nubusNotificationsApi.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-notifications-api"
    {{- with .Values.annotations.nubusNotificationsApi.pod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  postgresql:
    connection:
      host: {{ .Values.databases.umsNotificationsApi.host | quote }}
@@ -339,7 +333,6 @@ nubusNotificationsApi:
 nubusPortalFrontend:
  additionalAnnotations:
    intents.otterize.com/service-name: "ums-portal-frontend"
    {{- with .Values.annotations.nubusPortalFrontend.additional }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
@@ -415,7 +408,10 @@ nubusPortalFrontend:
    annotations:
      {{ .Values.annotations.nubusPortalFrontend.persistence | toYaml | nindent 6 }}
  podAnnotations:
-    {{ .Values.annotations.nubusPortalFrontend.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-portal-frontend"
    {{- with .Values.annotations.nubusPortalFrontend.pod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  portalFrontend:
    branding:
      css: {{ .Values.theme.styles.portal.main | toJson }}
@@ -444,12 +440,6 @@ nubusKeycloakExtensions:
  keycloak:
    auth:
      username: "kcadmin"
      # TODO: Pending secrets refactoring in component chart. This will refer to
      # the secret generated by the keycloak subchart.
      existingSecret:
        name: "ums-opendesk-keycloak-credentials"
        keyMapping:
          adminPassword: "admin_password"
  proxy:
    additionalAnnotations:
      {{ .Values.annotations.nubusKeycloakExtensions.proxyAdditional | toYaml | nindent 6 }}
@@ -457,13 +447,6 @@ nubusKeycloakExtensions:
      registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusKeycloakExtensionProxy.registry | quote }}
      repository: {{ .Values.images.nubusKeycloakExtensionProxy.repository }}
      tag: {{ .Values.images.nubusKeycloakExtensionProxy.tag }}
      # NOTE: The subchart "keycloak-extensions" does not yet support
      # "global.imagePullPolicy".
      imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
    # NOTE: Remove once the keycloak-extensions subchart respects
    # "global.imagePullSecrets".
    imagePullSecrets:
      {{ .Values.global.imagePullSecrets | toYaml | nindent 6 }}
    ingress:
      annotations:
        nginx.org/proxy-buffer-size: "8k"
@@ -559,13 +542,6 @@ nubusKeycloakExtensions:
      registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusKeycloakExtensionHandler.registry | quote }}
      repository: {{ .Values.images.nubusKeycloakExtensionHandler.repository }}
      tag: {{ .Values.images.nubusKeycloakExtensionHandler.tag }}
      # NOTE: The subchart "keycloak-extensions" does not yet support
      # "global.imagePullPolicy".
      imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
    # NOTE: Remove once the keycloak-extensions subchart respects
    # "global.imagePullSecrets".
    imagePullSecrets:
      {{ .Values.global.imagePullSecrets | toYaml | nindent 6 }}
    podAnnotations:
      intents.otterize.com/service-name: "ums-keycloak-extensions-handler"
      {{- with .Values.annotations.nubusKeycloakExtensions.handlerPod }}
@@ -618,7 +594,7 @@ nubusPortalConsumer:
  replicaCount: {{ .Values.replicas.umsPortalConsumer }}
  resources:
    {{ .Values.resources.umsPortalConsumer | toYaml | nindent 4 }}
-  resourcesWaitForDependency:
+  initResources:
    {{ .Values.resources.umsPortalConsumerDependencies | toYaml | nindent 4 }}
  containerSecurityContext:
    seccompProfile:
@@ -666,7 +642,6 @@ nubusPortalConsumer:
 nubusPortalServer:
  additionalAnnotations:
    intents.otterize.com/service-name: "ums-portal-server"
    {{- with .Values.annotations.nubusPortalServer.additional }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
@@ -711,7 +686,10 @@ nubusPortalServer:
    annotations:
      {{ .Values.annotations.nubusPortalServer.persistence | toYaml | nindent 6 }}
  podAnnotations:
-    {{ .Values.annotations.nubusPortalServer.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-portal-server"
    {{- with .Values.annotations.nubusPortalServer.pod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  portalServer:
    centralNavigation:
      enabled: true
@@ -839,7 +817,10 @@ nubusUdmRestApi:
    annotations:
      {{ .Values.annotations.nubusUdmRestApi.persistence | toYaml | nindent 6 }}
  podAnnotations:
-    {{ .Values.annotations.nubusUdmRestApi.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-udm-rest-api"
    {{- with .Values.annotations.nubusUdmRestApi.pod }}
    {{ . | toYaml | nindent 4 }}
    {{- end}}
  replicaCount: {{ .Values.replicas.umsUdmRestApi }}
  resources:
    {{ .Values.resources.umsUdmRestApi | toYaml | nindent 4 }}
@@ -898,7 +879,7 @@ nubusLdapServer:
  additionalAnnotations:
    {{ .Values.annotations.nubusLdapServer.additional | toYaml | nindent 4 }}
  additionalAnnotations:
-    intents.otterize.com/service-name: "ums-ldap-server"
+    {{ .Values.annotations.nubusLdapServer.additional | toYaml | nindent 4 }}
  dhInitcontainer:
    image:
      registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusLdapServerDhInitContainer.registry | quote }}
@@ -921,7 +902,10 @@ nubusLdapServer:
    size: {{ .Values.persistence.storages.nubusLdapServerData.size | quote }}
    storageClass: {{ coalesce .Values.persistence.storages.nubusLdapServerData.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
  podAnnotations:
-    {{ .Values.annotations.nubusLdapServer.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-ldap-server"
    {{- with .Values.annotations.nubusLdapServer.pod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  replicaCountPrimary: {{ .Values.replicas.umsLdapServerPrimary }}
  replicaCountSecondary: {{ .Values.replicas.umsLdapServerSecondary }}
  replicaCountProxy: {{ .Values.replicas.umsLdapServerProxy }}
@@ -947,7 +931,6 @@ nubusProvisioning:
    {{ .Values.annotations.nubusProvisioning.additional | toYaml | nindent 4 }}
  api:
    additionalAnnotations:
      intents.otterize.com/service-name: "ums-provisioning-api"
      {{- with .Values.annotations.nubusProvisioning.apiAdditional }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
@@ -966,7 +949,10 @@ nubusProvisioning:
      auth:
        password: {{ .Values.secrets.nubus.provisioning.api.natsPassword | quote}}
    podAnnotations:
-      {{ .Values.annotations.nubusProvisioning.apiPod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "ums-provisioning-api"
      {{- with .Values.annotations.nubusProvisioning.apiPod }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
    resources:
      {{ .Values.resources.umsProvisioningApi | toYaml | nindent 6 }}
  containerSecurityContext:
@@ -985,7 +971,6 @@ nubusProvisioning:
      {{ .Values.seLinuxOptions.umsProvisioning | toYaml | nindent 6 }}
  dispatcher:
    additionalAnnotations:
      intents.otterize.com/service-name: "ums-provisioning-dispatcher"
      {{- with .Values.annotations.nubusProvisioning.dispatcherAdditional }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
@@ -997,20 +982,24 @@ nubusProvisioning:
      auth:
        password: {{ .Values.secrets.nubus.provisioning.dispatcherNatsPassword | quote}}
    podAnnotations:
-      {{ .Values.annotations.nubusProvisioning.dispatcherPod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "ums-provisioning-dispatcher"
      {{- with .Values.annotations.nubusProvisioning.dispatcherPod }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
    resources:
      {{ .Values.resources.umsProvisioningDispatcher | toYaml | nindent 6 }}
  nats:
    additionalAnnotations:
      intents.otterize.com/service-name: "ums-provisioning-nats"
      {{- with .Values.annotations.nubusProvisioning.natsAdditional }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
    auth:
      adminPassword: {{ .Values.secrets.nats.natsAdminPassword | quote }}
    config:
      cluster:
        replicas: {{ .Values.replicas.umsProvisioningNats }}
      createUsers:
        adminUser:
          auth:
            password: {{ .Values.secrets.nats.natsAdminPassword | quote }}
    containerSecurityContext:
      allowPrivilegeEscalation: false
      capabilities:
@@ -1030,19 +1019,12 @@ nubusProvisioning:
        registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.nubusNats.registry | quote }}
        repository: {{ .Values.images.nubusNats.repository }}
        tag: {{ .Values.images.nubusNats.tag }}
        # NOTE: The subchart does not yet fully support
        # "global.imagePullPolicy". This can be removed once the subchart has
        # been adjusted.
        imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
    natsBox:
      enabled: {{ or .Values.technical.nubus.provisioning.nats.natsBox.enabled .Values.debug.enabled }}
      image:
        registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.nubusNatsBox.registry | quote }}
        repository: {{ .Values.images.nubusNatsBox.repository }}
        tag: {{ .Values.images.nubusNatsBox.tag }}
        # NOTE: The subchart does not yet fully support
        # "global.imagePullPolicy". This can be removed once the subchart has
        # been adjusted.
        imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
    persistence:
      size: {{ .Values.persistence.storages.nubusProvisioningNats.size }}
 #      storageClassName: -- coalesce .Values.persistence.storages.nubusProvisioningNats.storageClassName .Values.persistence.storageClassNames.RWO | quote --
@@ -1060,10 +1042,12 @@ nubusProvisioning:
    serviceAccount:
      create: true
  podAnnotations:
-    {{ .Values.annotations.nubusProvisioning.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-provisioning-nats"
    {{- with .Values.annotations.nubusProvisioning.pod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  prefill:
    additionalAnnotations:
      intents.otterize.com/service-name: "ums-provisioning-prefill"
      {{- with .Values.annotations.nubusProvisioning.prefillAdditional }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
@@ -1075,12 +1059,14 @@ nubusProvisioning:
      auth:
        password: {{ .Values.secrets.nubus.provisioning.prefillNatsPassword | quote}}
    podAnnotations:
-      {{ .Values.annotations.nubusProvisioning.prefillPod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "ums-provisioning-prefill"
      {{- with .Values.annotations.nubusProvisioning.prefillPod }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
    resources:
      {{ .Values.resources.umsProvisioningPrefill | toYaml | nindent 6 }}
  udmTransformer:
    additionalAnnotations:
      intents.otterize.com/service-name: "ums-provisioning-udm-transformer"
      {{- with .Values.annotations.nubusProvisioning.udmTransformerAdditional }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
@@ -1092,7 +1078,10 @@ nubusProvisioning:
      auth:
        password: {{ .Values.secrets.nubus.provisioning.udmTransformerNatsPassword | quote}}
    podAnnotations:
-      {{ .Values.annotations.nubusProvisioning.udmTransformerPod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "ums-provisioning-udm-transformer"
      {{- with .Values.annotations.nubusProvisioning.udmTransformerPod }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
    resources:
      {{ .Values.resources.umsProvisioningUdmTransformer | toYaml | nindent 6 }}
  replicaCount:
@@ -1163,7 +1152,10 @@ nubusUdmListener:
    size: {{ .Values.persistence.storages.nubusUdmListener.size | quote }}
 #    storageClass: -- coalesce .Values.persistence.storages.nubusUdmListener.storageClassName .Values.persistence.storageClassNames.RWO | quote --
  podAnnotations:
-    {{ .Values.annotations.nubusUdmListener.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-provisioning-udm-listener"
    {{- with .Values.annotations.nubusUdmListener.pod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  replicaCount: {{ .Values.replicas.umsUdmListener }}
  resources:
    {{ .Values.resources.umsUdmListener | toYaml | nindent 4 }}
@@ -1194,6 +1186,8 @@ nubusSelfServiceConsumer:
    registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusSelfServiceConsumer.registry | quote }}
    repository: {{ .Values.images.nubusSelfServiceConsumer.repository }}
    tag: {{ .Values.images.nubusSelfServiceConsumer.tag }}
  initResources:
    {{ .Values.resources.umsSelfserviceConsumer | toYaml | nindent 4 }}
  podAnnotations:
    intents.otterize.com/service-name: "ums-selfservice-listener"
    {{- with .Values.annotations.nubusSelfserviceConsumer.pod }}
@@ -1204,8 +1198,6 @@ nubusSelfServiceConsumer:
      password: {{ .Values.secrets.nubus.selfserviceConsumer.provisioningApiPassword | quote}}
  resources:
    {{ .Values.resources.umsSelfserviceConsumer | toYaml | nindent 4 }}
  resourcesWaitForDependency:
    {{ .Values.resources.umsSelfserviceConsumer | toYaml | nindent 4 }}
  replicaCount: {{ .Values.replicas.umsSelfserviceConsumer }}
  serviceAccount:
    annotations:
@@ -1219,9 +1211,9 @@ nubusSelfServiceConsumer:
 # Nubus services
 nubusStackDataUms:
  additionalAnnotations:
    intents.otterize.com/service-name: "ums-stack-data-ums"
    argocd.argoproj.io/hook: "Sync"
    argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation"
    intents.otterize.com/service-name: "ums-stack-data-ums"
    {{- with .Values.annotations.nubusStackDataUms.additional }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
@@ -1266,11 +1258,15 @@ nubusStackDataUms:
        host: {{ .Values.cache.umsSelfservice.host | quote }}
    postgresql:
      auth:
        database: {{ .Values.databases.umsSelfservice.name | quote }}
        username: {{ .Values.databases.umsSelfservice.username | quote }}
      connection:
        host: {{ .Values.databases.umsSelfservice.host | quote }}
  podAnnotations:
-    {{ .Values.annotations.nubusStackDataUms.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-stack-data-ums"
    {{- with .Values.annotations.nubusStackDataUms.pod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  resources:
    {{ .Values.resources.umsStackDataUms | toYaml | nindent 4 }}
  stackDataContext:
@@ -1325,6 +1321,7 @@ nubusStackDataUms:
    portalLinkSupport: {{ .Values.functional.portal.linkSupport | quote }}
    portalLinkFeedback: {{ .Values.functional.portal.linkFeedback | quote }}
    oxDefaultContext: "1"
    oxDefaultLanguage: {{ .Values.functional.internationalization.defaultLanguage | quote }}
    oxContextHidden: true
    oxSystemUserPassword: {{ .Values.secrets.nubus.ldapSearch.ox }}
    portalOxLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.openxchange .Values.global.domain }}
@@ -1456,9 +1453,14 @@ nubusUmcServer:
    bundled: false
    server: {{ .Values.cache.umsSelfservice.host | quote }}
    auth:
-      password: ""
+      # The memcached connection is not authenticated in openDesk but the umc-server pod needs a secret it can mount.
      password: "stub-value"
      existingSecret: null
  podAnnotations:
-    {{ .Values.annotations.nubusUmcServer.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-umc-server"
    {{- with .Values.annotations.nubusUmcServer.pod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  # Ref.: https://docs.software-univention.de/nubus-kubernetes-operation/1.x/en/reference.html#envvar-nubusUmcServer.podManagementPolicy
  podManagementPolicy: "{{ if gt .Values.replicas.umsUmcServer 4 }}Parallel{{ else }}OrderedReady{{ end }}"
  postgresql:
@@ -1554,7 +1556,10 @@ nubusUmcGateway:
  initResources:
    {{ .Values.resources.umsUmcGateway | toYaml | nindent 4 }}
  podAnnotations:
-    {{ .Values.annotations.nubusUmcGateway.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-umc-gateway"
    {{- with .Values.annotations.nubusUmcGateway.pod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  replicaCount: {{ .Values.replicas.umsUmcGateway }}
  serviceAccount:
    annotations:
@@ -1596,15 +1601,9 @@ nubusKeycloakBootstrap:
    registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusKeycloakBootstrap.registry | quote }}
    repository: {{ .Values.images.nubusKeycloakBootstrap.repository }}
    tag: {{ .Values.images.nubusKeycloakBootstrap.tag }}
    # NOTE: The subchart does not yet fully support
    # "global.imagePullPolicy". This can be removed once the subchart has
    # been adjusted.
    imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
  keycloak:
    auth:
      username: "kcadmin"
      existingSecret:
        name: "ums-opendesk-keycloak-credentials"
  ldap:
    auth:
      bindDn: {{ printf "uid=ldapsearch_keycloak,cn=users,%s" .Values.ldap.baseDn }}
@@ -1639,9 +1638,6 @@ extraSecrets:
  - name: "ums-opendesk-guardian-client-secret"
    stringData:
      managementApiClientSecret: {{ .Values.secrets.keycloak.clientSecret.guardian | quote }}
  - name: "ums-opendesk-keycloak-credentials"
    stringData:
      admin_password: {{ .Values.secrets.keycloak.adminPassword | quote }}
  - name: "ums-keycloak-postgresql-opendesk-credentials"
    stringData:
      keycloakDatabasePassword: {{ .Values.databases.keycloak.password | default .Values.secrets.postgresql.keycloakUser | quote }}
--- a/helmfile/apps/nubus/values-opendesk-keycloak-bootstrap.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-opendesk-keycloak-bootstrap.yaml.gotmpl
@@ -84,7 +84,7 @@ config:
  managed:
    clientScopes: [ 'acr', 'web-origins', 'email', 'profile', 'microprofile-jwt', 'role_list',
                    'offline_access', 'roles', 'address', 'phone' ]
-    clients: [ 'guardian-management-api', 'guardian-scripts', 'guardian-ui', 'UMC', 'UMC OIDC', '${client_account}',
+    clients: [ 'guardian-management-api', 'guardian-scripts', 'guardian-ui', 'UMC OIDC', '${client_account}',
               '${client_account-console}', '${client_admin-cli}', '${client_broker}', '${client_realm-management}',
               '${client_security-admin-console}' ]
  keycloak:
--- a/helmfile/apps/open-xchange/values-dovecot-enterprise.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-dovecot-enterprise.yaml.gotmpl
@@ -23,7 +23,7 @@ dovecot:
    port: {{ .Values.databases.dovecotDictmap.port }}
    username: {{ .Values.databases.dovecotDictmap.username | quote }}
    password:
-      value: {{ .Values.secrets.cassandra.dovecotDictmapUser | quote }}
+      value: {{ .Values.databases.dovecotDictmap.password | default .Values.secrets.cassandra.dovecotDictmapUser | quote }}
    keyspace: {{ .Values.databases.dovecotDictmap.name | quote }}
  sharedMailboxes:
    enabled: true
@@ -31,15 +31,20 @@ dovecot:
    port: {{ .Values.databases.dovecotACL.port }}
    username: {{ .Values.databases.dovecotACL.username | quote }}
    password:
-      value: {{ .Values.secrets.cassandra.dovecotACLUser | quote }}
+      value: {{ .Values.databases.dovecotACL.password | default .Values.secrets.cassandra.dovecotACLUser | quote }}
    keyspace: {{ .Values.databases.dovecotACL.name | quote }}
    masterPassword:
      value: {{ .Values.secrets.dovecot.sharedMailboxesMasterPassword | quote }}
  objectStorage:
    bucket: {{ .Values.objectstores.dovecot.bucket | quote }}
    cacheTmpfs: {{ if .Values.technical.dovecot.objectStorage.cacheTmpfs }}true{{ else }}false{{ end }}
    encryption:
      privateKey:
        value: {{ requiredEnv "DOVECOT_CRYPT_PRIVATE_KEY" | quote }}
      publicKey:
        value: {{ requiredEnv "DOVECOT_CRYPT_PUBLIC_KEY" | quote }}
    fsCacheSize: {{ .Values.technical.dovecot.objectStorage.fsCacheSize | quote }}
    ftsCacheSize: {{ .Values.technical.dovecot.objectStorage.ftsCacheSize | quote }}
    fqdn: {{ .Values.objectstores.dovecot.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain) | quote }}
    username: {{ .Values.objectstores.dovecot.username | quote }}
    password:
--- a/helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl
@@ -126,7 +126,10 @@ persistence:
    {{ .Values.annotations.openxchangeDovecot.persistence | toYaml | nindent 4 }}
 podAnnotations:
-  {{ .Values.annotations.openxchangeDovecot.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "open-xchange-dovecot"
  {{- with .Values.annotations.openxchangeDovecot.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 resources:
  {{ .Values.resources.dovecot | toYaml | nindent 2 }}
@@ -137,6 +140,8 @@ service:
    {{ .Values.annotations.openxchangeDovecot.service | toYaml | nindent 4 }}
  external:
    enabled: true
    annotations:
      {{ .Values.annotations.openxchangeDovecot.serviceExternal | toYaml | nindent 6 }}
    type: {{ coalesce .Values.service.type.dovecot .Values.cluster.service.type | quote }}
 {{- end }}
--- a/helmfile/apps/open-xchange/values-openxchange-bootstrap.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-openxchange-bootstrap.yaml.gotmpl
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 ---
 additionalAnnotations:
  intents.otterize.com/service-name: "open-xchange-bootstrap"
  argocd.argoproj.io/hook: "Sync"
  argocd.argoproj.io/hook-delete-policy: "HookSucceeded"
  {{- with .Values.annotations.openxchangeBootstrap.additional }}
--- a/helmfile/apps/open-xchange/values-openxchange-contact-picker.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-openxchange-contact-picker.yaml.gotmpl
@@ -5,6 +5,7 @@
 appsuite:
  core-mw:
    podAnnotations:
      intents.otterize.com/service-name: "open-xchange-core-mw"
      logging.open-xchange.com/format: "appsuite-json"
      {{- with .Values.annotations.openxchangeEnterpriseContactPicker.appsuiteCoreMwPod }}
      {{ . | toYaml | nindent 6 }}
--- a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
@@ -31,7 +31,10 @@ nextcloud-integration-ui:
    - name: {{ . | quote }}
  {{- end }}
  podAnnotations:
-    {{ .Values.annotations.openxchangeNextcloudIntegrationUi.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "open-xchange-nextcloud-integration-ui"
    {{- with .Values.annotations.openxchangeNextcloudIntegrationUi.pod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  replicaCount: {{ .Values.replicas.openxchangeNextcloudIntegrationUI }}
  resources:
    {{ .Values.resources.openxchangeNextcloudIntegrationUI | toYaml | nindent 4 }}
@@ -66,7 +69,10 @@ public-sector-ui:
  pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
  replicaCount: {{ .Values.replicas.openxchangePublicSectorUI }}
  podAnnotations:
-    {{ .Values.annotations.openxchangePublicSectorUi.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "open-xchange-public-sector-ui"
    {{- with .Values.annotations.openxchangePublicSectorUi.pod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  resources:
    {{ .Values.resources.openxchangePublicSectorUI | toYaml | nindent 4 }}
  securityContext:
@@ -256,6 +262,10 @@ appsuite:
              open-xchange-authentication-masterpassword: "enabled"
          properties:
            com.openexchange.calendar.allowOrganizerPartStatChanges: "true"
            # Mailfilter
            com.openexchange.mail.filter.passwordSource: global
            com.openexchange.mail.filter.masterPassword:  {{ .Values.secrets.oxAppSuite.migrationsMasterPassword | quote }}
            com.openexchange.mail.filter.preferredSaslMech: ""
          propertiesFiles:
            /opt/open-xchange/etc/masterpassword-authentication.properties:
              com.openexchange.authentication.masterpassword.password: {{ .Values.secrets.oxAppSuite.migrationsMasterPassword | quote }}
@@ -307,7 +317,10 @@ appsuite:
    jolokiaPassword: {{ .Values.secrets.oxAppSuite.jolokiaPassword | quote }}
    hostname: "{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}"
    podAnnotations:
-      {{ .Values.annotations.openxchangeAppsuiteCoreMw.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "open-xchange-core-mw"
      {{- with .Values.annotations.openxchangeAppsuiteCoreMw.pod }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
    serviceAccount:
      annotations:
        {{ .Values.annotations.openxchangeAppsuiteCoreMw.serviceAccount | toYaml | nindent 8 }}
@@ -334,7 +347,10 @@ appsuite:
        pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
      replicaCount: {{ .Values.replicas.openxchangeGotenberg }}
      podAnnotations:
-        {{ .Values.annotations.openxchangeAppsuiteCoreMw.gotenbergPod | toYaml | nindent 8 }}
+        intents.otterize.com/service-name: "open-xchange-gotenberg"
        {{- with .Values.annotations.openxchangeAppsuiteCoreMw.gotenbergPod }}
        {{ . | toYaml | nindent 8 }}
        {{- end }}
      resources:
        {{ .Values.resources.openxchangeGotenberg | toYaml | nindent 8 }}
      securityContext:
@@ -347,7 +363,6 @@ appsuite:
        runAsNonRoot: true
        runAsUser: 1001
        runAsGroup: 1001
        privileged: false
        seccompProfile:
          type: "RuntimeDefault"
        seLinuxOptions:
@@ -393,6 +408,9 @@ appsuite:
      com.openexchange.share.guestHostname: {{ printf "%s.%s" .Values.global.hosts.openxchange .Values.global.domain }}
      com.openexchange.UIWebPath: "/appsuite/"
      com.openexchange.showAdmin: "false"
      # Various Mail settings
      com.openexchange.mail.deleteDraftOnTransport: "true"
      com.openexchange.capability.document_preview_xrechnung: "true"
      # PDF Export
      com.openexchange.capability.mail_export_pdf: "true"
      com.openexchange.mail.exportpdf.gotenberg.enabled: "true"
@@ -449,6 +467,11 @@ appsuite:
      com.openexchange.mail.login.resolver.ldap.contextNameAttribute: "oxContextIDNum"
      com.openexchange.mail.login.resolver.ldap.entitySearchFilter: "(&(oxContextIDNum=[cid])(uid=[uname]))"
      com.openexchange.mail.login.resolver.ldap.mailLoginAttribute: "entryUUID"
      # Contacts collector
      # Ref.: https://documentation.open-xchange.com/components/middleware/config/8/#mode=search&term=contactCollect
      com.openexchange.contactcollector.enabled: "true"
      com.openexchange.user.contactCollectOnMailTransport: "true"
      com.openexchange.user.contactCollectOnMailAccess: "false"
      # Requirements for OX Connector
      com.openexchange.user.enforceUniqueDisplayName: "false"
      com.openexchange.folderstorage.database.preferDisplayName: "false"
@@ -549,19 +572,16 @@ appsuite:
      # await http.POST({ module: 'oxguard/smime', params: { action: 'test' } })
      com.openexchange.smime.test: {{ .Values.debug.enabled | quote }}
      {{- end }}
      {{- if or (eq (coalesce .Values.service.type.dovecot .Values.cluster.service.type) "NodePort") (eq (coalesce .Values.service.type.dovecot .Values.cluster.service.type) "LoadBalancer") }}
      # Client Onboarding
-      com.openexchange.client.onboarding.mail.imap.host: {{ .Values.global.domain | quote }}
+      com.openexchange.client.onboarding.enabled: {{ .Values.functional.groupware.externalClients.enabledOnboardingInfo | quote }}
      com.openexchange.client.onboarding.mail.imap.host: {{ default .Values.global.domain .Values.functional.groupware.externalClients.fqdnImap | quote }}
      com.openexchange.client.onboarding.mail.imap.port: "993"
      com.openexchange.client.onboarding.mail.imap.secure: "true"
      com.openexchange.client.onboarding.mail.imap.requireTls: "false"
-      com.openexchange.client.onboarding.mail.smtp.host: {{ .Values.global.domain | quote }}
+      com.openexchange.client.onboarding.mail.smtp.host: {{ default .Values.global.domain .Values.functional.groupware.externalClients.fqdnSmtp | quote }}
      com.openexchange.client.onboarding.mail.smtp.port: "587"
      com.openexchange.client.onboarding.mail.smtp.secure: "false"
      com.openexchange.client.onboarding.mail.smtp.requireTls: "true"
      {{- else }}
      com.openexchange.client.onboarding.enabled: "false"
      {{- end }}
      # DAV
      {{- if .Values.functional.groupware.davSupport.enabled }}
      com.openexchange.caldav.enabled: "true"
@@ -678,9 +698,6 @@ appsuite:
      io.ox/core//coloredIcons: "false"
      # Mail templates
      io.ox/core//features/templates: "true"
      # Contact Collector
      io.ox/mail//contactCollectOnMailTransport: "true"
      # io.ox/mail//contactCollectOnMailAccess: "true"
      # Dynamic theme
      io.ox/dynamic-theme//mainColor: {{ .Values.theme.colors.primary | quote }}
      io.ox/dynamic-theme//logoURL: "https://{{ .Values.global.hosts.nubus }}.{{ .Values.global.domain }}/univention/portal/icons/logos/domain.svg"
@@ -763,7 +780,10 @@ appsuite:
      pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
    replicaCount: {{ .Values.replicas.openxchangeCoreUI }}
    podAnnotations:
-      {{ .Values.annotations.openxchangeAppsuiteCoreUi.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "open-xchange-core-ui"
      {{- with .Values.annotations.openxchangeAppsuiteCoreUi.pod }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
    resources:
      {{ .Values.resources.openxchangeCoreUI | toYaml | nindent 6 }}
    securityContext:
@@ -800,7 +820,10 @@ appsuite:
      pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
    overrides: {}
    podAnnotations:
-      {{ .Values.annotations.openxchangeAppsuiteCoreUiMiddleware.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "open-xchange-core-ui-middleware"
      {{- with .Values.annotations.openxchangeAppsuiteCoreUiMiddleware.pod }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
    redis: *redisConfiguration
    replicaCount: {{ .Values.replicas.openxchangeCoreUIMiddleware }}
    resources:
@@ -849,7 +872,10 @@ appsuite:
      pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
    {{- if .Values.annotations.openxchangeAppsuiteCoreDocumentconverter.pod }}
    podAnnotations:
-      {{ .Values.annotations.openxchangeAppsuiteCoreDocumentconverter.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "open-xchange-core-documentconverter"
      {{- with .Values.annotations.openxchangeAppsuiteCoreDocumentconverter.pod }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
    {{- end }}
    redis: *redisConfiguration
    replicaCount: {{ .Values.replicas.openxchangeCoreDocumentConverter }}
@@ -901,7 +927,10 @@ appsuite:
      tag: {{ .Values.images.openxchangeCoreGuidedtours.tag | quote }}
      pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
    podAnnotations:
-      {{ .Values.annotations.openxchangeAppsuiteCoreGuidedtours.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "open-xchange-guidedtours"
      {{- with .Values.annotations.openxchangeAppsuiteCoreGuidedtours.pod }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
    replicaCount: {{ .Values.replicas.openxchangeCoreGuidedtours }}
    resources:
      {{- .Values.resources.openxchangeCoreGuidedtours | toYaml | nindent 6 }}
@@ -945,7 +974,10 @@ appsuite:
          secretKey: "."
    {{- if .Values.annotations.openxchangeAppsuiteCoreImageconverter.pod }}
    podAnnotations:
-      {{ .Values.annotations.openxchangeAppsuiteCoreImageconverter.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "open-xchange-core-imageconverter"
      {{- with .Values.annotations.openxchangeAppsuiteCoreImageconverter.pod }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
    {{- end }}
    redis: *redisConfiguration
    replicaCount: {{ .Values.replicas.openxchangeCoreImageConverter }}
@@ -981,7 +1013,8 @@ appsuite:
      repository: {{ .Values.images.openxchangeGuardUI.repository | quote }}
      tag: {{ .Values.images.openxchangeGuardUI.tag | quote }}
      pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-    podAnnotations: {}
+    podAnnotations:
      intents.otterize.com/service-name: "open-xchange-guard-ui"
    replicaCount: {{ .Values.replicas.openxchangeGuardUI }}
    resources:
      {{- .Values.resources.openxchangeGuardUI | toYaml | nindent 6 }}
@@ -1017,7 +1050,10 @@ appsuite:
      - name: {{ . | quote }}
    {{- end }}
    podAnnotations:
-      {{ .Values.annotations.openxchangeAppsuiteCoreUserGuide.pod | toYaml | nindent 6 }}
+      intents.otterize.com/service-name: "open-xchange-core-user-guide"
      {{- with .Values.annotations.openxchangeAppsuiteCoreUserGuide.pod }}
      {{ . | toYaml | nindent 6 }}
      {{- end }}
    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
@@ -45,7 +45,7 @@ oxConnector:
  oxDefaultContext: "1"
  oxImapServer: "imap://127.0.0.1:143"
  oxLocalTimezone: "Europe/Berlin"
-  oxLanguage: "de_DE"
+  oxLanguage: {{ .Values.functional.internationalization.defaultLanguage | quote }}
  oxMasterAdmin: "admin"
  oxMasterPassword: {{ .Values.secrets.oxAppSuite.adminPassword | quote }}
  oxSmtpServer: "smtp://127.0.0.1:587"
@@ -68,7 +68,10 @@ persistence:
  #storageClass: {{ coalesce .Values.persistence.storages.oxConnector.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
 podAnnotations:
-  {{ .Values.annotations.nubusOxConnector.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "open-xchange-connector"
  {{- with .Values.annotations.nubusOxConnector.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 replicaCount: {{ .Values.replicas.oxConnector }}
--- a/helmfile/apps/open-xchange/values-postfix.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-postfix.yaml.gotmpl
@@ -64,11 +64,14 @@ postfix:
      password:
        value: {{ .Values.smtp.password }}
  smtpSASLAuthEnable: "yes"
  {{- else }}
  smtpSASLAuthEnable: "no"
  {{- end }}
  allowRelayNets: false
  smtpTLSSecurityLevel: "encrypt"
  smtpdSASLAuthEnable: "yes"
-  smtpdSASLSecurityOptions: "noanonymous"
+  smtpdSASLSecurityOptions: {{ .Values.smtp.security.smtpdSASLSecurityOptions | join ", " | quote }}
  smtpSASLSecurityOptions: {{ .Values.smtp.security.smtpSASLSecurityOptions | join ", " | quote }}
  smtpdSASLType: "dovecot"
  smtpdTLSSecurityLevel: "encrypt"
  smtpdTLSCertFile: "/etc/tls/tls.crt"
@@ -78,6 +81,25 @@ postfix:
  staticAuthDB:
    enabled: false
  ldapTransportMaps: []
  ldapVirtualAliasMaps:
    - host: "ums-ldap-server"
      scheme: "ldap"
      port: 389
      baseDn: "{{ .Values.ldap.baseDn }}"
      bindDn: "uid=ldapsearch_postfix,cn=users,{{ .Values.ldap.baseDn }}"
      password:
        value: {{ .Values.secrets.nubus.ldapSearch.postfix | quote }}
      # ldap filter to find groups with mail address
      queryFilter: "(&(|(objectClass=univentionMailList)(objectClass=posixGroup))(|(mailPrimaryAddress=%s)(mailAlternativeAddress=%s)))"
      # -- use this attribute if the query already returns email addresses of members and no recursive lookup needs to be done
      resultAttribute: ""
      # -- do a recursive search on the specified attribute if found, should be a DN
      specialResultAttribute: "uniqueMember"
      # -- return the following attribute from all found leaves when a recursive search is done
      leafResultAttribute: "mailPrimaryAddress"
  {{- if .Values.antivirus.milter.host }}
  smtpdMilters: "inet:{{ .Values.antivirus.milter.host }}:{{ .Values.antivirus.milter.port }}"
  {{- else }}
@@ -91,7 +113,10 @@ postfix:
  virtualTransport: "lmtps:dovecot:24"
 podAnnotations:
-  {{ .Values.annotations.openxchangePostfix.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "open-xchange-postfix"
  {{- with .Values.annotations.openxchangePostfix.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 replicaCount: {{ .Values.replicas.postfix }}
@@ -104,6 +129,8 @@ service:
    {{ .Values.annotations.openxchangePostfix.service | toYaml | nindent 4 }}
  external:
    enabled: true
    annotations:
      {{ .Values.annotations.openxchangePostfix.serviceExternal | toYaml | nindent 6 }}
    type: {{ coalesce .Values.service.type.postfix .Values.cluster.service.type | quote }}
 {{- end }}
 ...
--- a/helmfile/apps/opendesk-migrations-post/values.yaml.gotmpl
+++ b/helmfile/apps/opendesk-migrations-post/values.yaml.gotmpl
@@ -5,7 +5,10 @@ additionalAnnotations:
  {{ .Values.annotations.opendeskMigrationsPost.additional | toYaml | nindent 2 }}
 podAnnotations:
-  {{ .Values.annotations.opendeskMigrationsPost.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-migrations-post"
  {{- with .Values.annotations.opendeskMigrationsPost.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 serviceAccount:
  annotations:
--- a/helmfile/apps/opendesk-openproject-bootstrap/values.yaml.gotmpl
+++ b/helmfile/apps/opendesk-openproject-bootstrap/values.yaml.gotmpl
@@ -74,7 +74,10 @@ job:
  enabled: true
 podAnnotations:
-  {{ .Values.annotations.openprojectBootstrap.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-openproject-bootstrap"
  {{- with .Values.annotations.openprojectBootstrap.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  enabled: true
--- a/helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl
+++ b/helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl
@@ -15,8 +15,8 @@ assets:
  element:
    subdomain: {{ .Values.global.hosts.element }}
    paths:
-      - path: "/vector-icons/favicon.........ico"
+      - path: "/vector-icons/favicon.png"
-        data: {{ .Values.theme.imagery.chat.faviconIco }}
+        data: {{ .Values.theme.imagery.chat.faviconPng }}
  jitsi:
    subdomain: {{ .Values.global.hosts.jitsi }}
    paths:
@@ -116,7 +116,10 @@ image:
  imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 podAnnotations:
-  {{ .Values.annotations.opendeskServicesStaticFiles.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "opendesk-static-files"
  {{- with .Values.annotations.opendeskServicesStaticFiles.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  enabled: true
--- a/helmfile/apps/opendesk-services/values-otterize.yaml.gotmpl
+++ b/helmfile/apps/opendesk-services/values-otterize.yaml.gotmpl
@@ -10,12 +10,18 @@ additionalAnnotations:
  {{ .Values.annotations.opendeskServicesOtterize.additional | toYaml | nindent 2 }}
 apps:
  cassandra:
    enabled: {{ .Values.apps.cassandra.enabled }}
  certificates:
    enabled: {{ .Values.apps.certificates.enabled }}
  clamavDistributed:
    enabled: {{ .Values.apps.clamavDistributed.enabled }}
  clamavSimple:
    enabled: {{ .Values.apps.clamavSimple.enabled }}
  collabora:
    enabled: {{ .Values.apps.collabora.enabled }}
  collaboraController:
    enabled: {{ .Values.apps.collaboraController.enabled }}
  cryptpad:
    enabled: {{ .Values.apps.cryptpad.enabled }}
  dkimpy:
@@ -24,6 +30,12 @@ apps:
    enabled: {{ .Values.apps.dovecot.enabled }}
  element:
    enabled: {{ .Values.apps.element.enabled }}
  elementAdmin:
    enabled: {{ .Values.apps.elementAdmin.enabled }}
  elementGroupsync:
    enabled: {{ .Values.apps.elementGroupsync.enabled }}
  home:
    enabled: {{ .Values.apps.home.enabled }}
  jitsi:
    enabled: {{ .Values.apps.jitsi.enabled }}
  mariadb:
@@ -42,7 +54,7 @@ apps:
    enabled: {{ .Values.apps.nubus.enabled }}
  openproject:
    enabled: {{ .Values.apps.openproject.enabled }}
-  oxAppsuite:
+  oxAppSuite:
    enabled: {{ .Values.apps.oxAppSuite.enabled }}
  postfix:
    enabled: {{ .Values.apps.postfix.enabled }}
@@ -50,6 +62,8 @@ apps:
    enabled: {{ .Values.apps.postgresql.enabled }}
  redis:
    enabled: {{ .Values.apps.redis.enabled }}
  staticFiles:
    enabled: {{ .Values.apps.staticFiles.enabled }}
  xwiki:
    enabled: {{ .Values.apps.xwiki.enabled }}
--- a/helmfile/apps/openproject/values.yaml.gotmpl
+++ b/helmfile/apps/openproject/values.yaml.gotmpl
@@ -131,7 +131,10 @@ persistence:
  enabled: false
 podAnnotations:
-  {{ .Values.annotations.openproject.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "openproject"
  {{- with .Values.annotations.openproject.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 postgresql:
  bundled: false
--- a/helmfile/apps/services-external/values-cassandra.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-cassandra.yaml.gotmpl
@@ -73,8 +73,10 @@ persistence:
  storageClass: {{ coalesce .Values.persistence.storages.cassandra.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
 podAnnotations:
-  {{ .Values.annotations.cassandra.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "cassandra"
-
+  {{- with .Values.annotations.cassandra.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  enabled: true
  fsGroup: 1001
--- a/helmfile/apps/services-external/values-clamav-distributed.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-clamav-distributed.yaml.gotmpl
@@ -26,7 +26,10 @@ clamd:
    tag: {{ .Values.images.clamd.tag | quote }}
    imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
  podAnnotations:
-    {{ .Values.annotations.servicesExternalClamavDistributed.clamdPod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "clamav-distributed"
    {{- with .Values.annotations.servicesExternalClamavDistributed.clamdPod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  podSecurityContext:
    enabled: true
    fsGroup: 101
@@ -81,7 +84,10 @@ freshclam:
    tag: {{ .Values.images.freshclam.tag | quote }}
    imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
  podAnnotations:
-    {{ .Values.annotations.servicesExternalClamavDistributed.freshclamPod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "clamav-freshclam"
    {{- with .Values.annotations.servicesExternalClamavDistributed.freshclamPod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  podSecurityContext:
    enabled: true
    fsGroup: 101
@@ -129,7 +135,10 @@ icap:
    tag: {{ .Values.images.icap.tag | quote }}
    imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
  podAnnotations:
-    {{ .Values.annotations.servicesExternalClamavDistributed.icapPod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "clamav-icap"
    {{- with .Values.annotations.servicesExternalClamavDistributed.icapPod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  podSecurityContext:
    enabled: true
    fsGroup: 101
@@ -169,7 +178,10 @@ milter:
    tag: {{ .Values.images.milter.tag | quote }}
    imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
  podAnnotations:
-    {{ .Values.annotations.servicesExternalClamavDistributed.milterPod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "clamav-milter"
    {{- with .Values.annotations.servicesExternalClamavDistributed.milterPod }}
    {{ . | toYaml | nindent 4 }}
    {{- end }}
  podSecurityContext:
    enabled: true
    fsGroup: 101
--- a/helmfile/apps/services-external/values-clamav-simple.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-clamav-simple.yaml.gotmpl
@@ -44,7 +44,10 @@ persistence:
    {{ .Values.annotations.servicesExternalClamavSimple.persistence | toYaml | nindent 4 }}
 podAnnotations:
-  {{ .Values.annotations.servicesExternalClamavSimple.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "clamav-simple"
  {{- with .Values.annotations.servicesExternalClamavSimple.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  enabled: true
--- a/helmfile/apps/services-external/values-dkimpy.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-dkimpy.yaml.gotmpl
@@ -30,7 +30,10 @@ image:
  imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 podAnnotations:
-  {{ .Values.annotations.servicesExternalDkimpy.service | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "dkimpy-milter"
  {{- with .Values.annotations.servicesExternalDkimpy.service }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 podSecurityContext:
  enabled: true
--- a/helmfile/apps/services-external/values-mariadb.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-mariadb.yaml.gotmpl
@@ -78,6 +78,7 @@ persistence:
    {{ .Values.annotations.servicesExternalMariadb.persistence | toYaml | nindent 4 }}
 podAnnotations:
  intents.otterize.com/service-name: "mariadb"
  argocd.argoproj.io/hook: "PostSync"
  argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation"
  {{- with .Values.annotations.servicesExternalMariadb.pod }}
--- a/helmfile/apps/services-external/values-memcached.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-memcached.yaml.gotmpl
@@ -34,8 +34,10 @@ image:
  pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 podAnnotations:
-  {{ .Values.annotations.servicesExternalMemcached.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "memcached"
-
+  {{- with .Values.annotations.servicesExternalMemcached.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end}}
 replicaCount: {{ .Values.replicas.memcached }}
 resources:
--- a/helmfile/apps/services-external/values-minio.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-minio.yaml.gotmpl
@@ -134,7 +134,10 @@ provisioning:
      withLock: false
    {{- end }}
  podAnnotations:
-    {{ .Values.annotations.servicesExternalMinio.provisioningPod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "minio-provisioning"
    {{- with .Values.annotations.servicesExternalMinio.provisioningPod }}
    {{ . | toYaml | nindent 4}}
    {{- end }}
  policies:
    - name: "migrations-bucket-policy"
      statements:
@@ -271,7 +274,10 @@ provisioning:
    {{ .Values.resources.minio | toYaml | nindent 4 }}
 podAnnotations:
-  {{ .Values.annotations.servicesExternalMinio.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "minio"
  {{- with .Values.annotations.servicesExternalMinio.pod }}
  {{ . | toYaml | nindent 2 }}
  {{- end }}
 readinessProbe:
  enabled: true
--- a/helmfile/apps/services-external/values-postfix.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-postfix.yaml.gotmpl
@@ -41,7 +41,10 @@ persistence:
    {{ .Values.annotations.servicesExternalPostfix.persistence | toYaml | nindent 4 }}
 podAnnotations:
-  {{ .Values.annotations.servicesExternalPostfix.pod | toYaml | nindent 2 }}
+  intents.otterize.com/service-name: "postfix"
  {{- with .Values.annotations.servicesExternalPostfix.pod }}
  {{ . | toYaml | nindent 2}}
  {{- end}}
 podSecurityContext:
  enabled: true
@@ -69,6 +72,8 @@ postfix:
      password:
        value: {{ .Values.smtp.password }}
  smtpSASLAuthEnable: "yes"
  {{- else }}
  smtpSASLAuthEnable: "no"
  {{- end }}
  # Warning: This setting allows unauthenticated mail relay from relayNets!
  allowRelayNets: true
@@ -77,7 +82,8 @@ postfix:
  smtpdTLSMandatoryCiphers: "medium"
  smtpTLSSecurityLevel: "encrypt"
  smtpdSASLAuthEnable: "yes"
-  smtpdSASLSecurityOptions: "noanonymous"
+  smtpdSASLSecurityOptions: {{ .Values.smtp.security.smtpdSASLSecurityOptions | join ", " | quote }}
  smtpSASLSecurityOptions: {{ .Values.smtp.security.smtpSASLSecurityOptions | join ", " | quote }}
  smtpdSASLType: "cyrus"
  smtpdTLSSecurityLevel: "may"
  smtpdTLSCertFile: "/etc/tls/tls.crt"
@@ -91,6 +97,25 @@ postfix:
    password:
      value: {{ .Values.secrets.postfix.opendeskSystemPassword | quote }}
  ldapTransportMaps: []
  ldapVirtualAliasMaps:
    - host: "ums-ldap-server"
      scheme: "ldap"
      port: 389
      baseDn: "{{ .Values.ldap.baseDn }}"
      bindDn: "uid=ldapsearch_postfix,cn=users,{{ .Values.ldap.baseDn }}"
      password:
        value: {{ .Values.secrets.nubus.ldapSearch.postfix | quote }}
      # ldap filter to find groups with mail address
      queryFilter: "(&(|(objectClass=univentionMailList)(objectClass=posixGroup))(|(mailPrimaryAddress=%s)(mailAlternativeAddress=%s)))"
      # -- use this attribute if the query already returns email addresses of members and no recursive lookup needs to be done
      resultAttribute: ""
      # -- do a recursive search on the specified attribute if found, should be a DN
      specialResultAttribute: "uniqueMember"
      # -- return the following attribute from all found leaves when a recursive search is done
      leafResultAttribute: "mailPrimaryAddress"
  {{- if .Values.antivirus.milter.host }}
  smtpdMilters: "inet:{{ .Values.antivirus.milter.host }}:{{ .Values.antivirus.milter.port }}"
  {{- else }}
@@ -106,8 +131,6 @@ postfix:
  virtualTransport: "lmtps:dovecot:24"
  {{- end }}
 podAnnotations: {}
 replicaCount: {{ .Values.replicas.postfix }}
 resources:
--- a/helmfile/apps/services-external/values-postgresql.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-postgresql.yaml.gotmpl
@@ -67,6 +67,9 @@ job:
    - username: {{ .Values.databases.umsGuardianManagementApi.username | quote }}
      password: {{ .Values.secrets.postgresql.umsGuardianManagementApiUser | quote }}
      connectionLimit: {{ .Values.databases.umsGuardianManagementApi.connectionLimit | default .Values.databases.defaults.userConnectionLimit }}
    - username: {{ .Values.databases.umsAuthSession.username | quote }}
      password: {{ .Values.secrets.postgresql.umsAuthSessionUser | quote }}
      connectionLimit: {{ .Values.databases.umsAuthSession.connectionLimit | default .Values.databases.defaults.userConnectionLimit }}
    - username: {{ .Values.databases.umsSelfservice.username | quote }}
      password: {{ .Values.secrets.postgresql.umsSelfserviceUser | quote }}
      connectionLimit: {{ .Values.databases.umsSelfservice.connectionLimit | default .Values.databases.defaults.userConnectionLimit }}
@@ -96,6 +99,8 @@ job:
      user: {{ .Values.databases.umsGuardianManagementApi.username | quote }}
    - name: {{ .Values.databases.umsNotificationsApi.name | quote }}
      user: {{ .Values.databases.umsNotificationsApi.username | quote }}
    - name: {{ .Values.databases.umsAuthSession.name | quote }}
      user: {{ .Values.databases.umsAuthSession.username | quote }}
    - name: {{ .Values.databases.umsSelfservice.name | quote }}
      user: {{ .Values.databases.umsSelfservice.username | quote }}
 {{ if or (eq .Values.databases.nextcloud.type "postgresql") (eq .Values.databases.nextcloud.type "psql") }}
@@ -115,6 +120,7 @@ persistence:
    {{ .Values.annotations.servicesExternalPostgresql.persistence | toYaml | nindent 4 }}
 podAnnotations:
  intents.otterize.com/service-name: "postgresql"
  argocd.argoproj.io/hook: "PostSync"
  argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation"
  {{- with .Values.annotations.servicesExternalPostgresql.pod}}
--- a/helmfile/apps/services-external/values-redis.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-redis.yaml.gotmpl
@@ -44,7 +44,10 @@ master:
    annotations:
      {{ .Values.annotations.servicesExternalRedis.masterPersistence | toYaml | nindent 6 }}
  podAnnotations:
-    {{ .Values.annotations.servicesExternalRedis.masterPod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "redis"
    {{- with .Values.annotations.servicesExternalRedis.masterPod }}
    {{ . | toYaml | nindent 4  }}
    {{- end }}
  resources:
    {{ .Values.resources.redis | toYaml | nindent 4 }}
  service:
--- a/helmfile/apps/xwiki/values.yaml.gotmpl
+++ b/helmfile/apps/xwiki/values.yaml.gotmpl
@@ -184,9 +184,9 @@ properties:
  "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.addOIDCObject": 1
  "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.OIDCIssuer": "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}"
  "property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.colorTheme": "FlamingoThemes.Iceberg"
-  "property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.default_language": "de_DE"
+  "property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.default_language": {{ .Values.functional.internationalization.defaultLanguage | quote }}
  "property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.timezone": "Europe/Berlin"
-  "property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.languages": "de_DE"
+  "property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.languages": {{ .Values.functional.internationalization.defaultLanguage | quote }}
  "property:xwiki:FlamingoThemes.Iceberg^FlamingoThemesCode.ThemeClass.link-color": "@brand-primary"
  "property:xwiki:FlamingoThemes.Iceberg^FlamingoThemesCode.ThemeClass.btn-primary-bg": "@brand-primary"
  "property:xwiki:FlamingoThemes.Iceberg^FlamingoThemesCode.ThemeClass.navbar-default-color": "@brand-primary"
--- 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.2.0-authcache"
+    version: "3.3.0"
    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: "25.04.5.3.1@sha256:d22407cd3bd83dd832f986a697d81c1a4642f55129c76a5a20e637274ce7bf62"
+    tag: "25.04.6.3.1@sha256:9ea79433e71db3b9056f47a0c8324a3a4f23f78b2412222991abf63969a714f1"
  dovecot:
    registry: "registry.opencode.de"
    repository: "zendis/opendesk-enterprise/components/supplier/open-xchange/images-mirror/dovecot-pro"
--- a/helmfile/environments/default/annotations.yaml.gotmpl
+++ b/helmfile/environments/default/annotations.yaml.gotmpl
@@ -95,7 +95,7 @@ annotations:
    serviceAccount: ~
  jitsiJvb:
    pod: ~
-    service: ~
+    serviceExternal: ~
    metricsPrometheus: ~
    metricsGrafana: ~
  jitsiProsody:
@@ -360,6 +360,7 @@ annotations:
    pod: ~
    service: ~
    serviceAccount: ~
    serviceExternal: ~
  openxchangeEnterpriseContactPicker:
    appsuiteCoreMw:
    appsuiteCoreMwPod: ~
@@ -369,6 +370,7 @@ annotations:
  openxchangePostfix:
    pod: ~
    service: ~
    serviceExternal: ~
  openxchangePublicSectorUi:
    pod: ~
  servicesExternalClamavDistributed:
@@ -376,7 +378,12 @@ annotations:
    clamdPod: ~
    clamdService: ~
    clamdServiceAccount: ~
    icapCommon: ~
    icapPod: ~
    icapService: ~
    icapServiceAccount: ~
    freshclamCommon: ~
    freshclamPod: ~
    freshclamService: ~
    freshclamServiceAccount: ~
    milterCommon: ~
--- a/helmfile/environments/default/charts.yaml.gotmpl
+++ b/helmfile/environments/default/charts.yaml.gotmpl
@@ -65,7 +65,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "zendis/opendesk-enterprise/components/supplier/collabora/charts-mirror"
    name: "cool-controller"
-    version: "1.1.6"
+    version: "1.1.10"
    verify: false
  cryptpad:
    # providerCategory: "Supplier"
@@ -97,7 +97,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-dovecot"
    name: "dovecot"
-    version: "3.2.0"
+    version: "3.3.0"
    verify: true
  element:
    # providerCategory: "Platform"
@@ -139,7 +139,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
    name: "intercom-service"
-    version: "2.19.5"
+    version: "2.22.0"
    verify: true
  jitsi:
    # providerCategory: "Platform"
@@ -149,7 +149,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-jitsi"
    name: "opendesk-jitsi"
-    version: "3.3.2"
+    version: "3.4.0"
    verify: true
  mariadb:
    # providerCategory: "Platform"
@@ -169,7 +169,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-matrix-widgets"
    name: "matrix-neoboard-widget"
-    version: "3.5.1"
+    version: "3.5.2"
    verify: true
  matrixNeochoiceWidget:
    # providerCategory: "Platform"
@@ -179,7 +179,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-matrix-widgets"
    name: "matrix-neochoice-widget"
-    version: "3.5.1"
+    version: "3.5.2"
    verify: true
  matrixNeodatefixBot:
    # providerCategory: "Platform"
@@ -189,7 +189,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-matrix-widgets"
    name: "matrix-neodatefix-bot"
-    version: "3.5.1"
+    version: "3.5.2"
    verify: true
  matrixNeodatefixWidget:
    # providerCategory: "Platform"
@@ -199,7 +199,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-matrix-widgets"
    name: "matrix-neodatefix-widget"
-    version: "3.5.1"
+    version: "3.5.2"
    verify: true
  matrixUserVerificationService:
    # providerCategory: "Platform"
@@ -321,7 +321,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
    name: "nubus"
-    version: "1.14.0"
+    version: "1.15.2"
    verify: true
  opendeskAlerts:
    # providerCategory: "Platform"
@@ -361,7 +361,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-static-files"
    name: "opendesk-static-files"
-    version: "4.1.0"
+    version: "4.1.1"
    verify: true
  openproject:
    # providerCategory: "Supplier"
@@ -437,7 +437,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-postfix"
    name: "postfix"
-    version: "5.0.1"
+    version: "5.1.0"
    verify: true
  postgresql:
    # providerCategory: "Platform"
@@ -536,5 +536,5 @@ charts:
    repository: "bmi/opendesk/components/supplier/xwiki/charts-mirror"
    name: "xwiki"
    version: "1.4.4"
-    verify: false
+    verify: true
 ...
--- a/helmfile/environments/default/functional.yaml.gotmpl
+++ b/helmfile/environments/default/functional.yaml.gotmpl
@@ -105,6 +105,16 @@ functional:
        # If the LDAP entryUUID should be used for the localpart of user's Matrix IDs following setting must be `true`.
        useImmutableIdentifierForLocalpart: false
  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
  externalServices:
    nubus:
      udmRestApi:
@@ -117,16 +127,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:
    # Settings related to directory and filenames
    naming:
@@ -200,10 +200,24 @@ functional:
    # Related settings for the CalDAV and CardCAV support of the groupware module.
    davSupport:
      # Enabled by default CalDAV and CardDAV support is available at:
-      # - https://<.Values.global.hosts.openxchangeDav>.<.Values.global.domain>/caldav/[folderId]"
+      # - `https://<.Values.global.hosts.openxchangeDav>.<.Values.global.domain>/caldav/[folderId]`
-      # - https://<.Values.global.hosts.openxchangeDav>.<.Values.global.domain>/carddav/[folderId]"
+      # - `https://<.Values.global.hosts.openxchangeDav>.<.Values.global.domain>/carddav/[folderId]`
      # Can be switched off using the below feature toggle.
      enabled: true
    # Setting related to external clients using SMTP/IMAP protocols (like Thunderbird)
    externalClients:
      # To fully support external mail clients in your openDesk deployment you need to ensure they can
      # access the IMAP and SMTP services. Either on <.Values.global.domain> or on the FQDNs defined
      # below.
      # How to achive this depends on what service types you are using in your deployment. These service
      # types can be set explicitly for IMAP (Dovecot) and SMTP (Postfix) using `service.yaml.gotmpl` and
      # how these services, especially when using type `LoadBalancer`, behave in your setup.
      # Toggle the client onboarding info dialog in the groupware module.
      enabledOnboardingInfo: false
      # Set the FQDN of the IMAP endpoint if none is provided `<.Values.global.domain>` is used.
      fqdnImap: ~
      # Set the FQDN of the SMTP endpoint if none is provided `<.Values.global.domain>` is used.
      fqdnSmtp: ~
    # Control access for external users to groupware data
    # Ref.: https://documentation.open-xchange.com/8/middleware/miscellaneous/sharing_and_guest_mode.html
    externalSharing:
@@ -251,6 +265,18 @@ functional:
      # Ref.: https://documentation.open-xchange.com/8/ui/configuration/settings-list-of.html#mail-misc
      editRealName: false
  internationalization:
    # Most openDesk applications render their user interface in the language the user's browser is set to. But there
    # are exceptions that can be controlled by the following setting.
    # Beside the `de_DE` default `en_GB` has been tested.
    # - OX App Suite: Users can set their preferred language in the App Suite's UI by navigating to
    #   "All settings" > "General" > "Language & Time zone" > "Language", though the default language for the first
    #   login will be set globally based on the setting below.
    # - XWiki: The UI language of XWiki is set automatically by the language the wiki content is provided in. As XWiki
    #   does not autodetect that content language, it has to be predefined by the setting below.
    #   Note: For multi-language XWiki setups a customization is required for now.
    defaultLanguage: "de_DE"
  migration:
    oxAppSuite:
      # Note: Only available in openDesk Enterprise.
--- a/helmfile/environments/default/global.generated.yaml.gotmpl
+++ b/helmfile/environments/default/global.generated.yaml.gotmpl
@@ -3,5 +3,5 @@
 ---
 global:
  systemInformation:
-    releaseVersion: "v1.8.0"
+    releaseVersion: "v1.10.0"
 ...
--- a/helmfile/environments/default/global.yaml.gotmpl
+++ b/helmfile/environments/default/global.yaml.gotmpl
@@ -15,7 +15,7 @@ global:
  #
  mailDomain: {{ env "MAIL_DOMAIN" | quote }}
-  ## Define additional mail domains, comma separated, e.g. domain1.de,domain2.de
+  ## Optional list of additional mail domains
  #
  additionalMailDomains: []
--- a/helmfile/environments/default/images.yaml.gotmpl
+++ b/helmfile/environments/default/images.yaml.gotmpl
@@ -50,14 +50,14 @@ 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: "25.04.5.3.1@sha256:0e1ccf43308121c657936510de27244057c3826777a491495a0f7e55a196bc59"
+    tag: "25.04.6.3.1@sha256:ade67ba25db8909308a0f498364c62172b482dfc1b4f80e33c1b01f7c164d8ac"
  collaboraController:
    # Enterprise Component
    # providerCategory: "Supplier"
    # providerResponsible: "Collabora"
    registry: "registry.opencode.de"
    repository: "zendis/opendesk-enterprise/components/supplier/collabora/images-mirror/cool-controller"
-    tag: "1.1.3@sha256:552b63fd748ec873bd286c4d9ea0cf675f349f35a9ca2a69d2962336e4bc5f83"
+    tag: "1.1.6@sha256:7935f21bf75cdddbbbd01754d8d0458014a68ab64b08121c8fca7a2715e0d85b"
  cryptpad:
    # providerCategory: "Supplier"
    # providerResponsible: "XWiki"
@@ -158,7 +158,7 @@ images:
    # upstreamMirrorStartFrom: ["2", "1", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/intercom-service"
-    tag: "2.19.5@sha256:4f1bccfd29889e1edd093c8e35c9486919984faf55ca92b787a6a7aca3729e47"
+    tag: "2.22.0@sha256:0049fc70c03d42780630c2b9915172086ce0cf8f936daeb04e625270a50d0126"
  jibri:
    # providerCategory: "Supplier"
    # providerResponsible: "Nordeck"
@@ -168,7 +168,7 @@ images:
    # upstreamMirrorStartFrom: ["8922"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/nordeck/images-mirror/jibri"
-    tag: "stable-10431@sha256:21ae6f3e9139ca1beea630756060b66f1a6221005f45e35df35d4bf9f69a4cc3"
+    tag: "stable-10590@sha256:c6e10bc418084c2e1664e76bdddb525db34ba5f140af5a9fe9dd5c4f7637a492"
  jicofo:
    # providerCategory: "Supplier"
    # providerResponsible: "Nordeck"
@@ -178,7 +178,7 @@ images:
    # upstreamMirrorStartFrom: ["8922"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/nordeck/images-mirror/jicofo"
-    tag: "stable-10431@sha256:6857b0cad627cde79f6e21c1c40843b14d70dd43e627537c60449d448ce14769"
+    tag: "stable-10590@sha256:a30e9e09fdc39d88bc8cc8a4e83a32bb6bf58914abfb44290439afaf4c72e4a8"
  jigasi:
    # providerCategory: "Supplier"
    # providerResponsible: "Nordeck"
@@ -188,7 +188,7 @@ images:
    # upstreamMirrorStartFrom: ["9955"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/nordeck/images-mirror/jigasi"
-    tag: "stable-10431@sha256:9bcb35444296ab007b24a8ccecd6c1eacc0f01fccf4223e7f8ac340464f4a52e"
+    tag: "stable-10590@sha256:0596e603eb1b4909e8df97be00649848f2b1b85b7cbb7d5e3065ba482a231d49"
  jitsi:
    # providerCategory: "Supplier"
    # providerResponsible: "Nordeck"
@@ -198,7 +198,7 @@ images:
    # upstreamMirrorStartFrom: ["8922"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/nordeck/images-mirror/web"
-    tag: "stable-10431@sha256:47f57fb67d95a2d3b5fa6edf93916b4922e1599278c0f9dd16cc30f432c75511"
+    tag: "stable-10590@sha256:ae90a61975f7f7d498051ce9e0d7310117ee3f869dcc8c947a005214b253582d"
  jitsiKeycloakAdapter:
    # providerCategory: "Supplier"
    # providerResponsible: "Nordeck"
@@ -208,7 +208,7 @@ images:
    # upstreamMirrorStartFrom: ["2023", "12", "14"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/nordeck/images-mirror/jitsi-keycloak-adapter"
-    tag: "v20250911@sha256:716fb9ba2e866d74cbbd6241a8c75335e48ba25ec2d35f4678e83dd3156bc87c"
+    tag: "v20251119@sha256:2df703ff789be841f984142120e5a31dfd60cfe112a8d8d548ecc92e1401f005"
  jitsiPatchJVB:
    # providerCategory: "Community"
    # providerResponsible: "openDesk"
@@ -228,7 +228,7 @@ images:
    # upstreamMirrorStartFrom: ["8922"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/nordeck/images-mirror/jvb"
-    tag: "stable-10431@sha256:64f8a368f593a30d5388d9643b1b0af7b4a09f03f6e585e50cdbff398b5f8918"
+    tag: "stable-10590@sha256:651021ddd4fe1ca29848d96d5813a1ea71b3dbf3587b14a13968ec0e62de2f0c"
  mariadb:
    # providerCategory: "Community"
    # providerResponsible: "openDesk"
@@ -354,7 +354,7 @@ images:
    # upstreamRepository: "lasuite/impress-backend"
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/images/opendesk-notes"
-    tag: "1.11.0-docs-v3.4.0-backend@sha256:a07acb86ee260fd9242c4173a01c67c36552d149a2af91220348bdb588c19bf5"
+    tag: "1.12.1-docs-v3.4.0-backend@sha256:9d611d924056bd945499ef038ee7ac4c7a1196adfe0fc464d600d163dc42291a"
  notesFrontend:
    # providerCategory: "Supplier"
    # providerResponsible: "DINUM"
@@ -362,7 +362,7 @@ images:
    # upstreamRepository: "lasuite/impress-frontend"
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/images/opendesk-notes"
-    tag: "1.11.0-docs-v3.4.0-frontend@sha256:e7316700442455419ebb2e37fe2ae246bb90a7d09ad30477df608b5eb6089095"
+    tag: "1.12.1-docs-v3.4.0-frontend@sha256:51cb96a97dd5668366d9f664977cbb869e4a59499bf30bc1766528dd41843ac7"
  notesYProvider:
    # providerCategory: "Supplier"
    # providerResponsible: "DINUM"
@@ -370,7 +370,7 @@ images:
    # upstreamRepository: "lasuite/impress-y-provider"
    registry: "registry-1.docker.io"
    repository: "lasuite/impress-y-provider"
-    tag: "v3.2.1@sha256:9dd7068336c02fe71806bc3576e7dc8636d7ccb139667c6303f0753e18d3ab7e"
+    tag: "v3.4.0@sha256:fce38ca22cdc80c06803ded6f7147b6d1df22dd21f58ef834adef1d3aa83d667"
  nubusBlocklistCleanup:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -380,7 +380,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "34", "2"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/blocklist-cleanup"
-    tag: "0.40.0@sha256:1b4d388196b144327bc55376225675b1df8d23fdaffc85bb9e350c3c94fa0eb5"
+    tag: "0.41.4@sha256:6313e41aaebb6904ca461896ac9633eb05b33bf30b87d83d81852935e8cf0302"
  nubusDataLoader:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -390,7 +390,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "41", "5"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/data-loader"
-    tag: "0.99.0@sha256:52ef05c1e682e6c706f70632206be1b427a1a346a32ae3bff1566386f75e68af"
+    tag: "0.99.20@sha256:37af6f2a8ed7b5156e01f126c83797c70485353673d92b60d904af97bd309b0c"
  nubusGuardianAuthorizationApi:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -400,7 +400,7 @@ images:
    # upstreamMirrorStartFrom: ["1", "0", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/guardian-authorization-api-authorization-api"
-    tag: "2.0.0@sha256:5f194f9385aea5a279e25a57352f7b88a6cc4fa90b3bf04c2c97b9ff2bad70a5"
+    tag: "3.0.0@sha256:d2849b25ddd0322e1bef6c1e7b16f59fb63f35b0924f99f200bc22de834d9a2d"
  nubusGuardianManagementApi:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -410,7 +410,7 @@ images:
    # upstreamMirrorStartFrom: ["1", "0", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/guardian-management-api-management-api"
-    tag: "2.0.0@sha256:61a1ab84efebe2a87d358e8624f8b39073a6071683e7cd77b740a97d464753a2"
+    tag: "3.0.0@sha256:f3c9af13d50632a7e2232f675408b5559fb9ca314b7babf367cf4db80b62ebea"
  nubusGuardianManagementUi:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -420,7 +420,7 @@ images:
    # upstreamMirrorStartFrom: ["1", "0", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/guardian-management-ui-management-ui"
-    tag: "2.0.0@sha256:57e2503a4772f0ff656e792a98fadef4d41c248218e6c368f76ce82a892478cf"
+    tag: "3.0.0@sha256:b90d496a323353c71e29938a6b1980655fb3aefe53bab455da865e3202b7f0f8"
  nubusGuardianProvisioning:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -440,7 +440,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "0", "1"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/keycloak"
-    tag: "0.2.5@sha256:499006904d262bdd334b54583c359c7e34b521697d5fda32ea977d856bfa93d2"
+    tag: "0.4.1@sha256:482f3108ce775bb028cefa763a21d7af71b3d55e2e1800724ab9cabcd60ba2c6"
  nubusKeycloakBootstrap:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -450,7 +450,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "1", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/keycloak-bootstrap"
-    tag: "0.17.5@sha256:08e2aa0bc0eb7b4bb80498e71ae21ee3de74eb985b46e7c3dd1502e96312d080"
+    tag: "0.19.10@sha256:29dbac967a71c11f2f2920a1a4c109b473fe5edf542a2f5b9dc843a4c0c29fe6"
  nubusKeycloakExtensionHandler:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -460,7 +460,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "0", "3"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/keycloak-handler"
-    tag: "0.20.0@sha256:227c7cba4eee15c626abbc77ca06b8b61a9dece04c986a9fa2e97b13d0458fe0"
+    tag: "0.23.2@sha256:2a67c9ace51a610397776c17f3542231c9fbce411cfa56d9346b47f66478e416"
  nubusKeycloakExtensionProxy:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -470,7 +470,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "0", "3"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/keycloak-proxy"
-    tag: "0.20.0@sha256:bd075d33c16926ab4c123ac3a8673209664647f35324dfdebd95c6662ee05b2c"
+    tag: "0.23.2@sha256:03a05abd9b759ddf2fa537d61e09a54f1a772121f391e136000eeed44a254189"
  nubusLdapNotifier:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -480,7 +480,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "8", "2"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/ldap-notifier"
-    tag: "0.47.0@sha256:1d00e0bb1575defce42c84eb5139b5b4f7d0942111b339044c2bdf58ed0b025e"
+    tag: "0.47.5@sha256:cc8edd9dfa3cf552396bc1ada9a8a18e2db33b53ab1705bfc392c4a423cfeb96"
  nubusLdapServer:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -490,7 +490,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "8", "2"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/ldap-server"
-    tag: "0.47.0@sha256:3be012680b2da2db4ac468ae948d8514622a245b4e3e00385bbf778e836720b1"
+    tag: "0.47.5@sha256:1a81ef8431aa6a7b021032ce57e5907e27c69dc6603b455793911a7d581889e8"
  nubusLdapServerDhInitContainer:
    # providerCategory: 'Community'
    # providerResponsible: 'Univention'
@@ -498,7 +498,7 @@ images:
    # upstreamRepository: 'natsio/nats-box'
    registry: "registry-1.docker.io"
    repository: "natsio/nats-box"
-    tag: "0.16.0-nonroot@sha256:f486ca86dfc9b72a2310ea720994a94ce55e447ad01daccd2fb33d61f322dc51"
+    tag: "0.18.1-nonroot@sha256:ec2f58b953916b4804d6636bf6a625bab7894d1b71319bc7865b3e70ab5e3f6f"
  nubusLdapServerLeaderElector:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -508,7 +508,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "29", "1"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/ldap-server-elector"
-    tag: "0.47.0@sha256:9b6754e7213f1fa13a12cb593bfe718643f6945ad111bbe1d5f71d7ce5729225"
+    tag: "0.47.5@sha256:abf2e9af9c8d22dde23144cb6344b5e9b0e39d778d28e70d97b0f1b82dd28a5d"
  nubusLdapUpdateUniventionObjectIdentifier:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -518,7 +518,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "34", "2"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/ldap-update-univention-object-identifier"
-    tag: "0.40.0@sha256:1ad952c039140ef1985712201f7bae7cbe9eba66086e0d3f475759e1c181b843"
+    tag: "0.41.4@sha256:c27e4d4cf5a15607c249c8d917e57f698d4d5388967c1ff6151185957eacb779"
  nubusNats:
    # providerCategory: 'Community'
    # providerResponsible: 'Univention'
@@ -526,7 +526,7 @@ images:
    # upstreamRepository: 'library/nats'
    registry: "registry-1.docker.io"
    repository: "library/nats"
-    tag: "2.10.26@sha256:736d575e60135ce1d50fc206675d48d0e57dcaa0704f696f0cb4b5f6dadd49d7"
+    tag: "2.11.9@sha256:4e97bea2e69ffe4449cdc9b4c7fa707984aa9a4c090bf2faf5441cb6c97c99a4"
  nubusNatsBox:
    # providerCategory: 'Community'
    # providerResponsible: 'Univention'
@@ -534,7 +534,7 @@ images:
    # upstreamRepository: 'natsio/nats-box'
    registry: "registry-1.docker.io"
    repository: "natsio/nats-box"
-    tag: "0.16.0-nonroot@sha256:f486ca86dfc9b72a2310ea720994a94ce55e447ad01daccd2fb33d61f322dc51"
+    tag: "0.18.1-nonroot@sha256:ec2f58b953916b4804d6636bf6a625bab7894d1b71319bc7865b3e70ab5e3f6f"
  nubusNatsReloader:
    # providerCategory: 'Community'
    # providerResponsible: 'Univention'
@@ -542,7 +542,7 @@ images:
    # upstreamRepository: 'natsio/nats-server-config-reloader'
    registry: "registry-1.docker.io"
    repository: "natsio/nats-server-config-reloader"
-    tag: "0.17.1@sha256:f364bb8330d3430666ca09f17c6a43bfaefde32f0f3e79d4a41c588c29936e99"
+    tag: "0.18.3@sha256:41271dc1b9e1027867ee0e63aa2866c89ca8272a4f88991f6ebec34eb12dee3b"
  nubusNotificationsApi:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -552,7 +552,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "9", "4"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/notifications-api"
-    tag: "0.80.2@sha256:94b18841018cb7353a95a9c4ef2d5460f82a9ceb0bba97275b8064806e3e8a1c"
+    tag: "0.86.0@sha256:522c4d0a42d2c0b37219f5af4fba7fceb60d070719970ef2754a00ca916f67be"
  nubusOpendeskExtension:
    # providerCategory: "Platform"
    # providerResponsible: "openDesk"
@@ -560,7 +560,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.15.0@sha256:5ffb3106bf896a215fd7ae5d6646f19b50f0e46c11561d763938479d95aaa807"
+    tag: "1.15.1@sha256:e9c46d93abe6d7a8abcd2dc5cd38f178cd3b78f971f81b34fa5bd27270604db8"
  nubusOpendeskExtensionA2gMapper:
    # providerCategory: "Platform"
    # providerResponsible: "openDesk"
@@ -578,7 +578,7 @@ images:
    # upstreamMirrorStartFrom: ["1", "0", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/guardian-authorization-api-opa"
-    tag: "2.0.0@sha256:56a92a08da5addb951a2b2df09974889295ddde8526e93ad40dd973de1052ad4"
+    tag: "3.0.0@sha256:85539fb7854fac6ba1b874d639188ee0a33743dc16dad0113c54763f2984fc9d"
  nubusOxExtension:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -598,7 +598,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "27", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-consumer"
-    tag: "0.80.2@sha256:c719ada025e0ad629516017ed26803c15cee50572f45896b41a6b066b1fe593e"
+    tag: "0.86.0@sha256:80ed7c8300365a3dc4c504d4f0f4f8f1c3f9cfc883508a8ea794d63629a9b086"
  nubusPortalExtension:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -608,7 +608,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "28", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-extension"
-    tag: "0.80.2@sha256:cde5547ef1c2d5da55fb41bdae7248ba8514ab4f200822709ca9a99f483a1cc8"
+    tag: "0.86.0@sha256:1799413fe8cbc6d9cb97656be95a99786a382a3558a7720b7fe62a38c84bdd22"
  nubusPortalFrontend:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -618,7 +618,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "67", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-frontend"
-    tag: "0.80.2@sha256:8b40acc66459058dc0cade33793aba2737cdc20ef75968ca2b21d9aa569c9ecc"
+    tag: "0.86.0@sha256:d4e34b42662dbd433dd5d647c6fcfa8f2a0d71fe65c0c6efeebe80d4f13b226d"
  nubusPortalServer:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -628,7 +628,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "9", "4"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-server"
-    tag: "0.80.2@sha256:9a8f6950e7bf1086075d1c36ea0ad914a61e1198883e8d4926d688c88b8e67cc"
+    tag: "0.86.0@sha256:33a3a7d44fa084d74449dc8f7d5f5d2551b02abee16fe4ec6d4972e134c56906"
  nubusProvisioningDispatcher:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -638,7 +638,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "14", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-dispatcher"
-    tag: "0.60.10@sha256:6307e9e1ddad0e6f3285ca11b758902f8c377a5d3de6a59b3437accb8475848f"
+    tag: "0.63.0@sha256:3773333a12b786db6cea5fc0ecd5e74ba3f276ca084cd1ae8b6665bda86b72c1"
  nubusProvisioningEventsAndConsumerApi:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -648,7 +648,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.60.10@sha256:9d5f4e4a2668605349fa6cd6973c7a6acbc2ef95a37e72834c6525ac9e464740"
+    tag: "0.63.0@sha256:c1687ff385d5bd30e0590472f02de85a3f182b75dc4edd5cf9d063e1db488b4d"
  nubusProvisioningPrefill:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -658,7 +658,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "14", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-prefill"
-    tag: "0.60.10@sha256:8ea46658e66fb5be81968dcf00397b741f61d4fd84c8210b9761412e67109cd0"
+    tag: "0.63.0@sha256:b93400fecc19bba79ae0f0498b07d18bf9ffb0fc03b9ed25a18f3b6d3be9cc9d"
  nubusProvisioningUdmListener:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -668,7 +668,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "14", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-udm-listener"
-    tag: "0.60.10@sha256:fb0d96fa7b382b7d8eec9e262711e1291a0991ade185b39ee604400d4bd5fa9b"
+    tag: "0.63.0@sha256:6dcb696920137973b24f90bb8f6045c2dffd8bc201b0cc62aed43e1a01e5aa0e"
  nubusProvisioningUdmTransformer:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -678,7 +678,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "14", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-udm-transformer"
-    tag: "0.60.10@sha256:62b98f3e2c19de298878f5679577bfcbddacec742015d6f20b998a549318e810"
+    tag: "0.63.0@sha256:da5486cf5d6a30e7d95270db8a6735c82813805e7bce882ff51a2f47faad086f"
  nubusSelfServiceConsumer:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -688,7 +688,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "3", "2"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/selfservice-invitation"
-    tag: "0.19.4@sha256:ca9865114fd35fcc1dbe1a5660a3b69d04a8f568cf15286069342e45f0c7ea91"
+    tag: "0.19.31@sha256:b6d1a145e8a3f43b54be1d7d737da1527347e93c9894943c17469cd153f77ccf"
  nubusUdmRestApi:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -698,7 +698,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "9", "3"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/udm-rest-api"
-    tag: "0.40.0@sha256:7d39c0defda20fc58da19389216d9a80f479a731dca682d834dd8bd00b80e20f"
+    tag: "0.41.4@sha256:d3476100f4174d991faa43ce20630175a1fc33011258887dd52bafad1e779189"
  nubusUmcGateway:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -708,7 +708,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "7", "3"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/umc-gateway"
-    tag: "0.51.2@sha256:c76860852133b9bbc91eb6d81a6592a5f451be9234376933ddb4d827e0f08515"
+    tag: "0.53.5@sha256:7044228155c8fcb939684855d5b405dd1b066d91c8a5df75676518d88e140ab3"
  nubusUmcServer:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -718,7 +718,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "7", "3"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/umc-server"
-    tag: "0.51.3@sha256:00f8cc2e7ee98d3988b1db924ca67783e9a645204ae2c388c7afadc50f22bb12"
+    tag: "0.53.5@sha256:1ec839c07492b2f1d6897643b71c284aa2d507cd05f1a0f1696dfdff1885eb20"
  nubusUmcServerProxy:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -762,7 +762,7 @@ images:
    # upstreamMirrorStartFrom: ["13", "1", "1"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/openproject/images-mirror/open_desk"
-    tag: "16.4.1@sha256:b80443fc9fe1bf9ed475897316208b394cca4e730ae8ca34944373245cc0a4f5"
+    tag: "16.6.1@sha256:e3eb4ecdff5a94d2d2aaa0eacc9e747306d6ba6a06f308d2d16cc209516dd4e0"
  openprojectBootstrap:
    # providerCategory: "Platform"
    # providerResponsible: "openDesk"
@@ -914,7 +914,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.3@sha256:12bcebf57ddb53258c48eaa60e9c25b441f4319ee1b94b363c652ad0a992a875"
+    tag: "3.0.4@sha256:5b17c801283215b13e8305b0be1497d70c232e8ea8414f965cd1010333ae95ab"
  postfixBootstrap:
    # providerCategory: "Community"
    # providerResponsible: "openDesk"
@@ -940,7 +940,7 @@ images:
    # upstreamMirrorStartFrom: ["8922"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/nordeck/images-mirror/prosody"
-    tag: "stable-10431@sha256:792618fff60c6e0eb4facb221e3477b2249cabeaf0479753ac7a6b98c075fd20"
+    tag: "stable-10590@sha256:86d43e743268fa89035663a5e29be7689b131b9c1fb435c01c94d2eeebbb058a"
  redis:
    # providerCategory: "Community"
    # providerResponsible: "openDesk"
@@ -960,7 +960,7 @@ images:
    # upstreamMirrorStartFrom: ["1", "91", "2"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/element/images-mirror/synapse"
-    tag: "v1.137.0@sha256:ae2f7ae1329d4ce66292ee2aed78f9187ab25104288c44413b0de4c0ae8ac7f9"
+    tag: "v1.141.0@sha256:4914f40c9fbfb29e4157bd1f7db87169894505c2c66dfdb4fcad5a34cd42f924"
  synapseCreateUser:
    # providerCategory: "Community"
    # providerResponsible: "Nordeck"
@@ -1000,19 +1000,19 @@ images:
    # providerResponsible: "XWiki"
    # upstreamRegistry: "https://git.xwikisas.com:5050"
    # upstreamRepository: "xwikisas/swp/xwiki"
-    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)-?\d?-mariadb.+$'
+    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)-?[0-9A-Z]*-mariadb.+$'
-    # upstreamMirrorStartFrom: ["17", "4", "4"]
+    # upstreamMirrorStartFrom: ["17", "4", "7"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/xwiki/images-mirror/xwiki"
-    tag: "17.4.4-1-mariadb-jetty-alpine@sha256:0182dbb610a4c80b253e63e73ccc2487a07579baf259df4c874d860754127b4c"
+    tag: "17.4.7-mariadb-jetty-alpine@sha256:28ce6382b7ec3d403136f1b8ab11d5738c3c0e7830db3f030c5af8a38d5e93a5"
  xwikiPostgres:
    # providerCategory: "Supplier"
    # providerResponsible: "XWiki"
    # upstreamRegistry: "https://git.xwikisas.com:5050"
    # upstreamRepository: "xwikisas/swp/xwiki"
-    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)-?\d?-postgres.+$'
+    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)-?[0-9A-Z]*-postgres.+$'
-    # upstreamMirrorStartFrom: ["17", "4", "4"]
+    # upstreamMirrorStartFrom: ["17", "4", "7"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/xwiki/images-mirror/xwiki"
-    tag: "17.4.4-1-postgres-jetty-alpine@sha256:2da4c175a418b1b8a09e8b25006bfc6f6f22fd449bc2e77dac31c0b56c444b94"
+    tag: "17.4.7-postgres-jetty-alpine@sha256:d534ace977a3a988e83945c73f15d4fd5c082d7b9b5b8ae1134569be5e023c96"
 ...
--- a/helmfile/environments/default/persistence.yaml.gotmpl
+++ b/helmfile/environments/default/persistence.yaml.gotmpl
@@ -16,6 +16,8 @@ persistence:
      size: "1Gi"
      storageClassName: ~
    dovecot:
      # openDesk CE: Mail storage
      # openDesk EE (with Dovecot Pro): Storage for metacache
      size: "1Gi"
      storageClassName: ~
    mariadb:
@@ -34,6 +36,7 @@ persistence:
      size: "1Gi"
      storageClassName: ~
    nubusProvisioningNats:
      # For production and load test environments "10Gi" is recommended.
      size: "1Gi"
      storageClassName: ~
    # This option was introduced with openDesk 1.6. For now we want to use the Helm charts default empty string
--- a/helmfile/environments/default/secrets.yaml.gotmpl
+++ b/helmfile/environments/default/secrets.yaml.gotmpl
@@ -32,6 +32,7 @@ secrets:
      dovecot: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "nubus" "ldapsearch_dovecot" | sha1sum | quote }}
      element: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "nubus" "ldapsearch_element" | sha1sum | quote }}
      ox: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "nubus" "ldapsearch_ox" | sha1sum | quote }}
      postfix: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "nubus" "ldapsearch_postfix" | sha1sum | quote }}
      openproject: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "nubus" "ldapsearch_openproject" | sha1sum | quote }}
      xwiki: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "nubus" "ldapsearch_xwiki" | sha1sum | quote }}
    systemAccounts:
@@ -122,6 +123,7 @@ secrets:
    password: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "redis" "password" | sha1sum | quote }}
  dovecot:
    doveadm: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "dovecot" "doveadm" | sha1sum | quote }}
    sharedMailboxesMasterPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "dovecot" "sharedMailboxesMasterPassword" | sha1sum | quote }}
  xwiki:
    superadminpassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "xwiki" "superadminpassword" | sha1sum | quote }}
  intercom:
--- a/helmfile/environments/default/smtp.yaml.gotmpl
+++ b/helmfile/environments/default/smtp.yaml.gotmpl
@@ -20,4 +20,15 @@ smtp:
        key: ""
    selector: "rsa"
    useED25519: false
  security:
    # Postfix defaults
    # Ref.: https://www.postfix.org/postconf.5.html#smtpd_sasl_security_options
    smtpdSASLSecurityOptions:
      - "noanonymous"
    # Postfix defaults
    # Ref.: https://www.postfix.org/postconf.5.html#smtp_sasl_security_options
    smtpSASLSecurityOptions:
      - "noanonymous"
      - "noplaintext"
 ...
--- a/helmfile/environments/default/technical.yaml.gotmpl
+++ b/helmfile/environments/default/technical.yaml.gotmpl
@@ -2,10 +2,39 @@
 # SPDX-License-Identifier: Apache-2.0
 ---
 technical:
  # Collabora related technical settings
  collabora:
    # Defines the value for the start parameter `-o:num_prespawn_children`
    numPrespawnChildren: 4
  # Dovecot EE related settings
  dovecot:
    objectStorage:
      # Size of objectstore fs cache
      fsCacheSize: "2G"
      # Size of fts cache
      ftsCacheSize: "2G"
      # Wether fs and fts cache should reside in RAM (tmpfs) or not
      # If this value is true, the cache sizes of the fs cache + fts cache
      # must be considered additionally to Dovecot's memory footprint.
      cacheTmpfs: false
  # Nubus related settings
  nubus:
    # Nubus provisioning framework that is being used to actively provision data internally within
    # Nubus e.g. for the portal or self service as well as externally, e.g. to OX App Suite.
    provisioning:
      # NATS including NATS JetStream is the queueing used by Nubus' provisioning.
      # Ref.: https://nats.io/about/
      nats:
        # The NATS Box is a container for debugging NATS messages using a CLI tool.
        # Ref.: https://github.com/nats-io/nats-box
        natsBox:
          # Enable the NATS Box container for the deployment. Will also be enabled in case of
          # `.Values.debug.enabled: true`
          enabled: false
  # Groupware related technical settings
  oxAppSuite:
    provisioning:
--- a/helmfile/environments/default/theme.yaml.gotmpl
+++ b/helmfile/environments/default/theme.yaml.gotmpl
@@ -44,7 +44,7 @@ theme:
    logoHeaderInvertedSvgB64: {{ readFile "./../../files/theme/logoHeaderInverted.svg" | b64enc | quote }}
    chat:
-      faviconIco: {{ readFile "./../../files/theme/chat/favicon.ico" | b64enc | quote }}
+      faviconPng: {{ readFile "./../../files/theme/chat/favicon.png" | b64enc | quote }}
    files:
      faviconIco: {{ readFile "./../../files/theme/files/favicon.ico" | b64enc | quote }}
--- a/publiccode.yml
+++ b/publiccode.yml
@@ -22,8 +22,8 @@ name: "openDesk"
 platforms:
  - "web"
 developmentStatus: "stable"
-softwareVersion: "1.8.0"
+softwareVersion: "1.10.0"
-releaseDate: "2025-09-25"
+releaseDate: "2025-11-24"
 softwareType: "standalone/web"
 url: "https://gitlab.opencode.de/bmi/opendesk/"
 logo: ".opencode/openDesk-logo-rgb-color.svg"
Author	SHA1	Message	Date
Norbert Tretkowski	e720ef1bdb	feat(intercom): Update from v2.19.5 to v2.22.0	2025-12-05 19:25:00 +01:00
Daniel Gerber	8867d1b204	docs(getting-started.md): AAAA record on base domain is optional	2025-12-03 15:44:05 +00:00
Lilly Sell	cca755d4af	docs(monitoring.md): Correct references and wordings in monitoring documentation	2025-12-03 15:56:36 +01:00
Thorsten Roßner	2423ac2de6	ci(import-default-accounts): Up to 5 retries with pause on failing account import	2025-12-03 08:36:44 +01:00
Thorsten Roßner	09a233511e	docs(CHANGELOG.md): Fix wrong version number for OpenProject fix commit	2025-12-03 07:41:40 +01:00
Thorsten Roßner	7d101b18d7	docs(migrations.md): Update 1.10.0 info on Collabora Controller lease	2025-12-03 07:41:40 +01:00
Thorsten Roßner	10f1ced37d	docs(requirements.md): Helm <v4 not supported	2025-12-03 07:41:40 +01:00
Thorsten Roßner	2ddbd91f3d	feat(helmfile): [#205 , #227 ] Allow separate annotations for external Dovecot, Postfix and Jitsi JVB service; review `migrations.md` for required upgrade steps	2025-11-27 08:17:46 +01:00
Thorsten Roßner	54277dabae	chore(release): 1.10.0 [skip ci] # [1.10.0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.9.0...v1.10.0) (2025-11-24) ### Bug Fixes * collabora: Update Controller to 1.1.6 incl. Helm chart update to 1.1.10 ([`d25c95f`](`d25c95f06b`)) * collabora: Update from 25.04.5 to 25.04.6 ([`8de0f5d`](`8de0f5de72`)) * external-services: Create `nubus_authsession` database ([`ec72602`](`ec72602cdd`)) * helmfile: Enable verification for XWiki Helm chart ([`5104793`](`51047936de`)) * helmfile: Streamline annotations ([`7aa717c`](`7aa717c050`)) * nubus: Remove legacy `UMC` Keycloak client that was used for SAML connection with the Nubus portal ([`152221f`](`152221fa79`)) * open-xchange: Only enable `smtpSASLAuthEnable` when `relayHost` is set ([`70bbbf3`](`70bbbf311f`)) * open-xchange: Optimize Dovecot Pro full-text search caches; review `migrations.md` for required upgrade steps ([`f3f707c`](`f3f707c9ee`)) * open-xchange: Template SASL security options ([`684c6d4`](`684c6d4f29`)) * open-xchange: Update Dovecot configuration based on supplier's best practise review ([`850761e`](`850761e047`)) * opendesk-static-files: [[#260](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/issues/260)] Fix doublette creation of configmap `data` keys when the same file is referenced multiple times for a component ([`b5a76be`](`b5a76bea57`)) * openproject: Update from 16.1.0 to 16.1.1 ([`62fae99`](`62fae9976a`)) * xwiki: Update XWiki from 17.4.4 to 17.4.7 ([`02a3b77`](`02a3b77114`)) ### Features * jitsi: Update from 2.0.10431 to 2.0.10590 ([`f5aad1f`](`f5aad1fa47`)) * nubus: Update from v1.14.0 to v1.15.2 ([`12379d6`](`12379d67e0`)) * open-xchange: Support for LDAP group based mailing lists ([`cc94f0c`](`cc94f0c66d`)) * openproject: Update OpenProject from 16.5.1 to 16.6.0 ([`19438c0`](`19438c0281`))	2025-11-24 15:32:49 +00:00
Thorsten Roßner	b32cb70678	chore(publiccode.yml): Update for v1.10.0	2025-11-24 16:16:57 +01:00
Thorsten Roßner	b7b9968245	chore(helmfile): Set JVB replica to `1` again	2025-11-24 11:03:30 +01:00
Thorsten Roßner	b830edf8da	chore(helmfile): Remove doublette spaces in templating expression	2025-11-24 10:54:36 +01:00
emrah	f5aad1fa47	feat(jitsi): Update from 2.0.10431 to 2.0.10590	2025-11-21 13:36:44 +00:00
Thorsten Roßner	f2fe6f3026	docs(migrations.md): Streamlining content	2025-11-21 14:16:32 +01:00
Thorsten Roßner	1857dd961e	docs(persistance.yaml.gotmpl): Streamline comment for `dovecot` PVC usage	2025-11-21 14:16:32 +01:00
Thorsten Roßner	0ab9979693	docs(gettings-started.md): Update section "Access deployment"	2025-11-21 14:16:32 +01:00
Thorsten Roßner	e0a6850a2d	docs(global.yaml.gotmpl): Fix misleading comment for `additionalMailDomains`	2025-11-21 14:16:32 +01:00
Thorsten Roßner	7032205acf	docs(security.md): Update non-verifiable charts table	2025-11-21 14:16:32 +01:00
Thorsten Roßner	51047936de	fix(helmfile): Enable verification for XWiki Helm chart	2025-11-21 14:16:32 +01:00
Thorsten Roßner	a83ecd5c01	docs(gitops.md): [#206 ] Add warning about secrets in pre-rendered yaml files	2025-11-21 14:16:31 +01:00
Thorsten Roßner	080073119b	docs(README-EE.md): Add link to COOL Controller release notes	2025-11-21 14:16:31 +01:00
Thorsten Roßner	ec72602cdd	fix(external-services): Create `nubus_authsession` database	2025-11-21 14:16:31 +01:00
Thorsten Roßner	9387168e89	docs(data-storage.md): Streamline with current application state	2025-11-21 14:16:31 +01:00
Thorsten Roßner	b5a76bea57	fix(opendesk-static-files): [#260 ] Fix doublette creation of configmap `data` keys when the same file is referenced multiple times for a component	2025-11-21 14:16:31 +01:00
Thorsten Roßner	bdcfb977e0	docs(migrations.md): Add v1.10.0 section to overview table	2025-11-21 14:16:28 +01:00
Thorsten Roßner	cb367775a6	docs(gettings-started.md): [#184 ] Add a comment about the maximum length of the openDesk domain	2025-11-21 14:14:02 +01:00
Philip Gaber	e37361790b	docs(migrations.md): Update for Postfix SASL security options in v1.9.0 and new Postfix secret	2025-11-21 06:46:31 +00:00
Thorsten Roßner	70bbbf311f	fix(open-xchange): Only enable `smtpSASLAuthEnable` when `relayHost` is set	2025-11-21 06:46:31 +00:00
Thomas Kaltenbrunner	cc94f0c66d	feat(open-xchange): Support for LDAP group based mailing lists	2025-11-21 06:46:31 +00:00
Philip Gaber	684c6d4f29	fix(open-xchange): Template SASL security options	2025-11-21 06:46:31 +00:00
renovate	62fae9976a	fix(openproject): Update from 16.1.0 to 16.1.1	2025-11-20 08:02:29 +01:00
Thorsten Roßner	7b592a24b0	docs(migrations.md): Fix section sequence and some text streamlining	2025-11-19 17:22:51 +01:00
Thomas Kaltenbrunner	f3f707c9ee	fix(open-xchange): Optimize Dovecot Pro full-text search caches; review `migrations.md` for required upgrade steps	2025-11-19 17:20:20 +01:00
Thomas Kaltenbrunner	850761e047	fix(open-xchange): Update Dovecot configuration based on supplier's best practise review	2025-11-19 17:20:02 +01:00
Norbert Tretkowski	12379d67e0	feat(nubus): Update from v1.14.0 to v1.15.2	2025-11-19 16:05:03 +01:00
Thorsten Roßner	d25c95f06b	fix(collabora): Update Controller to 1.1.6 incl. Helm chart update to 1.1.10	2025-11-17 11:51:11 +01:00
Thorsten Roßner	8de0f5de72	fix(collabora): Update from 25.04.5 to 25.04.6	2025-11-17 06:27:21 +00:00
Thorsten Roßner	152221fa79	fix(nubus): Remove legacy `UMC` Keycloak client that was used for SAML connection with the Nubus portal	2025-11-14 07:51:31 +00:00
Sven-Erik Schmidt	7aa717c050	fix(helmfile): Streamline annotations	2025-11-12 11:28:49 +01:00
Oliver Günther	19438c0281	feat(openproject): Update OpenProject from 16.5.1 to 16.6.0	2025-11-11 10:53:50 +00:00
Clément Aubin	02a3b77114	fix(xwiki): Update XWiki from 17.4.4 to 17.4.7	2025-11-10 15:46:13 +00:00
Thorsten Roßner	4655942762	chore(release): 1.9.0 [skip ci] # [1.9.0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.8.0...v1.9.0) (2025-11-07) ### Bug Fixes * collabora: Update from 25.04.4.3.1 to 25.04.5.3.1 ([`e0128e6`](`e0128e6ccf`)) * element: Increase message and media rate limits ([`13968a8`](`13968a8133`)) * element: Update favicon to use PNG version ([`f8104f6`](`f8104f6358`)) * element: Update Synapse from v1.137.0 to v1.141.0; fixes https://github.com/element-hq/synapse/security/advisories/GHSA-fh66-fcv5-jjfr which applies to all openDesk deployments using Element/Matrix with federation enabled ([`02d3021`](`02d3021c4b`)) * element: Update widgets primary color theme settings ([`94394a1`](`94394a1e3e`)) * gitlab: Add issue templates ([`26da7e3`](`26da7e3667`)) * helmfile: Support setting the `defaultLanguage` - relevant for OX App Suite and XWiki - in `functional.yaml.gotmpl` ([`24065db`](`24065dbc70`)) * helmfile: Use passwords defined in `database.yaml.gotmpl` for Cassandra when available ([`0268219`](`026821996a`)) * notes: Fix python path for self signed certs ([`c4279d1`](`c4279d11bb`)) * notes: Fix repeated redirects on expired session; Remove fetching of external assets ([`c1012f4`](`c1012f4e65`)) * open-xchange: Don't enable sasl auth when no relay host is set ([`ff3b221`](`ff3b221870`)) * open-xchange: Enable and configure defaults for ContactCollector, remove legacy config artifacts ([`465f60d`](`465f60d4a2`)) * open-xchange: Use masterpassword for mailfilter in migration Pods; use PLAIN instead of OAuth for SASL ([`484dfaf`](`484dfafe64`)) * ox-connector: Use FQDN for internal service URLs ([`8593d5f`](`8593d5f2bd`)) ### Features * helmfile: Add toggle for external mail client onboarding and allow non-default FQDNs for IMAP and SMTP endpoints ([`25a97ab`](`25a97abba6`)) * open-xchange: Enable XRechnung in Viewer ([`08e6ec5`](`08e6ec59d2`)) * openproject: Update from 16.4.1 to 16.5.1 ([`74cf2ee`](`74cf2ee0d8`))	2025-11-07 09:08:52 +00:00
Thorsten Roßner	f8104f6358	fix(element): Update favicon to use PNG version	2025-11-07 05:58:42 +00:00
Thorsten Roßner	02d3021c4b	fix(element): Update Synapse from v1.137.0 to v1.141.0; fixes https://github.com/element-hq/synapse/security/advisories/GHSA-fh66-fcv5-jjfr which applies to all openDesk deployments using Element/Matrix with federation enabled	2025-11-07 05:58:42 +00:00
Thorsten Roßner	d2dc8c40b9	chore(publiccode.yml): Update for 1.9.0	2025-11-06 15:49:03 +01:00
Philip Gaber	47a1ed75e8	docs(migration.md): Further enhance version table and explanations	2025-11-06 15:41:29 +01:00
Philip Gaber	47e13e4ff9	docs(misc): Change to stylized note/warning/important banners	2025-11-06 14:02:34 +01:00
Philip Gaber	b2f1d609cb	docs(migration.md): Enhance version semantics, corrections, enhance version table	2025-11-06 13:35:13 +01:00
ulferts	74cf2ee0d8	feat(openproject): Update from 16.4.1 to 16.5.1	2025-11-04 15:12:27 +00:00
Thorsten Roßner	25a97abba6	feat(helmfile): Add toggle for external mail client onboarding and allow non-default FQDNs for IMAP and SMTP endpoints	2025-11-04 09:00:34 +01:00
Thorsten Roßner	465f60d4a2	fix(open-xchange): Enable and configure defaults for ContactCollector, remove legacy config artifacts	2025-11-03 14:58:17 +01:00
Viktor Pracht	08e6ec59d2	feat(open-xchange): Enable XRechnung in Viewer	2025-11-03 14:58:11 +01:00
Thorsten Roßner	c115a83924	docs(data-storage.md): Set `ox-connector-appcenter-ox-connector-0` PVC as optional instead of mandatory for backup	2025-11-03 10:24:49 +00:00
Thorsten Roßner	026821996a	fix(helmfile): Use passwords defined in `database.yaml.gotmpl` for Cassandra when available	2025-11-03 10:24:49 +00:00
Thorsten Roßner	24065dbc70	fix(helmfile): Support setting the `defaultLanguage` - relevant for OX App Suite and XWiki - in `functional.yaml.gotmpl`	2025-11-03 10:24:49 +00:00
Thorsten Roßner	8151896b55	docs(architecture.md): Fix footnote	2025-11-03 10:24:49 +00:00
Thorsten Roßner	0f10d363bf	ci(user-importer): Update image to 3.4.1	2025-11-03 10:24:49 +00:00
Milton Moura (Nordeck)	94394a1e3e	fix(element): Update widgets primary color theme settings Signed-off-by: Milton Moura (Nordeck) <milton.moura@nordeck.net>	2025-10-31 12:34:09 +01:00
Milton Moura	13968a8133	fix(element): Increase message and media rate limits	2025-10-27 15:01:04 +01:00
Viktor Pracht	484dfafe64	fix(open-xchange): Use masterpassword for mailfilter in migration Pods; use PLAIN instead of OAuth for SASL	2025-10-27 15:00:21 +01:00
rweber	c1012f4e65	fix(notes): Fix repeated redirects on expired session; Remove fetching of external assets	2025-10-16 09:33:13 +00:00