feat(helmfile): Add external secrets template support for OpenProject bootstrap

Signed-off-by: Axel Lender <lender@b1-systems.de>

.gitlab-ci.yml

@@ -80,15 +80,6 @@ variables:
     options:
       - "yes"
       - "no"
-  FLUSH_EXTERNAL_SERVICES_TYPE:
-    description: >
-      Select the type of external services (e.g. "RUN", or "STACKIT"), as they require different
-      cleanup strategies. Requires `FLUSH_EXTERNAL_SERVICES_BEFORE=yes` and `ENV_STOP_BEFORE=yes`.
-    value: "CHANGE ME"
-    options:
-      - "RUN"
-      - "STACKIT"
-      - "CHANGE ME"
   DEBUG_ENABLED:
     description: >
       Allows to set `debug.enabled` to true for a deployment, needs to be supported by stage specific
@@ -281,77 +272,53 @@ db-cleanup:
       when: "on_success"
   script:
     # yamllint disable-line rule:line-length rule:quoted-strings
-    - |
-      echo "Checking FLUSH_EXTERNAL_SERVICES_TYPE value..."
-      case "$FLUSH_EXTERNAL_SERVICES_TYPE" in
-        "RUN")
-          echo " ... running flush procedure for RUN cluster."
-          ;;
-        "STACKIT")
-          echo " ... running flush procedure for STACKIT provider."
-          ;;
-        *)
-          echo "ERROR: FLUSH_EXTERNAL_SERVICES_TYPE is not set to valid value."
-          echo "       Expected 'RUN' or 'STACKIT', got ${FLUSH_EXTERNAL_SERVICES_TYPE}."
-          exit 1
-          ;;
-      esac
-    # First: Gather all files that contain the "database:" keyword in the default environment
-    - |
-      export FILES="$(grep -r 'databases:' "${CI_PROJECT_DIR}/helmfile/environments/default" |
-                      awk -F ':' '{print $1}')"
-    # Second: Gather all files that contain the "database:" keyword in the dev environment
-    # where the adjustments from opendesk-env are placed
-    - |
-      export FILES="${FILES} $(grep -r 'databases:' "${CI_PROJECT_DIR}/helmfile/environments/dev" |
-                               awk -F ':' '{print $1}')"
-    - "echo \"${FILES[@]}\""
+    - export FILES=(${CI_PROJECT_DIR}/helmfile/environments/default/database.yaml.gotmpl ${CI_PROJECT_DIR}/helmfile/environments/dev/write-over-values-for-environment.yaml.gotmpl)
     # Cleanup MariaDB
-    - "export MARIADB_HOST=\"\""
-    - "export MARIADB_PORT=\"\""
-    - "export MARIADB_USERNAME=\"\""
-    - "export MARIADB_PASSWORD=\"\""
-    - "export ENV_DATABASE=\"oxAppSuite\""
-
-    # Parse cluster values
     - |
-      for FILE in ${FILES[@]}; do
-        if [ -f "${FILE}" ]; then
-          if [[ $(tail -n +1 "${FILE}" | grep -v '{{' | yq '.databases.[env(ENV_DATABASE)]') != "null" ]]; then
-            MARIADB_DATABASE=$(tail -n +1 $FILE | grep -v '{{' | yq '.databases.[env(ENV_DATABASE)].name')
-            MARIADB_USERNAME=$(tail -n +1 $FILE | grep -v '{{' | yq '.databases.[env(ENV_DATABASE)].username')
-            MARIADB_PASSWORD=$(tail -n +1 $FILE | grep -v '{{' | yq '.databases.[env(ENV_DATABASE)].password')
-            MARIADB_HOST=$(tail -n +1 $FILE | grep -v '{{' | yq '.databases.[env(ENV_DATABASE)].host')
-            MARIADB_PORT=$(tail -n +1 $FILE | grep -v '{{' | yq '.databases.[env(ENV_DATABASE)].port')
+      export DATABASES="oxAppSuite"
+      export MARIADB_HOST=""
+      export MARIADB_PORT=""
+      export MARIADB_USERNAME=""
+      export MARIADB_PASSWORD=""
+
+      for DATABASE in $DATABASES; do
+        export ENV_DATABASE=${DATABASE}
+
+        # Parse cluster values
+        for FILE in ${FILES[@]}; do
+          if [ -f ${FILE} ]; then
+            if [[ $(tail -n +5 $FILE | yq '.databases.[env(ENV_DATABASE)]') != "null" ]]; then
+              MARIADB_DATABASE=$(tail -n +5 $FILE | yq '.databases.[env(ENV_DATABASE)].name')
+              MARIADB_USERNAME=$(tail -n +5 $FILE | yq '.databases.[env(ENV_DATABASE)].username')
+              MARIADB_PASSWORD=$(tail -n +5 $FILE | yq '.databases.[env(ENV_DATABASE)].password')
+              MARIADB_HOST=$(tail -n +5 $FILE | yq '.databases.[env(ENV_DATABASE)].host')
+              MARIADB_PORT=$(tail -n +5 $FILE | yq '.databases.[env(ENV_DATABASE)].port')
+            fi;
           fi;
+        done;
+
+        CONNECTION="--host=${MARIADB_HOST} \
+                    --port=${MARIADB_PORT} \
+                    --user=${MARIADB_USERNAME} \
+                    --password=${MARIADB_PASSWORD} \
+                    --skip-ssl"
+
+        echo "[mysql] [${ENV_DATABASE}] DROP ${MARIADB_DATABASE} on ${MARIADB_HOST}"
+        mariadb ${CONNECTION} -e "DROP DATABASE IF EXISTS ${MARIADB_DATABASE};"
+
+        if [ "${ENV_DATABASE}" = "oxAppSuite" ]; then
+          echo "[mysql] [${ENV_DATABASE}] DROP oxguard on ${MARIADB_HOST}"
+          mariadb ${CONNECTION} -e "DROP DATABASE IF EXISTS oxguard;"
+          echo "[mysql] [${ENV_DATABASE}] DROP oxguard_1 on ${MARIADB_HOST}"
+          mariadb ${CONNECTION} -e "DROP DATABASE IF EXISTS oxguard_1;"
+          echo "[mysql] [${ENV_DATABASE}] DROP PRIMARYDB_9 on ${MARIADB_HOST}"
+          mariadb ${CONNECTION} -e "DROP DATABASE IF EXISTS PRIMARYDB_9;"
+        else
+          mariadb ${CONNECTION} -e "CREATE DATABASE ${MARIADB_DATABASE};"
+          mariadb ${CONNECTION} -e "GRANT ALL PRIVILEGES ON ${MARIADB_DATABASE}.* TO ${MARIADB_USERNAME}@\"%\";"
+          mariadb ${CONNECTION} -e "FLUSH PRIVILEGES;"
         fi;
       done;
-
-    - |
-      export CONNECTION=(
-        "--host=${MARIADB_HOST}"
-        "--port=${MARIADB_PORT}"
-        "--user=${MARIADB_USERNAME}"
-        "--password=${MARIADB_PASSWORD}"
-        "--skip-ssl"
-      )
-
-    - "echo \"[mysql] [${ENV_DATABASE}] DROP ${MARIADB_DATABASE} on ${MARIADB_HOST}\""
-    - "mariadb ${CONNECTION[@]} -e \"DROP DATABASE IF EXISTS ${MARIADB_DATABASE};\""
-
-    - |
-      if [ "${ENV_DATABASE}" = "oxAppSuite" ]; then
-        echo "[mysql] [${ENV_DATABASE}] DROP oxguard on ${MARIADB_HOST}"
-        mariadb ${CONNECTION[@]} -e "DROP DATABASE IF EXISTS oxguard;"
-        echo "[mysql] [${ENV_DATABASE}] DROP oxguard_1 on ${MARIADB_HOST}"
-        mariadb ${CONNECTION[@]} -e "DROP DATABASE IF EXISTS oxguard_1;"
-        echo "[mysql] [${ENV_DATABASE}] DROP PRIMARYDB_9 on ${MARIADB_HOST}"
-        mariadb ${CONNECTION[@]} -e "DROP DATABASE IF EXISTS PRIMARYDB_9;"
-      else
-        mariadb ${CONNECTION[@]} -e "CREATE DATABASE ${MARIADB_DATABASE};"
-        mariadb ${CONNECTION[@]} -e "GRANT ALL PRIVILEGES ON ${MARIADB_DATABASE}.* TO ${MARIADB_USERNAME}@\"%\";"
-        mariadb ${CONNECTION[@]} -e "FLUSH PRIVILEGES;"
-      fi;
     # Cleanup PostgreSQL
     - |
       export DATABASES="keycloak keycloakExtension nextcloud notes openproject synapse umsGuardianManagementApi \
@@ -369,42 +336,30 @@ db-cleanup:
         # Parse cluster values
         for FILE in ${FILES[@]}; do
           if [ -f $FILE ]; then
-            if [[ $(tail -n +1 $FILE | grep -v '{{' | yq '.databases.[env(ENV_DATABASE)]') != "null" ]]; then
-              POSTGRES_DATABASE=$(tail -n +1 $FILE | grep -v '{{' | yq '.databases.[env(ENV_DATABASE)].name')
-              PGUSER=$(tail -n +1 $FILE | grep -v '{{' | yq '.databases.[env(ENV_DATABASE)].username')
-              PGPASSWORD=$(tail -n +1 $FILE | grep -v '{{' | yq '.databases.[env(ENV_DATABASE)].password')
-              PGHOST=$(tail -n +1 $FILE | grep -v '{{' | yq '.databases.[env(ENV_DATABASE)].host')
-              PGPORT=$(tail -n +1 $FILE | grep -v '{{' | yq '.databases.[env(ENV_DATABASE)].port')
-              PGPARAMS=$(tail -n +1 $FILE | grep -v '{{' | yq '.databases.[env(ENV_DATABASE)].parameters')
+            if [[ $(tail -n +5 $FILE | yq '.databases.[env(ENV_DATABASE)]') != "null" ]]; then
+              POSTGRES_DATABASE=$(tail -n +5 $FILE | yq '.databases.[env(ENV_DATABASE)].name')
+              PGUSER=$(tail -n +5 $FILE | yq '.databases.[env(ENV_DATABASE)].username')
+              PGPASSWORD=$(tail -n +5 $FILE | yq '.databases.[env(ENV_DATABASE)].password')
+              PGHOST=$(tail -n +5 $FILE | yq '.databases.[env(ENV_DATABASE)].host')
+              PGPORT=$(tail -n +5 $FILE | yq '.databases.[env(ENV_DATABASE)].port')
+              PGPARAMS=$(tail -n +5 $FILE | yq '.databases.[env(ENV_DATABASE)].parameters')
             fi;
           fi;
         done;
 
-
-        case "$FLUSH_EXTERNAL_SERVICES_TYPE" in
-          "STACKIT")
-            # In case of STACKIT resources the db content should just be dropped
-            echo "[psql] [${ENV_DATABASE}] DROP OWNED BY ${PGUSER} in ${POSTGRES_DATABASE} on ${PGHOST}"
-            PGDATABASE=${POSTGRES_DATABASE} # env var PGDATABASE is interpreted by psql
-            psql -c "DROP OWNED BY ${PGUSER};" || true;
-            ;;
-          "RUN")
-            # Usually, e.g. in "RUN" cluster, databases can simply be dropped and recreated
-            echo "[psql] [${ENV_DATABASE}] DROP ${POSTGRES_DATABASE} on ${PGHOST}"
-            psql -c "DROP DATABASE ${POSTGRES_DATABASE}" || true;
-            if [ "${PGPARAMS}" = "null" ]; then
-              psql -c "CREATE DATABASE \"${POSTGRES_DATABASE}\";"
-            else
-              psql -c "CREATE DATABASE \"${POSTGRES_DATABASE}\" ${PGPARAMS};"
-            fi;
-            psql -c "ALTER DATABASE \"${POSTGRES_DATABASE}\" OWNER TO \"${PGUSER}\"";
-            psql -c "GRANT ALL PRIVILEGES ON DATABASE \"${POSTGRES_DATABASE}\" TO \"${PGUSER}\"";
-            ;;
-        esac
+        echo "[psql] [${ENV_DATABASE}] DROP ${POSTGRES_DATABASE} on ${PGHOST}"
+        psql -c "DROP DATABASE ${POSTGRES_DATABASE}" || true;
+        if [ "${PGPARAMS}" = "null" ]; then
+        psql -c "CREATE DATABASE \"${POSTGRES_DATABASE}\";"
+        else
+        psql -c "CREATE DATABASE \"${POSTGRES_DATABASE}\" ${PGPARAMS};"
+        fi;
+        psql -c "ALTER DATABASE \"${POSTGRES_DATABASE}\" OWNER TO \"${PGUSER}\"";
+        psql -c "GRANT ALL PRIVILEGES ON DATABASE \"${POSTGRES_DATABASE}\" TO \"${PGUSER}\"";
       done;
     # Cleanup Objectstore
     - |
-      export BUCKETS="migrations nextcloud openproject nubus notes openxchange dovecot"
+      export BUCKETS="migrations nextcloud openproject nubus notes"
       export AWS_DEFAULT_REGION=""
       export AWS_ENDPOINT=""
       export AWS_ACCESS_KEY_ID=""
@@ -416,12 +371,12 @@ db-cleanup:
         # Parse cluster values
         for FILE in ${FILES[@]}; do
           if [ -f $FILE ]; then
-            if [[ $(tail -n +1 $FILE | grep -v '{{' | yq '.objectstores.[env(ENV_BUCKET)]') != "null" ]]; then
-              AWS_BUCKET=$(tail -n +1 $FILE | grep -v '{{' | yq '.objectstores.[env(ENV_BUCKET)].bucket')
-              AWS_ENDPOINT=$(tail -n +1 $FILE | grep -v '{{' | yq '.objectstores.[env(ENV_BUCKET)].endpoint')
-              AWS_ACCESS_KEY_ID=$(tail -n +1 $FILE | grep -v '{{' | yq '.objectstores.[env(ENV_BUCKET)].username')
-              AWS_SECRET_ACCESS_KEY=$(tail -n +1 $FILE | grep -v '{{' | yq '.objectstores.[env(ENV_BUCKET)].secretKey')
-              AWS_DEFAULT_REGION=$(tail -n +1 $FILE | grep -v '{{' | yq '.objectstores.[env(ENV_BUCKET)].region')
+            if [[ $(tail -n +5 $FILE | yq '.objectstores.[env(ENV_BUCKET)]') != "null" ]]; then
+              AWS_BUCKET=$(tail -n +5 $FILE | yq '.objectstores.[env(ENV_BUCKET)].bucket')
+              AWS_ENDPOINT=$(tail -n +5 $FILE | yq '.objectstores.[env(ENV_BUCKET)].endpoint')
+              AWS_ACCESS_KEY_ID=$(tail -n +5 $FILE | yq '.objectstores.[env(ENV_BUCKET)].username')
+              AWS_SECRET_ACCESS_KEY=$(tail -n +5 $FILE | yq '.objectstores.[env(ENV_BUCKET)].secretKey')
+              AWS_DEFAULT_REGION=$(tail -n +5 $FILE | yq '.objectstores.[env(ENV_BUCKET)].region')
             fi;
           fi;
         done;
@@ -739,8 +694,7 @@ diff-on-branch:
       BASE_URL="https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/archive"
       FILE_NAME="opendesk-${SAFE_BRANCH_NAME}.tar.gz"
       curl -L "${BASE_URL}/${DIFF_ON_BRANCH}/${FILE_NAME}" -o branch.tar.gz
-      mkdir ${DIFF_ON_BRANCH_SUBDIRECTORY} &&
-        tar -xzf branch.tar.gz -C ${DIFF_ON_BRANCH_SUBDIRECTORY} --strip-components=1
+      mkdir ${DIFF_ON_BRANCH_SUBDIRECTORY} && tar -xzf branch.tar.gz -C ${DIFF_ON_BRANCH_SUBDIRECTORY} --strip-components=1
       cd ${DIFF_ON_BRANCH_SUBDIRECTORY}
       helmfile --namespace ${NAMESPACE} diff | grep -v '^ ' || true
   tags:
@@ -776,7 +730,6 @@ import-default-accounts:
         --admin_enable_knowledgemanagement True \
         --admin_enable_projectmanagement True \
         --create_admin_accounts True \
-        --create_maildomains True \
         --verify_certificate False
 
 run-tests:

.gitlab/merge_request_templates/Bugfix.md

@@ -1,57 +1,81 @@
-# 🪲 Bugfix
+## 📌 Summary
 
-*Expected MR Title and git commit message*
-*`fix(<app-name>): <Short description of what has been fixed>`*
+Brief description of the issue and what this MR resolves.
 
+> Example:
+> Fixes a bug where users were unable to save their profile due to a missing field validation.
+
+---
 
 ## ✅ Changes
 
-Explain for the reviewer how the change addresses the issue, providing some insights on the underlaying cause of the bug.
+Explain for the reviewer how the change addresses the issue:
 
-- ...
+- Fixed null check on user input
+- Added unit test for edge case
+- Updated error handling in the `ProfileService`
 
-## 🧪 How to reproduce & test
+---
 
-Provida a link to the issue or document the required details below.
-In case it is a GitLab issue, reference it at the end of the commit message in square brackets, like `[#123]`
+## 🧪 Analysis
 
-### Before the Fix
+Explain the **underlying cause** of the bug:
 
-1. ...
+- What was the unexpected behavior?
+- Why did it happen?
+- Where in the code or logic did it occur?
 
-### After the Fix
+---
 
-Provide steps for QA or reviewers to test the fix and mention anything reviewers should be aware of:
+## 📚 Related Issue(s)
 
-1. ...
+- Should be listed as part of the commit message.
+- Fixes #[issue-number]
+- Related to #[optional additional issues]
 
-## 🔄 Requirements for migrations
+## 🧪 How to Reproduce & Test
 
-- [ ] Describe manual steps required to update existing deployments. This especially applies if this MR introduces breaking changes:
-- [ ] Any other considerations in context of the update:
+Link to issue or document the required details below.
 
-# Checklist / Sign-offs
+### Before the Fix:
 
-## 🏷️ Labels
+1. Go to `/profile/edit`
+2. Leave the "email" field empty
+3. Click "Save"
+4. Observe 500 server error
 
-Set labels:
+### After the Fix:
 
-```
-/label ~"MR-Type::Bugfix"
-/label ~"PO::👀"
-/label ~"Tech Lead::👀"
-/label ~"QA::👀"
-/label ~"Testautomation::👀"
-```
+1. Same steps as above
+2. Now see appropriate validation message
+3. No server error occurs
 
-# 👷 Developer Checklist
+---
 
-- Does the MR include new bits and pieces (e.g. new secrets) that require documentation?
-  - [ ] No.
-  - [ ] Yes, and the documentation was updated accordingly.
+## Checklist / Sign-offs
 
-Document in an extra comment and link to that comment:
-- [ ] How you verified the fix is working as expected, also in upgrade scenarios.
-- [ ] Any regression testing done.
+### 💿 CI/CD
+
+- [ ] CI pipeline passes for all jobs
+- [ ] Linting and formatting checks pass
+- [ ] Review app (if used) reflects fix correctly
+
+### 🖥 QA & Product
+
+Set related labels on the MR for
+
+- [ ] `PO::👀`
+- [ ] `Tech Lead::👀`
+- [ ] `Testautomation::👀`
+- [ ] `QA::👀`
+
+---
+
+## 👷 Developer Checklist
+
+- [ ] Code builds and passes linting
+- [ ] Tests added or updated
+- [ ] Verified fix locally
+- [ ] Regression testing done for related functionality
+- [ ] No new warnings or errors in logs
 
---> Link to comment:

.gitlab/merge_request_templates/Default.md

@@ -1,8 +1 @@
-Thank you for your contribution!
-
-Please follow these simple guidelines to continue:
-
-- Create MRs early and use the "draft" state to show that this MR isn't ready for review and merge.
-- Flag the MR "ready" as soon as it can be reviewed and QA'd.
-- Always assign the MR to yourself and set somebody from the development team as reviewer. If you do not know whom to chose leave the reviewer empty.
-- Select one of the templates in case your contribution contains more than simple documentation updates and follow the templates instructions.
+Please select one of the templates, in case your contribution contains more than a **simple** typo fix.

.gitlab/merge_request_templates/Feature.md

@@ -1,47 +1,74 @@
-# ⬆️ Feature
+## 📌 Summary
 
-*Expected MR Title and git commit message*
-*`feat(<app-name>): <Short description of the new feature>`*
+Briefly describe what this feature MR does and why it’s needed.
+
+> Example:
+> Adds user profile editing capabilities to the dashboard. This enables users to update their personal information without admin intervention.*
+
+---
 
 ## ✅ Changes
 
 List the key changes made in this MR:
 
-- ...
+- Added new route /profile/edit
+- Created `ProfileEditForm` component
+- Integrated with backend API for user updates
+- Added unit tests and basic form validation
+
+---
 
 ## 🧪 Tests
 
-Provide steps for QA or reviewers to test the feature and mention anything reviewers should be aware of:
+Provide steps for QA or reviewers to test the feature.
 
-- ...
+1. Login as any user
+2. Navigate to `/profile/edit`
+3. Update profile info and save
+4. Verify changes are persisted and reflected in the UI
 
-## 🔄 Requirements for migrations
+---
 
-- [ ] Describe manual steps required to update existing deployments. This especially applies if this MR introduces breaking changes:
-- [ ] Any other considerations in context of the update:
+## 📚 Related Issue(s)
 
-# Checklist / Sign-offs
+- Closes #[issue number]
+- Depends on #[merge request or issue, if any]
 
-## 🏷️ Labels
+---
 
-Set labels:
+## 🕵️ Notes for Reviewer
 
-```
-/label ~"MR-Type::Feature"
-/label ~"PO::👀"
-/label ~"Tech Lead::👀"
-/label ~"QA::👀"
-/label ~"Testautomation::👀"
-```
+Mention anything reviewers should be aware of:
 
-# 👷 Developer Checklist
+- Known issues or limitations
+- Code sections that may need special attention
+- Design considerations or edge cases handled
 
-- Does the MR include new bits and pieces (e.g. new secrets) that require documentation?
-  - [ ] No.
-  - [ ] Yes, and the documentation was updated accordingly.
+---
 
-Document in an extra comment and link to that comment:
-- [ ] How you verified the feature is working as expected, also in upgrade scenarios.
-- [ ] Any regression testing done.
+## Checklist / Sign-offs
 
---> Link to comment:
+### 💿 CI/CD
+
+- [ ] CI pipeline passes for all jobs
+- [ ] Linting and formatting checks pass
+- [ ] Review app (if used) reflects fix correctly
+
+### 🖥 QA & Product
+
+Set related labels on the MR for
+
+- [ ] `PO::👀`
+- [ ] `Tech Lead::👀`
+- [ ] `Testautomation::👀`
+- [ ] `QA::👀`
+
+---
+
+## 👷 Developer Checklist
+
+- [ ] Code builds and passes linting
+- [ ] Tests added or updated
+- [ ] Verified fix locally
+- [ ] Regression testing done for related functionality
+- [ ] No new warnings or errors in logs

.gitlab/merge_request_templates/Other.md

@@ -1,41 +1,33 @@
-# 🎉 Other
+## 📌 Summary
 
-*Expected MR Title and git commit message*
-*`fix(<component>): <Short description of what has been changed>`*
+Provide a concise summary of **what** this MR does and **why**.
+
+> Example:
+> This MR updates the CI configuration to cache NPM dependencies and reduce pipeline execution time.
+
+---
 
 ## ✅ Changes
 
-Explain for the reviewer and QA the reason for the MR and what changes are included.
+List the key updates made:
 
+- ...
 - ...
 
-## 🔄 Requirements for migrations
+---
 
-- [ ] Describe manual steps required to update existing deployments. This especially applies if this MR introduces breaking changes:
-- [ ] Any other considerations in context of the update:
+## 🧪 Tests (if applicable)
 
-# Checklist / Sign-offs
+Explain how reviewers or CI can verify the change works as intended.
 
-## 🏷️ Labels
+> Example:
+>- For CI: Check job `build:frontend` completes in <3 mins.
+>- For docs: View rendered markdown locally or in GitLab.
 
-Set labels:
+---
 
-```
-/label ~"MR-Type::Other"
-/label ~"PO::👀"
-/label ~"Tech Lead::👀"
-/label ~"QA::👀"
-/label ~"Testautomation::👀"
-```
+## 🧾 Checks
 
-# 👷 Developer Checklist
-
-- Does the MR include new bits and pieces (e.g. new secrets) that require documentation?
-  - [ ] No.
-  - [ ] Yes, and the documentation was updated accordingly.
-
-Document in an extra comment and link to that comment:
-- [ ] How you verified the change is working as expected, also in upgrade scenarios.
-- [ ] Any regression testing done.
-
---> Link to comment:
+- [ ] CI passes
+- [ ] No functional changes
+- [ ] Verified (if needed)

.gitlab/merge_request_templates/Update.md

@@ -1,41 +1,49 @@
-# ⬆️ Application Update
+## ⬆️ Application Update
 
-*Expected MR Title and git commit message*
-*`feat/fix(<app-name>): Update from <old-version> to <new-version>`*
+Expected MR Title and git commit message:
 
-## 📋 Changelog/Release Notes
+`feat/fix(<app-name>): Update from <old-version> to <new-version>`
 
-- [ ] [README.md](../../README.md) component table updated including the link to the related release notes
-- [ ] Provide significant improvements you'd like to see in the openDesk release notes. If you have a lot of details to provide or someone else is providing the details, please use a comment on the MR and link the comment in here.
+### 📋 Changelog/Release Notes
 
-## 🔄 Requirements for migrations
+- [ ] Upstream release notes: `[link]`
+- [ ] No breaking changes (or listed below)
+- [ ] Relevant changes communicated (if needed)
 
-- [ ] Minimum version of the application required in existing depoyments to update/upgrade:
-- [ ] Describe manual steps required to update existing deployments. This especially applies if the upgrade includes any breaking changes:
-- [ ] Any other considerations in context of the update:
+---
 
-# Checklist / Sign-offs
+### 🔄 Migrations to Run (if any)
 
-## 🏷️ Labels
+Describe any migrations that need to be performed when upgrading to this application version.
 
-Set labels:
+- [ ] Database migrations
+- [ ] Configuration changes
+- [ ] Cache clears / rebuilds
+- [ ] Other: _describe_
 
-```
-/label ~"MR-Type::AppUpdate"
-/label ~"PO::👀"
-/label ~"Tech Lead::👀"
-/label ~"QA::👀"
-/label ~"Testautomation::👀"
-```
+## Checklist / Sign-offs
+
+### 💿 CI/CD
+
+- [ ] CI pipeline passes for all jobs
+- [ ] Linting and formatting checks pass
+- [ ] Review app (if used) reflects fix correctly
+
+### 🖥 QA & Product
+
+Set related labels on the MR for
+
+- [ ] `PO::👀`
+- [ ] `Tech Lead::👀`
+- [ ] `Testautomation::👀`
+- [ ] `QA::👀`
+
+---
 
 ## 👷 Developer Checklist
 
-- Does the MR include new bits and pieces (e.g. new secrets) that require documentation?
-  - [ ] No.
-  - [ ] Yes, and the documentation was updated accordingly.
-
-Document in an extra comment and link to that comment:
-- [ ] How you verified the update is working as expected, also in upgrade scenarios.
-- [ ] Any regression testing done.
-
---> Link to comment:
+- [ ] Code builds and passes linting
+- [ ] Tests added or updated
+- [ ] Verified fix locally
+- [ ] Regression testing done for related functionality
+- [ ] No new warnings or errors in logs

CHANGELOG.md

@@ -1,66 +1,3 @@
-# [1.7.0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.6.0...v1.7.0) (2025-08-11)
-
-
-### Bug Fixes
-
-* **collabora:** Connect to Collabora Controller websocket via service ([5d01f60](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/5d01f6023d6d300e106cc86dfca09a4ae388f4ca))
-* **collabora:** Update from 25.04.2 to 25.04.3 ([3507c62](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/3507c62f832556c5d76e7a5b206acbdbcaca37a8))
-* **helmfile:** Adds default-enterprise-overrides to default values in helmfile-generic ([672e649](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/672e649b608fa03f04834837f13c360a08e8eb6c))
-* **nextcloud:** Block filesystem-unsafe characters in file and folder names ([0df6212](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/0df6212ca9399d39bedc30c064cbae80c2684e44))
-* **nextcloud:** Include latest Helm chart version with supports `configuration.sharing.restrictUserEnumerationToGroup` ([c3dfa2a](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/c3dfa2a6075ae388764acbb20bd8282a64183ed3))
-* **notes:** Set Pod Disruption Budget (PDB) labels ([e35dac0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/e35dac087aac54f545d361dee881196b264af906))
-* **nubus:** Add `livenessProbe` for `nubusUdmListener` to mitigate cases where the listener becomes uninitialized and stops forwarding provisioning data to NATS. Temporary until upstream provides a probe ([ef8d67f](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/ef8d67f3c1525de6f958ac7a8893b4b30ea3f7dc))
-* **open-xchange:** Disable documents role ([573e11f](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/573e11f5c5103ee5906b0168317054a7e5a22e87))
-* **open-xchange:** Postfix to support submissions and external secrets ([13ab665](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/13ab6659001abf5b6c683bf6a9309972ef7412b3))
-* **open-xchange:** Support application specific passwords in groupware when CalDAV/CardDAV support is enabled, see `functional.groupware.davSupport.enabled` for reference ([90b2290](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/90b22904dab0195f505021beb785317f8969ff7d))
-* **open-xchange:** Use dedicated pod for migration ([6fd52b1](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/6fd52b167eeed5c7e9eda2a21b209680131380ee))
-* **opendesk-certificates:** Update Helm chart to remove default host for `webmail` being set even if OX App Suite is not enabled ([09a0aac](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/09a0aace45227b60e9b39671e747958bd339c8c9))
-* **opendesk-services:** Update opendesk-alerts from 1.1.1 to 1.1.2, update opendesk-dashboards from 1.1.1 to 1.1.2 ([174d4fc](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/174d4fc61cbb718818015779012fa65353987f3c))
-* **openproject:** Update from 16.2.0 to 16.2.1 ([bba9b71](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/bba9b716a3fdf915bfc2925f1c27fe91494edcb0))
-* **ox-connector:** Update OX Connector and OX Extension to v0.27.2; review `migrations.md` for required upgrade steps ([9d51e40](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/9d51e40063d73226fc8a25365cbfa92ff09f0910))
-
-
-### Features
-
-* **nextcloud:** Enhance theming options for Nextcloud ([bdc7331](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/bdc7331cb59da96941c3250625af3cb5f9b12e15))
-* **notes:** Switch to new Helm chart with support for self-signed deployments; review `migrations.md` for required upgrade steps ([3106ca7](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/3106ca793ee1e0021f7c03e620873c49adb54199))
-* **nubus:** Allow configuration of limits for password reset requests via `security.passwordResetLimits` ([09f54b4](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/09f54b41347ff5c90064c8d4c2c6a9db7f05d54c))
-* **nubus:** Update from 1.11.2 to 1.12.0 ([5537dbb](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/5537dbbd7cb93dcb2aeafe9017c68a89d2e19293))
-* **open-xchange:** Update from 8.38 to 8.39 ([489986e](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/489986e906e828f3877e7a9087541f10c5bbfe8c))
-* **open-xchange:** Use internal endpoint for provisioning and support for optionally spinning up a dedicated internal Pod just for provisioning (see `technial.oxAppSuite.provisioning.dedicatedCoreMwPod` for details) ([31b7ec7](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/31b7ec78274e5a901b51aaaeed01e6ac82298b73))
-* **openproject:** Update from 16.1.1 to 16.2.0 ([e273abb](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/e273abbecf58b098e76c49e1763b4c3074bf5cec))
-
-# [1.6.0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.5.0...v1.6.0) (2025-07-14)
-
-
-### Bug Fixes
-
-* **dovecot-pro:** Use of `requiredEnv` instead of `env` and update `README-EE.md` ([a79e40f](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/a79e40f44af68a16f0944265cc447ec9b0d84922))
-* **helmfile:** Prefix NATS passwords as workaround for upstream issue and add documentation to `gettings-started.md` [[#185](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/issues/185), [#202](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/issues/202)] ([7f478bf](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/7f478bffd60bdf3af536bc593ef397d823a22e88))
-* **helmfile:** Remove default setting from `repositories.helm.registryOpencodeDeEnterprise` for better support of `PRIVATE_HELM_REGISTRY_URL` ([c5dd881](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/c5dd8814ae7576eaaf7cfcdd1cb4aa101f164c62))
-* **helmfile:** Set `nubusKeycloakBootstrap` debug mode when openDesk is running in debug mode ([4e0ffee](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/4e0ffeea1f9d0420c404d78c5188ff6bdb0f81ea))
-* **helmfile:** Streamline license header comment style [[#192](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/issues/192)] ([20cbad3](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/20cbad31e75d9ae27081675072561650fa168935))
-* **nubus:** Explicitly template `nubusStackDataUms.stackDataContext.portalFqdn` to fix custom hostname support [[#193](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/issues/193)] ([6aa6d3a](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/6aa6d3af2fed1be99b4f4eb5de2e2703ca00578a))
-* **nubus:** Replace openDesk portal fork with upstream `portal-frontend` image ([e4f1afc](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/e4f1afca0fdf4af184f4e287f1317ed57d229013))
-* **nubus:** Update from 1.11.1 to 1.11.2 ([237c9af](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/237c9af3c16885b51dcd1d7c793bf7fd23dbcefb))
-* **open-xchange:** Add missing `imagePullSecrets` for `core-imageconverter` and `core-documentconverter` ([9b7f439](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/9b7f439d83c9cd5a60b70f8d3ba7d36bb35ebd5c))
-* **open-xchange:** Enable `com.openexchange.smime.test` only when openDesk is running with `debug.enabled: true` ([51ff7a5](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/51ff7a5fdb7b7f3bdef02a32e44e6204df9db6ea))
-* **open-xchange:** Enable searching by LDAP `mailAlternativeAddress` when resolving global contacts. Note: OX App Suite evaluates all `mailAlternativeAddress` values of a user when searching, but only the first address is returned, which might differ from the one that matched the search criteria. ([9014324](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/90143241564d7e66bf1b864c704e13c677dcbc93))
-* **open-xchange:** Use `objectstore.dovecot.secretKey` when defined ([5c33226](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/5c332264edfcbb3343bcfd39352db6ddefd0a85c))
-* **opendesk-services:** Add missing certificates ([acbabdb](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/acbabdb80662bf0599a157b24d3f8461e1f98cad))
-* **openproject:** Update from 16.1.0 to 16.1.1 ([e30d4f1](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/e30d4f126dda29183cffc078307d41d3dce6f4fa))
-
-
-### Features
-
-* **collabora:** Update from 24.04.13 to 25.04.2 ([c56f564](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/c56f564025531d25a1966792f8c161aedf644c99))
-* **element:** Update NeoBoard from 2.1.0 to 2.2.1, NeoChoice from 1.5.1. to 1.5.2, NeoDateFix from 1.7.0 to 1.7.1 widgets and NeoDateFixBot from 2.8.2 to 2.8.3 latest releases ([98d31f8](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/98d31f811bdb007e40c4b3436ff65cdcf610db7e))
-* **helmfile:** Add options in `functional.yaml.gotmpl` for setting the portal's corner links, toggling the welcome message and the newsfeed ([1a6f438](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/1a6f438724cc442ca7b9c423a326c67690510301))
-* **nextcloud:** Update from 30.0.10 to 31.0.6 and support for notify-push ([a4c8be6](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/a4c8be60f335af98270e40478e53e6fa34c23d38))
-* **nubus:** Update from 1.9.1 to 1.11.1; required minimum openDesk version for this upgrade is 1.5.0, see `migrations.md` for details ([ccd5ab8](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/ccd5ab84e3f5bb67eb879a3683c299d7a61ddba0))
-* **open-xchange:** Store attachments for calendar, contact and task objects in object storage; review `migrations.md` for required upgrade steps ([4eb6570](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/4eb6570b0a69931f09042bdc40edfad23e6f28c1))
-* **open-xchange:** Updated OX App Suite from 8.37 to 8.38 ([2b31751](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/2b317514c61eba4ebc4cc9e7041aac606d8c16b8))
-
 # [1.5.0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.4.1...v1.5.0) (2025-06-16)
 
 

README-EE.md

@@ -6,9 +6,11 @@ SPDX-License-Identifier: Apache-2.0
 <h1>openDesk Enterprise Edition</h1>
 
 <!-- TOC -->
-* [Overview](#overview)
-* [Enterprise Features](#enterprise-features)
-* [CE vs. EE](#ce-vs-ee)
+* [Enabling the Enterprise deployment](#enabling-the-enterprise-deployment)
+* [Configuring the oD EE deployment for self-hosted installations](#configuring-the-od-ee-deployment-for-self-hosted-installations)
+  * [Registry access](#registry-access)
+  * [License keys](#license-keys)
+* [Component overview](#component-overview)
   * [CE Components](#ce-components)
   * [EE Components](#ee-components)
     * [Collabora](#collabora)
@@ -17,117 +19,14 @@ SPDX-License-Identifier: Apache-2.0
     * [Open-Xchange](#open-xchange)
       * [OX App Suite](#ox-app-suite)
       * [OX Dovecot](#ox-dovecot)
-* [Enabling the Enterprise deployment](#enabling-the-enterprise-deployment)
-* [Configuring the oD EE deployment for self-hosted installations](#configuring-the-od-ee-deployment-for-self-hosted-installations)
-  * [Registry access](#registry-access)
-  * [License keys](#license-keys)
 <!-- TOC -->
 
-# Overview
-
-openDesk Enterprise Edition is recommended for production use. It receives support and patches from ZenDiS and the suppliers of the components due to the product subscriptions included.
+openDesk Enterprise Edition is recommended for production use. It receives support and patches from ZenDiS and the suppliers of the components due to the included product subscriptions.
 
 This document refers to the openDesk Community Edition as "oD CE" and the openDesk Enterprise Edition as "oD EE".
 
 Please contact [ZenDiS](mailto:opendesk@zendis.de) to get openDesk Enterprise, either as a SaaS offering or for your on-premises installation.
 
-# Enterprise Features
-
-oD EE ships the following features for Enterprise use that are not available in oD CE.
-
-| Component            | Enterprise-only Features                                                                                          |
-| -------------------- | ----------------------------------------------------------------------------------------------------------------- |
-| **Collabora**        | Branding                       |
-|                      | [Automatic load scaling](https://www.collaboraonline.com/collabora-online-controller/)                       |
-| **Element**          | [AdminBot](https://ems-docs.element.io/books/element-cloud-documentation/page/admin-bot) |
-|                      | [GroupSync](https://ems-docs.element.io/books/element-server-suite-classic-documentation-lts-2504/page/setting-up-group-sync-with-the-installer#bkmrk-what-is-group-sync?) |
-|                      | [Admin Console](https://ems-docs.element.io/books/element-server-suite-classic-documentation-lts-2504/page/using-the-admin-console)                                   |
-| **Nextcloud**        | Enterprise security patches |
-|                      | [Guard app](https://nextcloud.com/features/#guard)                                           |
-| **Open‑Xchange**     | S3 storage                |
-|                      | Central orchestration of cluster topology, health checks, and configuration |
-|                      | Advanced Full-Text Search (FTS) functionality for mailboxes                |
-| **OpenProject**.     | [Enterprise addons](https://www.openproject.org/docs/enterprise-guide/) (*Corporate Plan*) |
-| **XWiki**            | [XWiki Pro apps](https://xwiki.com/en/offerings/products/xwiki-pro)                                                   |
-
-# CE vs. EE
-
-The following table summarizes the differences between oD CE and oD EE.
-
-| Aspect                           | Community Edition (CE)                  | Enterprise Edition (EE)                                                    |
-| -------------------------------- | --------------------------------------- | -------------------------------------------------------------------------- |
-| **Licensing of core components** | OSS (Apache‑2.0 / GPL, etc.)            | Same OSS licenses                                                          |
-| **Closed‑source modules**        | None                                    | Collabora (branding), Element (admin tools), Nextcloud (guard app), OX Pro, Dovecot Pro |
-| **Technical enablement**         | Fully public images/charts via openCode | EE‑only registry, license file (`enterprise.yaml`)                         |
-| **Support & updates**            | Community via openCode, no SLA          | SLA‑backed support, patches, 2nd/3rd level                                 |
-| **Access to source code**        | All CE code on openCode                 | Proprietary modules NOT on openCode                                        |
-
-
-## CE Components
-
-The following components are using the same codebase and artifacts for their Community and Enterprise offering:
-
-- Cryptpad
-- Jitsi
-- Notes
-- Nubus
-- OpenProject
-- XWiki
-
-## EE Components
-
-This section provides information about the components that have - at least partially - Enterprise-specific artifacts.
-
-If you want to check in detail which artifacts are specific to openDesk Enterprise and thereby may contain proprietary code, please check the `repository:`
-values in the image ([1](./helmfile/environments/default/images.yaml.gotmpl) / [2](./helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl))
-and chart ([1](./helmfile/environments/default/charts.yaml.gotmpl) / [2](./helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl)) definitions.
-When a repository path starts with `/zendis`, the artifact is only available in an openDesk Enterprise deployment.
-
-###  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.
-
-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.
-
-### Element
-
-- AdminBot and GroupSync container image: 100% closed source
-- Admin Console container image: 100% closed source, though ~65% of the total runtime code is from the [matrix-bot-sdk](https://github.com/turt2live/matrix-bot-sdk/)
-
-### Nextcloud
-
-- Nextcloud Enterprise: openDesk uses the Nextcloud Enterprise to the build Nextcloud container image for oD EE. The Nextcloud EE codebase might contain EE exclusive (longterm support) security patches, plus the Guard app, that is not publicly available, while it is AGPL-3.0 licensed.
-
-openDesk updates the Nextcloud images for openDesk CE and EE in parallel, therefore we will not upgrade to a new major Nextcloud release before the related Nextcloud Enterprise release is available. When patches are released exclusively for Nextcloud Enterprise, they are made available also exclusively in oD EE.
-
-### Open-Xchange
-
-#### OX App Suite
-
-- OX App Suite Core Middleware container image: The amount of code, that is not open source and has a proprietary license, is <10%.
-- OX App Suite Pro Helm chart: It is not publicly available, though it is "just" an umbrella chart re-using the publicly available charts referencing the EE images, so it has <10% prorietary content.
-
-openDesk updates OX App Suite in oD CE and EE always to the same release version. Only the App Suíte Pro Helm chart has the same versioning as the actual App Suite release, the chart used in oD CE has a different versioning scheme.
-
-#### OX Dovecot
-
-- Dovecot Pro container image: Dovecot Pro is based on the open source components Dovecot and Pigeonhole but extended by modules providing additional functionality like obox2, cluster, cluster controller and dovecot fts. The additional modules make up about 15% of the overall Dovecot Pro code and are subject to a closed source license.
-
-openDesk aims to keep Dovecot's shared codebases in sync between oD CE and EE, though the versioning between the releases differs (CE: 2.x, EE: 3.y).
-
-Dovecot Pro requires two additional environment variables:
-
-- `DOVECOT_CRYPT_PRIVATE_KEY`
-- `DOVECOT_CRYPT_PUBLIC_KEY`
-
-These variables must contain the base64 encoded strings of the private and public
-key. These keys can be generated with the following commands:
-
-- Private Key: `openssl genpkey -algorithm X25519 -out private.pem && cat private.pem | base64 -w0`
-- Public Key: `openssl pkey -in private.pem -out public.pem -pubout && cat public.pem | base64 -w0`
-
-
 # Enabling the Enterprise deployment
 
 To enable the oD EE deployment you must set the environment variable `OPENDESK_ENTERPRISE` to any value that does not evaluate to boolean *false* for [Helm flow control](https://helm.sh/docs/chart_template_guide/control_structures/#ifelse), e.g. `"true"`, `"yes"` or `"1"`:
@@ -146,7 +45,7 @@ OPENDESK_ENTERPRISE=true
 
 With openDesk EE you get access to the related artifact registry owned by ZenDiS.
 
-Three steps are required to access the registry - for step 1 and 2 you can set some variables. Below, you can define `<your_name_for_the_secret>` freely, like `enterprise-secret`, as long as it consistent in step 1 and 3.
+Three steps are required to access the registry - for step #1 and #2 you can set some variables. Below, you can define `<your_name_for_the_secret>` freely, like `enterprise-secret`, as long as it consistent in step #1 and #3.
 
 ```shell
 NAMESPACE=<your_namespace>
@@ -196,3 +95,58 @@ Details regarding the scope/limitation of the component's licenses:
 - Nextcloud: Enterprise license to enable [Nextcloud Enterprise](https://nextcloud.com/de/enterprise/) specific features, can be used across multiple installations until the licensed number of users is reached.
 - OpenProject: Domain specific enterprise license to enable [OpenProject's Enterprise feature set](https://www.openproject.org/enterprise-edition/), domain matching can use regular expressions.
 - XWiki: Deployment specific enterprise license (key pair) to activate the [XWiki Pro](https://xwiki.com/en/offerings/products/xwiki-pro) apps. *Caution! XWiki needs these license keys as one-line strings. Multi-line strings result in installation failure*
+
+# Component overview
+
+## CE Components
+
+The following components are using the same codebase and artifacts for their Enterprise and Community offering:
+
+- Cryptpad
+- Jitsi
+- Notes
+- Nubus
+- OpenProject
+- XWiki
+
+## EE Components
+
+This section provides information about the components that have - at least partially - Enterprise specific artifacts.
+
+If you want to check in detail which artifacts are specific to openDesk Enterprise and thereby may contain proprietary code, please check the `repository:`
+values in the image ([1](./helmfile/environments/default/images.yaml.gotmpl) / [2](./helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl))
+and chart ([1](./helmfile/environments/default/charts.yaml.gotmpl) / [2](./helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl)) definitions.
+When a repository path starts with `/zendis`, the artifact is only available in an openDesk Enterprise deployment.
+
+###  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.
+
+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.
+
+### Element
+
+- AdminBot and GroupSync container image: 100% closed source
+- Admin Console container image: 100% closed source, though ~65% of the total runtime code is from the [matrix-bot-sdk](https://github.com/turt2live/matrix-bot-sdk/)
+
+### Nextcloud
+
+- Nextcloud Enterprise: openDesk uses the Nextcloud Enterprise to the build Nextcloud container image for oD EE. The Nextcloud EE codebase might contain EE exclusive (longterm support) security patches, plus the Guard app, that is not publicly available, while it is AGPL-3.0 licensed.
+
+openDesk updates the Nextcloud images for openDesk CE and EE in parallel, therefore we will not upgrade to a new major Nextcloud release before the related Nextcloud Enterprise release is available. When patches are released exclusively for Nextcloud Enterprise, they are made available also exclusively in oD EE.
+
+### Open-Xchange
+
+#### OX App Suite
+
+- OX App Suite Core Middleware container image: The amount of code, that is not open source and has a proprietary license, is <10%.
+- OX App Suite Pro Helm chart: It is not publicly available, though it is "just" an umbrella chart re-using the publicly available charts referencing the EE images, so it has <10% prorietary content.
+
+openDesk updates OX App Suite in od CE and EE always to the same release version. Only the App Suíte Pro Helm chart has the same versioning as the actual App Suite release, the chart used in oD CE has a different versioning scheme.
+
+#### OX Dovecot
+
+- Dovecot Pro container image: Dovecot Pro is based on the open source components Dovecot and Pigeonhole but extended by modules providing additional functionality like obox2, cluster, cluster controller and dovecot fts. The additional modules make up about 15% of the overall Dovecot Pro code and are subject to a closed source license.
+
+openDesk aims to keep Dovecot's shared codebases in sync between oD CE and EE, though the versioning between the releases differs (CE: 2.x, EE: 3.y).

README.md

@@ -32,18 +32,18 @@ For production use, the [openDesk Enterprise Edition](./README-EE.md) is recomme
 
 openDesk currently features the following functional main components:
 
-| Function             | Functional Component        | License                                                                                | Component<br/>Version                                                                                                        | Upstream Documentation                                                                                                                |
-|----------------------|-----------------------------|----------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------|
-| Chat & collaboration | Element ft. Nordeck widgets | AGPL-3.0-or-later (Element Web), AGPL-3.0-only (Synapse), Apache-2.0 (Nordeck widgets) | [1.11.89](https://github.com/element-hq/element-web/releases/tag/v1.11.89)                                                   | [For the most recent release](https://element.io/user-guide)                                                                          |
-| Collaborative notes  | Notes (aka Docs)            | MIT                                                                                    | [3.2.1](https://github.com/suitenumerique/docs/releases/tag/v3.2.1)                                                          | Online documentation/welcome document available in installed application                                                              |
-| Diagram editor       | CryptPad ft. diagrams.net   | AGPL-3.0-only                                                                          | [2024.9.0](https://github.com/cryptpad/cryptpad/releases/tag/2024.9.0)                                                       | [For the most recent release](https://docs.cryptpad.org/en/)                                                                          |
-| File management      | Nextcloud                   | AGPL-3.0-or-later                                                                      | [31.0.6](https://nextcloud.com/de/changelog/#31-0-6)                                                                         | [Nextcloud 31](https://docs.nextcloud.com/)                                                                                           |
-| Groupware            | OX App Suite                | GPL-2.0-only (backend), AGPL-3.0-or-later (frontend)                                   | [8.39](https://documentation.open-xchange.com/appsuite/releases/8.39/)                                                       | Online documentation available from within the installed application; [Additional resources](https://documentation.open-xchange.com/) |
-| Knowledge management | XWiki                       | LGPL-2.1-or-later                                                                      | [16.10.5](https://www.xwiki.org/xwiki/bin/view/ReleaseNotes/Data/XWiki/16.10.5/)                                             | [For the most recent release](https://www.xwiki.org/xwiki/bin/view/Documentation)                                                     |
-| Portal & IAM         | Nubus                       | AGPL-3.0-or-later                                                                      | [1.12.0](https://docs.software-univention.de/nubus-kubernetes-release-notes/1.x/en/1.12.html#version-1-12-0-2025-07-31)      | [Univention's documentation website](https://docs.software-univention.de/n/en/nubus.html)                                             |
-| Project management   | OpenProject                 | GPL-3.0-only                                                                           | [16.2.1](https://www.openproject.org/docs/release-notes/16-2-1/)                                                             | [For the most recent release](https://www.openproject.org/docs/user-guide/)                                                           |
-| Videoconferencing    | Jitsi                       | Apache-2.0                                                                             | [2.0.9955](https://github.com/jitsi/jitsi-meet/releases/tag/stable%2Fjitsi-meet_9955)                                        | [For the most recent  release](https://jitsi.github.io/handbook/docs/category/user-guide/)                                            |
-| Weboffice            | Collabora                   | MPL-2.0                                                                                | [25.04.3](https://www.collaboraoffice.com/code-25-04-release-notes/)                                                         | Online documentation available from within the installed application; [Additional resources](https://sdk.collaboraonline.com/)        |
+| Function             | Functional Component        | Component<br/>Version                                                                                                         | Upstream Documentation                                                                                                                |
+|----------------------|-----------------------------|-------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------|
+| Chat & collaboration | Element ft. Nordeck widgets | [1.11.89](https://github.com/element-hq/element-desktop/releases/tag/v1.11.89)                                                | [For the most recent release](https://element.io/user-guide)                                                                          |
+| Collaborative notes  | Notes (aka Docs)            | [3.2.1](https://github.com/suitenumerique/docs/releases/tag/v3.2.1)                                                           | Online documentation/welcome document available in installed application                                                              |
+| Diagram editor       | CryptPad ft. diagrams.net   | [2024.9.0](https://github.com/cryptpad/cryptpad/releases/tag/2024.9.0)                                                        | [For the most recent release](https://docs.cryptpad.org/en/)                                                                          |
+| File management      | Nextcloud                   | [30.0.10](https://nextcloud.com/de/changelog/#30-0-10)                                                                        | [Nextcloud 30](https://docs.nextcloud.com/)                                                                                           |
+| Groupware            | OX App Suite                | [8.38](https://documentation.open-xchange.com/appsuite/releases/8.38/)                                                        | Online documentation available from within the installed application; [Additional resources](https://documentation.open-xchange.com/) |
+| Knowledge management | XWiki                       | [16.10.5](https://www.xwiki.org/xwiki/bin/view/ReleaseNotes/Data/XWiki/16.10.5/)                                              | [For the most recent release](https://www.xwiki.org/xwiki/bin/view/Documentation)                                                     |
+| Portal & IAM         | Nubus                       | [1.11.1](https://docs.software-univention.de/nubus-kubernetes-release-notes/latest/en/changelog.html#version-1-11-1-2025-07-02) | [Univention's documentation website](https://docs.software-univention.de/n/en/nubus.html)                                             |
+| Project management   | OpenProject                 | [16.1.1](https://www.openproject.org/docs/release-notes/16-1-1/)                                                              | [For the most recent release](https://www.openproject.org/docs/user-guide/)                                                           |
+| Videoconferencing    | Jitsi                       | [2.0.9955](https://github.com/jitsi/jitsi-meet/releases/tag/stable%2Fjitsi-meet_9955)                                         | [For the most recent  release](https://jitsi.github.io/handbook/docs/category/user-guide/)                                            |
+| Weboffice            | Collabora                   | [25.04.2](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.
@@ -93,8 +93,6 @@ Find out more about the permission system in the [roles & permissions concept](.
 
 # Releases
 
-openDesk implements a defined [release and patch management process](./docs/releases.md) to ensure stability and security.
-
 All technical releases are created using [Semantic Versioning](https://semver.org/).
 
 Gitlab provides an

docs/architecture.md

@@ -15,27 +15,27 @@ SPDX-License-Identifier: Apache-2.0
   * [Keycloak Extensions](#keycloak-extensions)
   * [OpenLDAP](#openldap)
 * [Authorization](#authorization)
-  * [LDAP group synchronization](#ldap-group-synchronization)
+  * [LDAP Group Synchronization](#ldap-group-synchronization)
 * [Provisioning](#provisioning)
   * [OX Connector](#ox-connector)
   * [SCIM](#scim)
 * [Component integration](#component-integration)
-  * [Intercom Service / Silent login](#intercom-service--silent-login)
-  * [Central contacts](#central-contacts)
-  * [Central navigation](#central-navigation)
+  * [Intercom Service / Silent Login](#intercom-service--silent-login)
+  * [Central Contacts](#central-contacts)
+  * [Central Navigation](#central-navigation)
   * [Filepicker](#filepicker)
   * [Newsfeed](#newsfeed)
-  * [(OpenProject) File store](#openproject-file-store)
-* [Applications vs. services](#applications-vs-services)
-  * [Collabora (weboffice)](#collabora-weboffice)
-  * [CryptPad Online (diagrams)](#cryptpad-online-diagrams)
-  * [Element/Synapse (chat \& call)](#elementsynapse-chat--call)
-  * [Jitsi (video conferencing)](#jitsi-video-conferencing)
-  * [Nextcloud (files)](#nextcloud-files)
-  * [Nubus (identity and access management / portal)](#nubus-identity-and-access-management--portal)
-  * [OpenProject (project management)](#openproject-project-management)
-  * [OX App Suite (groupware) with OX Dovecot (mail backend)](#ox-app-suite-groupware-with-ox-dovecot-mail-backend)
-  * [XWiki (knowledge management)](#xwiki-knowledge-management)
+  * [(OpenProject) File Store](#openproject-file-store)
+* [Applications vs. Services](#applications-vs-services)
+  * [Collabora (Office)](#collabora-office)
+  * [CryptPad Online (Diagrams)](#cryptpad-online-diagrams)
+  * [Element/Synapse (Chat \& Call)](#elementsynapse-chat--call)
+  * [Jitsi (Video Conferencing)](#jitsi-video-conferencing)
+  * [Nextcloud (Files)](#nextcloud-files)
+  * [Nubus (Identity and Access Management / Portal)](#nubus-identity-and-access-management--portal)
+  * [OpenProject (Project management)](#openproject-project-management)
+  * [OX App Suite (Groupware) with OX Dovecot (Mail backend)](#ox-app-suite-groupware-with-ox-dovecot-mail-backend)
+  * [XWiki (Knowledge management)](#xwiki-knowledge-management)
 * [Application specific user accounts](#application-specific-user-accounts)
 * [Footnotes](#footnotes)
 <!-- TOC -->
@@ -77,7 +77,7 @@ configured to use the aforementioned OpenLDAP.
 
 When the user is authenticated by Keycloak, the portal shows the applications the user is permitted to access.
 
-The user can now access applications and use the corresponding functionality without the need to authenticate
+The user can now access applications and use the corresponding functionality without the need to authenticate 
 again. This is implemented using the OpenID Connect (OIDC) protocol.
 
 # Nubus (IAM)
@@ -210,7 +210,7 @@ To address these use cases, the Keycloak Extensions act as a proxy to Keycloak.
 
 # Authorization
 
-## LDAP group synchronization
+## LDAP Group Synchronization
 
 LDAP group synchronization ensures that user group memberships are consistent across the applications in openDesk that make use of the IAM group information. Nubus uses OpenLDAP to store and manage user groups, which are synchronized with integrated applications to enforce access control policies.
 
@@ -273,7 +273,7 @@ flowchart TD
 
 Details can be found in the upstream documentation that is linked in the respective sections.
 
-## Intercom Service / Silent login
+## Intercom Service / Silent Login
 
 The Intercom Service is deployed in the context of Nubus. Its role is to enable cross-application integration
 based on the user's browser interaction, as handling authentication when the frontend of an application has to call
@@ -286,7 +286,7 @@ Currently, only OX AppSuite and Element are using the frontend-based integration
 **Links:**
 - [Intercom Service upstream documentation](https://docs.software-univention.de/intercom-service/latest/index.html).
 
-## Central contacts
+## Central Contacts
 
 OX App Suite is responsible for managing contacts in openDesk. Therefore, Nextcloud's PHP backend is using the OX AppSuite's middleware Contacts API to
 - create a new contact in the user's contacts folder when a file is shared with an unknown email address.
@@ -296,7 +296,7 @@ OX App Suite is responsible for managing contacts in openDesk. Therefore, Nextcl
 - Currently used [OX Contacts API (deprecated)](https://documentation.open-xchange.com/components/middleware/http/8/index.html#!Contacts).
 - New [OX Addressbooks API](https://documentation.open-xchange.com/components/middleware/http/8/index.html#!Addressbooks) the Central Contacts integration will switch to.
 
-## Central navigation
+## Central Navigation
 
 Central navigation is based on an API endpoint in the Nubus portal that returns a JSON containing the portal's contents for
 a given user. The response from the API endpoint is used in the openDesk applications to render the central navigation.
@@ -338,7 +338,7 @@ service through the Intercom Service's `/wiki` endpoint, in combination with the
 **Links:**
 - [XWiki Blog feature](https://extensions.xwiki.org/xwiki/bin/view/Extension/Blog%20Application)
 
-## (OpenProject) File store
+## (OpenProject) File Store
 
 While OpenProject allows you to attach files to work packages directly, it is often preferred that the files are
 stored within Nextcloud or to link an existing file from your openDesk Nextcloud to a work package.
@@ -351,7 +351,7 @@ The file store must still be enabled per project in OpenProject's project admin
 - [OpenProject's documentation on Nextcloud integration](https://www.openproject.org/docs/system-admin-guide/integrations/nextcloud/)
 - [OpenProject Integration Nextcloud app](https://apps.nextcloud.com/apps/integration_openproject)
 
-# Applications vs. services
+# Applications vs. Services
 
 openDesk consists of a variety of open-source projects, please find an overview below:
 
@@ -366,16 +366,16 @@ openDesk consists of a variety of open-source projects, please find an overview
 | Element               | Secure communications platform   | Application |
 | Jitsi                 | Videoconferencing                | Application |
 | MariaDB               | Database                         | Service     |
-| Memcached             | Cache database                   | Service     |
-| MinIO                 | Object storage                   | Service     |
+| Memcached             | Cache Database                   | Service     |
+| MinIO                 | Object Storage                   | Service     |
 | Nextcloud             | File share                       | Application |
-| Nubus (UMS)           | Identity management & portal     | Application |
+| Nubus (UMS)           | Identity Management & Portal     | Application |
 | OpenProject           | Project management               | Application |
 | OX Appsuite & Dovecot | Groupware with IMAP mail backend | Application |
 | Postfix               | MTA                              | Service     |
 | PostgreSQL            | Database                         | Service     |
-| Redis                 | Cache database                   | Service     |
-| XWiki                 | Knowledge management             | Application |
+| Redis                 | Cache Database                   | Service     |
+| XWiki                 | Knowledge Management             | Application |
 
 The end user focussed components are called applications and provide the functional scope of openDesk, please find separate paragraphs on each of the applications below.
 
@@ -383,25 +383,25 @@ Other components are of type "Service", these are used for development and evalu
 
 For the APIs / Protocols supported by the applications, please read the [apis.md](./docs/architecture/apis.md).
 
-## Collabora (weboffice)
+## Collabora (Office)
 
 [Collabora](https://www.collaboraonline.com) is a powerful online document editing suite.
 
 In openDesk, Collabora is used for editing Office documents such as rich texts, spreadsheets and presentations.
 
-## CryptPad Online (diagrams)
+## CryptPad Online (Diagrams)
 
 [CryptPad](https://cryptpad.org/) is a collaborative editor framework supporting end-to-end encryption.
 
 In openDesk, CryptPad is for editing diagrams.net documents.
 
-## Element/Synapse (chat & call)
+## Element/Synapse (Chat & Call)
 
 [Element Web](https://github.com/element-hq/element-web) is the web frontend for [Synapse](https://github.com/element-hq/synapse), the reference implementation of the sovereign and secure [Matrix protocol](https://matrix.org).
 
 In openDesk, Element is used for chat and direct audio & video calling.
 
-## Jitsi (video conferencing)
+## Jitsi (Video Conferencing)
 
 [Jitsi](https://jitsi.org) is an open-source video conferencing solution that allows users to hold secure video meetings.
 
@@ -409,27 +409,27 @@ In openDesk, Jitsi is used for video conferencing and online meetings. It integr
 
 [Jigasi](https://github.com/jitsi/jigasi) (Jitsi's SIP component) also allows joining the meeting via phone call if an external SIP server and SIP trunk are provided.
 
-## Nextcloud (files)
+## Nextcloud (Files)
 
 [Nextcloud](https://nextcloud.com) is a file storage and sync platform with powerful collaboration capabilities with desktop, mobile and web interfaces.
 
-## Nubus (identity and access management / portal)
+## Nubus (Identity and Access Management / Portal)
 
 [Nubus](https://www.univention.com/products/nubus/) is a unified Identity & Access Management, providing you with full control and digital sovereignty over your IAM processes and data.
 
 In openDesk, Nubus provides the management required for users, groups and other IAM objects, as well as the portal, the Identity provider for Single Sign-On and federation scenarios.
 
-## OpenProject (project management)
+## OpenProject (Project management)
 
 [OpenProject](https://www.openproject.org) is a project management tool that supports agile project management, team collaboration, issue tracking, and more.
 
-## OX App Suite (groupware) with OX Dovecot (mail backend)
+## OX App Suite (Groupware) with OX Dovecot (Mail backend)
 
 [OX App Suite](https://www.open-xchange.com/products/ox-app-suite) is a groupware application using [OX Dovecot](https://www.dovecot.org/) as its backend mail store.
 
 In openDesk, OX App Suite is used for email, calendar, address book and personal task management.
 
-## XWiki (knowledge management)
+## XWiki (Knowledge management)
 
 [XWiki](https://www.xwiki.org) is an open-source wiki platform for knowledge management and collaboration.
 
@@ -443,7 +443,7 @@ While the IAM manages users centrally, some applications come with local account
 | Element      | `uvs`                                         | The account for the "User Verification Service". It is used by Jitsi integrated into Element.                           | `secrets.matrixUserVerificationService.password` |
 |              | `meeting-bot`                                 | Used by the Nordeck Meeting-Bot to manage meeting rooms in Synapse.                                                     | `secrets.matrixNeoDateFixBot.password`           |
 | Nextcloud    | `nextcloud`                                   | Bootstrap the Nextcloud fileshare for OpenProject with `opendesk-openproject-bootstrap` job[^1].                        | `secrets.nextcloud.adminPassword`                |
-| OX App Suite | `admin`                                       | OX Connector to provision context, users, groups etc.                                                                   | `secrets.oxAppsuite.adminPassword`               |
+| OX App Suite | `admin`                                       | OX-Connector to provision context, users, groups etc.                                                                   | `secrets.oxAppsuite.adminPassword`               |
 | OpenProject  | set in `secrets.openproject.apiAdminUsername` | Bootstrap the Nextcloud fileshare for OpenProject with `opendesk-openproject-bootstrap` job[^1].                        | `secrets.openproject.apiAdminPassword`           |
 | XWiki        | `superadmin`                                  | Only available with `debug.enabled: true`, can be used for interactive login using `/bin/view/Main/?oidc.skipped=true`. | `secrets.xwiki.superadminpassword`               |
 

docs/architecture/apis.md

@@ -65,12 +65,12 @@ This chapter presents APIs available in openDesk, grouped by application.
 
 # IAM - Nubus
 
-![Overview of functional components in Univention Nubus for Kubernetes](./apis_images/IAM-overview_functional_components_structured.svg)
+![Overview of functional components in Univention Nubus for Kubernetes](./apis_images/IAM-overview_functional_components_structured.svg)  
 [Source](https://docs.software-univention.de/nubus-kubernetes-architecture/latest/en/overview/components.html#overview-components-fig)
 
 ## UMC Python API
 
-![Composition of UMC component with APIs highlighted](./apis_images/IAM-umc-architecture.png)
+![Composition of UMC component with APIs highlighted](./apis_images/IAM-umc-architecture.png)  
 [Source](https://docs.software-univention.de/developer-reference/latest/en/umc/architecture.html#umc-api)
 
 | Name                           | UMC Python API                                                                                                                                                                                                                                 |
@@ -143,7 +143,7 @@ More details on the Nubus provisioning service can be found here: https://docs.s
 
 ## UDM Simple API
 
-![Architecture of UDM](./apis_images/IAM-udm-architecture.svg)
+![Architecture of UDM](./apis_images/IAM-udm-architecture.svg)  
 [Source](https://docs.software-univention.de/architecture/latest/en/services/udm.html#architecture-model-udm)
 
 | Name                           | UDM Simple API                                                                                                                                    |
@@ -180,7 +180,7 @@ More details on the Nubus provisioning service can be found here: https://docs.s
 
 ## UCR Python API
 
-![Architecture overview of UCR](./apis_images/IAM-ucr-architecture.svg)
+![Architecture overview of UCR](./apis_images/IAM-ucr-architecture.svg)  
 [Source](https://docs.software-univention.de/architecture/latest/en/services/ucr.html#services-ucr-architecture-model)
 
 | Name                           | UCR Python API                                                                                         |
@@ -200,7 +200,7 @@ More details on the Nubus provisioning service can be found here: https://docs.s
 
 ## Identity Store and Directory Service (LDAP)
 
-![Overview of the Identity Store and Directory Service](./apis_images/IAM-functional_component_identity_store.svg)
+![Overview of the Identity Store and Directory Service](./apis_images/IAM-functional_component_identity_store.svg)  
 [Source](https://docs.software-univention.de/nubus-kubernetes-architecture/latest/en/components/identity-store.html#component-identity-store-figure)
 
 | Name                           | Identity Store and Directory Service (LDAP)                                                                                                           |
@@ -220,7 +220,7 @@ More details on the Nubus provisioning service can be found here: https://docs.s
 
 ## Nubus Provisioning Service
 
-![Overview of the Provisioning Service and its components](./apis_images/IAM-functional_component_provisioning_service_complete.svg)
+![Overview of the Provisioning Service and its components](./apis_images/IAM-functional_component_provisioning_service_complete.svg)  
 [Source](https://docs.software-univention.de/nubus-kubernetes-architecture/latest/en/components/provisioning-service.html#component-provisioning-service-complete-figure)
 
 | Name          | Nubus Proisioning Service                                                                                        |
@@ -229,7 +229,7 @@ More details on the Nubus provisioning service can be found here: https://docs.s
 
 ## Nubus Authorization Service
 
-![ArchiMate view of the interfaces and protocols of the Authorization Service](./apis_images/IAM-interfaces_authorization_service.svg)
+![ArchiMate view of the interfaces and protocols of the Authorization Service](./apis_images/IAM-interfaces_authorization_service.svg)  
 [Source](https://docs.software-univention.de/nubus-kubernetes-architecture/latest/en/overview/interfaces-protocols.html#authorization-service)
 
 | Name          | Nubus Authorization Service                                                                                                          |
@@ -288,7 +288,7 @@ The following are the APIs used by the Groupware application:
 | In openDesk provided by        | OX AppSuite Middleware                                                                       |
 | Transport protocol             | HTTP(S)                                                                                      |
 | Usage within component         | none                                                                                         |
-| Usage within openDesk          | OX Connector synchronizes the state of the objects (users, groups etc.) managed in the LDAP. |
+| Usage within openDesk          | OX-Connector synchronizes the state of the objects (users, groups etc.) managed in the LDAP. |
 | Usage for external integration | none                                                                                         |
 | Parallel access                | Allowed                                                                                      |
 | Message protocol               | XML based, exactly following the format of Java RMI.                                         |

docs/baseline-requirements.md

@@ -9,7 +9,7 @@ SPDX-License-Identifier: Apache-2.0
 * [Software bill of materials (SBOMs)](#software-bill-of-materials-sboms)
   * [Artifact SBOMs](#artifact-sboms)
   * [Source code SBOMs](#source-code-sboms)
-* [License compliance](#license-compliance)
+* [License Compliance](#license-compliance)
 * [Software supply chain security](#software-supply-chain-security)
 * [Container architectural basics](#container-architectural-basics)
 * [Security](#security)
@@ -25,7 +25,7 @@ SPDX-License-Identifier: Apache-2.0
   * [Top bar](#top-bar)
     * [Look and feel](#look-and-feel)
     * [Central navigation](#central-navigation)
-  * [Functional administration](#functional-administration)
+  * [Functional Administration](#functional-administration)
   * [Theming](#theming)
   * [Central user profile](#central-user-profile)
 * [Footnotes](#footnotes)
@@ -60,14 +60,14 @@ Today's software development platforms like GitLab or GitHub provide dependency
 
 **Reference:** Currently we do not have source code SBOMs in place.
 
-# License compliance
+# License Compliance
 
 All parts of openDesk Community Edition must be open source with source code (also) published or at least publishable on openCode.
 
 openCode provides some boundaries when it comes to open source license compliance openDesk has to adhere to:
 
-- The components must be published under a license listed in the [openCode license allow list](https://opencode.de/de/wissen/rechtssichere-nutzung/open-source-lizenzen).
-- Delivered artifacts (container images) must contain only components licensed under the aforementioned allow list. A container must not contain any artifact using a license from the [openCode license block list](https://opencode.de/de/wissen/rechtssichere-nutzung/open-source-lizenzen#3.-Negativliste-aller-nicht-freigegebenen-Lizenzen).
+- The components must be published under a license listed in the [openCode license allow list](https://wikijs.opencode.de/de/Hilfestellungen_und_Richtlinien/Lizenzcompliance#h-2-open-source-lizenzliste).
+- Delivered artifacts (container images) must contain only components licensed under the aforementioned allow list. A container must not contain any artifact using a license from the [openCode license block list](https://wikijs.opencode.de/de/Hilfestellungen_und_Richtlinien/Lizenzcompliance#h-3-negativliste-aller-nicht-freigegebenen-lizenzen).
 
 Deviations from the above requirements must be documented in the openDesk license deviation report.
 
@@ -243,7 +243,7 @@ When implementing the central navigation into an application there are two optio
 
 **Reference:** This is available in current deployments in all applications except for Jitsi, Collabora, and CryptPad.
 
-## Functional administration
+## Functional Administration
 
 While applications usually support technical and functional administration the technical part should be in the responsibility of the operator and is usually done at (re)deployment time. Therefore the administrative tasks within an application should be limited to functional administration.
 

docs/data-storage.md

@@ -66,58 +66,52 @@ 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`                                                                                               |
-|                      | 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`                                       |                                                                                                           |
-|                      | PVC          | Yes      | Attachments                                                                       | `media-opendesk-synapse-0`                     | `/media`                                                                                                  |
-|                      |              | Yes      | Sync and state data                                                               | `matrix-neodatefix-bot`                        | `/app/storage`                                                                                            |
-| **Intercom-Service** | Redis        | No       | Shared session data                                                               |                                                |                                                                                                           |
-| **Jitsi**            | PVC          | Optional | Meeting recordings (feature not enabled in openDesk)                              | `prosody-data-jitsi-prosody-0`                 | `/config/data`                                                                                            |
-| **Nextcloud**        | PostgreSQL   | Yes      | Application's main database Meta-Data                                             | `nextcloud`                                    |                                                                                                           |
-|                      | S3           | Yes      | The Nextcloud managed user files                                                  | `nextcloud`                                    |                                                                                                           |
-|                      | Redis        | No       | Distributed caching, as well as transactional file locking                        |                                                |                                                                                                           |
-| **Nubus**            | PostgreSQL   | Yes      | Main database for Nubus' IdP Keycloak                                             | `keycloak`                                     |                                                                                                           |
-|                      |              | Yes      | Login actions and device-fingerprints                                             | `keycloak_extensions`                          |                                                                                                           |
-|                      |              | Optional | Store of the temporary password reset token                                       | `selfservice`                                  |                                                                                                           |
-|                      |              | No       | Notification features are not used in openDesk 1.1                                | `notificationsapi`                             |                                                                                                           |
-|                      |              | No       | Guardian features are currently not used in openDesk 1.1                          | `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`                                                                                          |
-|                      |              | No       | openLDAP database (secondary R/O Pods), secondaries can sync from the primary     | `shared-data-ums-ldap-server-secondary-0`      | `/var/lib/univention-ldap`                                                                                |
-|                      |              | No       | openLDAP process data                                                             | `shared-run-ums-ldap-server-secondary-0`       | `/var/run/slapd`                                                                                          |
-|                      |              | Yes      | The state of the listener                                                         | `data-ums-provisioning-udm-listener-0`         | `/var/log/univention`<br>`/var/lib/univention-ldap/schema/id`<br>`/var/lib/univention-directory-listener` |
-|                      |              | No       | Cache                                                                             | `group-membership-cache-ums-portal-consumer-0` | `/usr/share/univention-group-membership-cache/caches`                                                     |
-|                      |              | Yes      | Queued provisioning objects                                                       | `nats-data-ums-provisioning-nats-0`            | `/data`                                                                                                   |
-|                      | Memcached    | No       | Cache for UMC Server                                                              |                                                |                                                                                                           |
-| **OpenProject**      | PostgreSQL   | Yes      | Application's main database                                                       | `openproject`                                  |                                                                                                           |
-|                      | S3           | Yes      | Attachments, custom styles                                                        | `openproject`                                  |                                                                                                           |
-|                      | 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`                                     |                                                                                                           |
-|                      |              | 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`                                                         |
-|                      |              | Yes      | OX Connector: Application's meta data                                             | `ox-connector-ox-contexts-ox-connector-0`      | `/etc/ox-secrets`                                                                                         |
-| **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`                                                                                   |
+| Application          | Data Storage | Backup   | Content                                                                                    | Identifier                                     | Details                                                                                                                  |
+|----------------------|--------------|----------|--------------------------------------------------------------------------------------------|------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------|
+| **ClamAV**           | PVC          | No       | ClamAV Database                                                                            | `clamav-database-clamav-simple-0`              | `/var/lib/clamav`                                                                                                        |
+| **Dovecot**          | PVC          | Yes      | User mail directories (openDesk CE only, openDesk EE uses Dovecot Pro with Object Storage) | `dovecot`                                      | `/srv/mail`                                                                                                              |
+| **Element/Synapse**  | PostgreSQL   | Yes      | Application's main database                                                                | `matrix`                                       |                                                                                                                          |
+|                      | PVC          | Yes      | Attachments                                                                                | `media-opendesk-synapse-0`                     | `/media`                                                                                                                 |
+|                      |              | Yes      | Sync and state data                                                                        | `matrix-neodatefix-bot`                        | `/app/storage`                                                                                                           |
+| **Intercom-Service** | Redis        | No       | Shared session data                                                                        |                                                |                                                                                                                          |
+| **Jitsi**            | PVC          | Optional | Meeting recordings (feature not enabled in openDesk)                                       | `prosody-data-jitsi-prosody-0`                 | `/config/data`                                                                                                           |
+| **Nextcloud**        | PostgreSQL   | Yes      | Application's main database Meta-Data                                                      | `nextcloud`                                    |                                                                                                                          |
+|                      | S3           | Yes      | The Nextcloud managed user files                                                           | `nextcloud`                                    |                                                                                                                          |
+|                      | Redis        | No       | Distributed caching, as well as transactional file locking                                 |                                                |                                                                                                                          |
+| **Nubus**            | PostgreSQL   | Yes      | Main database for Nubus' IdP Keycloak                                                      | `keycloak`                                     |                                                                                                                          |
+|                      |              | Yes      | Login actions and device-fingerprints                                                      | `keycloak_extensions`                          |                                                                                                                          |
+|                      |              | Optional | Store of the temporary password reset token                                                | `selfservice`                                  |                                                                                                                          |
+|                      |              | No       | Notification features are not used in openDesk 1.1                                         | `notificationsapi`                             |                                                                                                                          |
+|                      |              | No       | Guardian features are currently not used in openDesk 1.1                                   | `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`                                                                                                         |
+|                      |              | No       | openLDAP database (secondary R/O Pods), secondaries can sync from the primary              | `shared-data-ums-ldap-server-secondary-0`      | `/var/lib/univention-ldap`                                                                                               |
+|                      |              | No       | openLDAP process data                                                                      | `shared-run-ums-ldap-server-secondary-0`       | `/var/run/slapd`                                                                                                         |
+|                      |              | Yes      | The state of the listener                                                                  | `data-ums-provisioning-udm-listener-0`         | `/var/log/univention`<br>`/var/lib/univention-ldap/schema/id`<br>`/var/lib/univention-directory-listener` |
+|                      |              | No       | Cache                                                                                      | `group-membership-cache-ums-portal-consumer-0` | `/usr/share/univention-group-membership-cache/caches`                                                                    |
+|                      |              | Yes      | Queued provisioning objects                                                                | `nats-data-ums-provisioning-nats-0`            | `/data`                                                                                                                  |
+|                      | Memcached    | No       | Cache for UMC Server                                                                       |                                                |                                                                                                                          |
+| **OpenProject**      | PostgreSQL   | Yes      | Application's main database                                                                | `openproject`                                  |                                                                                                                          |
+|                      | S3           | Yes      | Attachments, custom styles                                                                 | `openproject`                                  |                                                                                                                          |
+|                      | 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`                                     |                                                                                                                          |
+|                      |              | Yes      | Dynamically creates databases of schema `PRIMARYDB_n`containing multiple contexts          | `PRIMARYDB_*`                                  |                                                                                                                          |
+|                      |              | Yes      | OX Guard related settings                                                                  | `oxguard*`                                     |                                                                                                                          |
+|                      | 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`                                                                        |
+|                      |              | Yes      | OX-Connector: Application's meta data                                                      | `ox-connector-ox-contexts-ox-connector-0`      | `/etc/ox-secrets`                                                                                                        |
+| **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`                                                                                                  |
 
-Additionally, the following persistent volumes are mounted by Pods that serve as a data storage for the applications mentioned above.
+Additionally, the following persistent volumes are mounted by pods that serve as a data storage for the applications mentioned above.
 
-These services are not ment for production use, so you can ignore these as you surely backup your production services instead.
-
-| Service    | Pod              | Volume Name  | PVC                         | MountPath             | Comment          |
-|------------|------------------|--------------|-----------------------------|-----------------------|------------------|
-| MariaDB    | `mariadb-*`      | `data`       | `data-mariadb-0`            | `/var/lib/mysql`      |                  |
-| MinIO      | `minio-*-*`      | `data`       | `minio`                     | `/bitnami/minio/data` |                  |
-| PostgreSQL | `postgresql-*`   | `data`       | `data-postgresql-0`         | `/mnt/postgresql`     |                  |
-| Redis      | `redis-master-*` | `redis-data` | `redis-data-redis-master-0` | `/data`               |                  |
-| Cassandra  | `cassandra-*`    | `data`       | `data-cassandra-*`          | `/bitnami/cassandra`  | openDesk EE only |
+| Service    | Pod              | Volume Name  | PVC                         | MountPath             |
+| ---------- | ---------------- | ------------ | --------------------------- | --------------------- |
+| MariaDB    | `mariadb-*`      | `data`       | `data-mariadb-0`            | `/var/lib/mysql`      |
+| MinIO      | `minio-*-*`      | `data`       | `minio`                     | `/bitnami/minio/data` |
+| PostgreSQL | `postgresql-*`   | `data`       | `data-postgresql-0`         | `/mnt/postgresql`     |
+| Redis      | `redis-master-*` | `redis-data` | `redis-data-redis-master-0` | `/data`               |

docs/developer/workflow.md

@@ -355,15 +355,12 @@ Example: `tmueller/fix_jitsi_theming`.
 
 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>
-> The first letter after the `: ` must be uppercase.
-
 ```text
-<type>(<scope>): <Short summary> [path/to/issue#1]
+<type>(<scope>): [path/to/issue#1] <short summary>.
  │       │              │                │
- │       │              |                └─> Issue reference (optional)
+ │       │              |                └─> Summary in present tense, sentence case, with no period at the end
  │       │              |
- │       │              └─> Summary in present tense, sentence case, with no period at the end
+ │       │              └─> Issue reference (optional)
  │       │
  │       └─> Commit Scope: helmfile, docs, collabora, nextcloud, open-xchange, etc.
  │
@@ -373,7 +370,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>
-> 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.
+> The commit messages are an essential part of the [technical releases](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/releases) as the release's notes are generated from the messages.
 
 #### Verified commits
 

docs/enhanced-configuration/groupware-migration.md

@@ -77,7 +77,7 @@ With openDesk 1.0 Enterprise, you can set openDesk's email components (OX AppSui
 ```
 secrets:
   oxAppSuite:
-    migrationsMasterPassword: "your_temporary_master_password"
+    adminPassword: "your_temporary_master_password"
 functional:
   migration:
     oxAppSuite:
@@ -89,7 +89,7 @@ functional:
 
 To validate the master authentication mode please read the appendix section at the end of the document.
 
-Updating your deployment with these settings will allow you to continue with the migration scenario. Once the migration is completed, you can remove `secrets.oxAppSuite.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.
+Updating your deployment with these settings will allow you to continue with the migration scenario. Once the migration is completed, you can remove `secrets.oxAppSuite.adminPassword` and need to turn off the migration mode by setting `functional.migration.oxAppSuite.enabled` to `false` or removing that setting, as `false` is the default before you update your deployment once again.
 
 > **Note**<br>
 > For the changes to take effect, it is sufficient to re-deploy the `open-xchange` component alone. But you have to restart the Dovecot Pod(s) manually when switching to/from the master authentication mode for the changes to take effect.

docs/functional.md

@@ -26,7 +26,6 @@ The following categories are available. Each category contains a set of options
 * Portal options (`functional.portal.*`): Options to customize the openDesk portal, e.g. if the login dialog should be enforced.
 * Chat options (`functional.chat.*`): Configuration options for the chat component of openDesk.
 * Migration options (`functional.migration.*`): Helpful setting(s) for migration scenarios.
-* Groupware options (`functional.groupware.*`): Options to customize Open-Xchange and mail settings, e.g. mail quota.
 
 ## Customization of functional options
 

docs/getting-started.md

@@ -226,19 +226,16 @@ cluster:
 
 ### Ingress
 
-The default value for the `ingressClassName` in openDesk is set to `nginx`. This prevents fallback to the
-cluster’s default ingress class, since the Helm charts used by openDesk components are not consistently aligned in
-how they handle a missing or empty `ingressClassName`. In case you are using a non-standard `ingressClassName` for
-your `ingress-nginx` controller you have to configure it as follows:
+By default, the `ingressClassName` is empty and selects the default ingress controller in your cluster. You can customize it by
+setting the following attribute to the name of the ingress controller the within your deployment you wish to use. Useful if the ingress controller you wish to use is not the default.
 
 ```yaml
 ingress:
-  ingressClassName: "nginx"
+  ingressClassName: "name-of-my-nginx-ingress"
 ```
 
-> **Note**<br>
-> Currently, the only supported ingress controller is `ingress-nginx`
-> (see [requirements.md](./docs/requirements.md) for reference).
+Currently, the only supported ingress controller is `ingress-nginx` (see
+[requirements.md](./docs/requirements.md) for reference).
 
 ### Container runtime
 

docs/migrations.md

@@ -7,18 +7,11 @@ 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)
 * [Manual checks/actions](#manual-checksactions)
-  * [v1.7.0+](#v170)
-    * [Pre-upgrade to v1.7.0+](#pre-upgrade-to-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)
-      * [Upstream fix: Provisioning of functional mailboxes](#upstream-fix-provisioning-of-functional-mailboxes)
   * [v1.6.0+](#v160)
     * [Pre-upgrade to v1.6.0+](#pre-upgrade-to-v160)
-      * [Upstream constraint: Nubus' external secrets](#upstream-constraint-nubus-external-secrets)
+      * [Upstream contraint: Nubus' external secrets](#upstream-contraint-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)
@@ -92,17 +85,6 @@ Manual checks and possible activities are also required by openDesk updates, the
 > **Known limitations**<br>
 > 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.
-
-This section should provide you with an overview of what changes to expect in the next major release (openDesk 2.0) expected in September 2025.
-
-- `functional.portal.link*` (see `functional.yaml.gotmpl` for details) are going to be moved into the `theme.*` tree, we are also going to move the icons used for the links currently found under `theme.imagery.portalEntries` in this step.
-- We will explicitly set the [database schema configuration](https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/Configuration/#HConfigurethenamesofdatabaseschemas) for XWiki to avoid the use of the `public` schema.
-- `persistance.storages.oxConnector.storageClassName` and `persistance.storages.nubusUdmListener.storageClassName` will be templated in Helmfile requiring you to template them explicitly if their current default values differs from the global value set in `persistence.storageClassNames.RWO`.
-- The currently used Helm chart for Notes will be replaced requiring some config updates.
-
 # Automated migrations - 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.
@@ -111,12 +93,12 @@ To upgrade existing deployments, you cannot skip any version mentioned in the co
 
 | Mandatory version |
 | ----------------- |
+<!-- | 1.x.x        |  add the entry to the table as soon as we get new migration requiring that the former migration was executed -->
 | 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>
 > Be sure to check out the table in the release version you are going to install, and not the currently installed version.
@@ -125,71 +107,11 @@ If you would like more details about the automated migrations, please read secti
 
 # Manual checks/actions
 
-## v1.7.0+
-
-### Pre-upgrade to v1.7.0+
-
-### Helmfile fix: Ensure enterprise overrides apply when deploying from project root
-
-**Target group:** All openDesk Enterprise deployments initiated from the project root using `helmfile_generic.yaml.gotmpl`
-
-Previously, the default values referenced in `helmfile_generic.yaml.gotmpl` did not include the necessary Enterprise overrides from `helmfile/environment/default-ee-overrides/`.
-
-As a result, when deploying openDesk Enterprise Edition from the project root, the correct Enterprise charts and images for Collabora, Nextcloud, OpenXchange, and Dovecot were not applied. This issue does not affect deployments started at the component level (e.g., `helmfile/apps/collabora`).
-
-Please verify that your deployment uses the correct Enterprise charts and images. If not, migrate to the Enterprise versions before upgrading to openDesk EE v1.7.0.
-
-#### Replace Helm chart: New Notes Helm chart with support for self-signed deployments
-
-**Target group:** All deployments that set `app.notes.enabled: true` (default is `false`).
-
-We replaced the Helm Chart used for the Notes (aka "Impress") deployment. If you have enabled Notes in your deployment, you must manually uninstall the old chart before upgrading to openDesk v1.7.0.
-
-```shell
-helm uninstall -n <your_namespace> impress
-```
-
-In case you are using `annotation.notes` they have to be moved into one of the remaining dicts, see [`annotations.yaml.gotmpl`](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/blob/develop/helmfile/environments/default/annotations.yaml.gotmpl) for details:
-
-```yaml
-annotation:
-  notesBackend: {}
-  notesFrontend: {}
-  notesYProvider: {}
-```
-
-### Post-upgrade to v1.7.0+
-
-#### Upstream fix: Provisioning of functional mailboxes
-
-**Target group:** Deployments with OX App Suite that make use of IAM maintained functional mailboxes.
-
-The update of OX Connector included in openDesk 1.7.0 fixes an issue with the provisioning of IAM maintained functional mailboxes. If your deployment makes use of these mailboxes it is recommended to trigger a full sync of the OX App Suite provisioning by recreating the OX Connector's provisioning subscription using calls to the provisioning API that is temporary port-forwarded in the example below:
-
-```shell
-export NAMESPACE=<your_namespace>
-export SUBSCRIPTION_NAME=ox-connector
-export SUBSCRIPTION_SECRET_NAME=ums-provisioning-ox-credentials
-export TEMPORARY_CONSUMER_JSON=$(mktemp)
-export PROVISIONING_API_POD_NAME=$(kubectl -n ${NAMESPACE} get pods --no-headers -o custom-columns=":metadata.name" | grep ums-provisioning-api | tr -d '\n')
-kubectl -n ${NAMESPACE} port-forward ${PROVISIONING_API_POD_NAME} 7777:7777 &
-export PROVISIONING_PORT_FORWARD_PID=$!
-sleep 10
-kubectl -n ${NAMESPACE} get secret ${SUBSCRIPTION_SECRET_NAME} -o json | jq '.data | map_values(@base64d)' | jq -r '."ox-connector.json"' > ${TEMPORARY_CONSUMER_JSON}.json
-export PROVISIONING_ADMIN_PASSWORD=$(kubectl -n ${NAMESPACE} get secret ums-provisioning-api-admin -o jsonpath='{.data.password}' | base64 --decode)
-# Delete the current subscription
-curl -o - -u "admin:${PROVISIONING_ADMIN_PASSWORD}" -X DELETE http://localhost:7777/v1/subscriptions/${SUBSCRIPTION_NAME}
-# Recreate the subscription
-curl -u "admin:${PROVISIONING_ADMIN_PASSWORD}" -H 'Content-Type: application/json' -d @${TEMPORARY_CONSUMER_JSON}.json http://localhost:7777/v1/subscriptions
-kill ${PROVISIONING_PORT_FORWARD_PID}
-rm ${TEMPORARY_CONSUMER_JSON}
-```
-
 ## v1.6.0+
 
 ### Pre-upgrade to v1.6.0+
 
-#### Upstream constraint: Nubus' external secrets
+#### Upstream contraint: Nubus' external secrets
 
 **Target group:** Operators that use external secrets for Nubus.
 

docs/permissions.md

@@ -20,7 +20,7 @@ openDesk uses role-based access control (RBAC) to manage permissions. This syste
       * [Administrative access to applications](#administrative-access-to-applications)
     * [Custom groups](#custom-groups)
   * [Assigning roles/groups and permissions](#assigning-rolesgroups-and-permissions)
-  * [Predefined roles/user templates](#predefined-rolesuser-templates)
+  * [Predefined roles / user templates](#predefined-roles--user-templates)
     * [*openDesk User*](#opendesk-user)
     * [*openDesk Administrator*](#opendesk-administrator)
   * [Managing permissions](#managing-permissions)
@@ -30,7 +30,7 @@ openDesk uses role-based access control (RBAC) to manage permissions. This syste
   * [Delegation](#delegation)
   * [Regular review](#regular-review)
 * [Applications](#applications)
-  * [Roles/Groups](#rolesgroups)
+  * [Roles/groups](#rolesgroups)
 <!-- TOC -->
 
 # Identity and Access Management (IAM)
@@ -126,7 +126,7 @@ While openDesk ships with predefined groups, additional groups can be [created](
 
 Users get roles assigned based on their responsibilities and the tasks they need to perform. This assignment can be done by an admin through the [administration portal](https://docs.opendesk.eu/administration/).
 
-## Predefined roles/user templates
+## Predefined roles / user templates
 
 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/).
 
@@ -191,7 +191,7 @@ While the overall role and permission setup must be checked by the customer, inc
 
 Managing all application permissions within the IAM would require a superset of permissions to be available in the IAM. This would lead to a high level of administrative complexity. Instead, the application specific permissions are usually managed within an application itself and mapped to roles/groups that are managed in the IAM.
 
-## Roles/Groups
+## Roles/groups
 
 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/).
 

docs/releases.md

@@ -1,122 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-SPDX-License-Identifier: Apache-2.0
--->
-
-<h1>Release management</h1>
-
-This document outlines the release and patch management strategy for **openDesk**, ensuring that all updates, patches, and new releases are systematically **planned, tested, documented**, and **reliably deployed** into production. The process is designed to align with operational planning requirements and maintain system stability and security.
-
-<!-- TOC -->
-* [Release cycle](#release-cycle)
-  * [Release types](#release-types)
-  * [Release schedule](#release-schedule)
-  * [Upgrades](#upgrades)
-* [Patch management process](#patch-management-process)
-  * [Patch identification \& prioritization](#patch-identification--prioritization)
-  * [Patch workflow](#patch-workflow)
-* [Communication plan](#communication-plan)
-  * [Announcement channels](#announcement-channels)
-  * [Timing of communications](#timing-of-communications)
-* [Documentation requirements](#documentation-requirements)
-* [Compliance \& review](#compliance--review)
-<!-- TOC -->
-
-# Release cycle
-
-openDesk follows a structured release cycle to ensure predictability and reliability:
-
-## Release types
-
-| Type           | Frequency     | Content                                                       |
-|----------------|---------------|---------------------------------------------------------------|
-| **Major**      | Annually (Q3) | Large feature sets, architecture changes, breaking changes |
-| **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.
-
-## Release schedule
-
-- **Major releases** are scheduled for **Q3 each year**, with planning beginning in Q1.
-- **Minor releases** occur **monthly on Mondays**, typically **around 10:00 AM** local time.
-  - Each minor release follows a **4-week cycle**.
-  - **Week 1–3**: Active development of new features and improvements.
-  - **End of Week 3**: **Feature freeze** is enforced to allow stabilization and testing.
-  - **Week 4**: Final testing, approvals, and preparation for release.
-  - At the **end of Week 4**, a new minor version is released, and a new cycle begins.
-- **Patch releases** are created **on demand**, based on criticality and urgency.
-
-## Upgrades
-
-- 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`
-
-# Patch management process
-
-A standardized process ensures patches are developed, prioritized, and deployed efficiently.
-
-## Patch identification & prioritization
-
-Patches are categorized by severity and urgency:
-
-| Priority Level | Criteria                                                                 |
-|----------------|--------------------------------------------------------------------------|
-| **Critical**   | Security vulnerabilities, system outages, data loss risks                |
-| **High**       | Major bugs affecting multiple users, performance degradation             |
-| **Medium**     | Functional bugs with workarounds, minor usability issues                 |
-| **Low**        | Cosmetic issues, documentation updates                                   |
-
-## Patch workflow
-
-The following steps define the patch workflow from issue identification to post-deployment review. This process ensures consistent quality and minimal disruption to users:
-
-1. **Identification**: Potential issues are detected through automated monitoring, internal testing, audits, or user reports submitted via the support ticketing system.
-2. **Assessment**: The product and engineering teams triage the issue, determine severity based on business and user impact, and prioritize it within the patch queue.
-3. **Development**: A fix is implemented on a dedicated feature or hotfix branch, adhering to coding standards and version control protocols.
-4. **Testing**: All patches undergo automated unit and integration tests, as well as manual QA validation in a staging environment that closely mirrors production.
-5. **Approval**: Once tested, the patch must be approved by the product owner or a designated release manager, with proper documentation and change control entries.
-6. **Deployment**: The patch is rolled out using CI/CD pipelines during predefined deployment windows or as soon as possible for critical issues.
-7. **Post-deployment review**: After deployment, the fix is verified in production, and monitoring tools are used to detect regressions or unintended side effects.
-
-This workflow ensures that patches are handled with the same level of discipline as planned releases, supporting both reliability and agility.
-
-# Communication plan
-
-A lightweight approach reduces manual effort while maintaining transparency.
-
-## Announcement channels
-
-| Channel | Audience | Purpose | Owner |
-|---------|----------|---------|-------|
-| **openCode Changelog** | Community & EE | Primary source of truth for every release | DevOps |
-| **Account‑Manager Mail / Ticket** | Enterprise customers | Targeted information & upgrade advice | Customer Success |
-
-## Timing of communications
-
-| Release Type | What | When |
-|--------------|------|------|
-| **Major** | Roadmap entry + migration highlights | 4 weeks before release |
-|            | Final confirmation | 1 week before release |
-| **Minor** | Changelog entry (draft) | Immediately after feature freeze (end of week 3) |
-|            | EE mail/ticket | 2 business days before deployment |
-| **Patch** | Changelog entry | Right after production deploy |
-|            | EE mail/ticket (only if impacted) | Within 1 business day |
-
-Community users consume information via openCode; Enterprise customers get an additional nudge via their account manager – **no mass mailings are sent manually**.
-
-# Documentation requirements
-
-Each release (major, minor, or patch) must include:
-
-- **Release notes** outlining new features, fixes, and known issues
-- **Change logs** with commit references and affected components
-- **Test reports** confirming QA coverage and results
-- **Deployment checklist** reviewed and approved by the product owner
-
-# Compliance & review
-
-- The release process is reviewed **bi-annually** to incorporate feedback and evolving requirements
-- Emergency patches (e.g., zero-day security issues) may bypass the standard schedule but must be documented post-deployment

docs/security-context.md

@@ -169,16 +169,19 @@ This list gives you an overview of templated security settings and if they compl
 | **jitsi**/jitsi/jitsi/web | :x: | no | no | no | no | 0 | 0 | yes | no |
 | **jitsi**/jitsi/patchJVB | :white_check_mark: | no | no | yes | yes | 1001 | 1001 | yes | yes |
 | **nextcloud**/opendesk-nextcloud-management | :x: | no | no | no | yes | 101 | 101 | yes | yes |
-| **nextcloud**/opendesk-nextcloud-notifypush | :white_check_mark: | no | no | yes | yes | 101 | 101 | yes | yes |
 | **nextcloud**/opendesk-nextcloud/aio | :white_check_mark: | no | no | yes | yes | 101 | 101 | yes | yes |
 | **nextcloud**/opendesk-nextcloud/exporter | :white_check_mark: | no | no | yes | yes | 65532 | 65532 | yes | yes |
-| **notes**/impress/backend | :x: | n/a | n/a | n/a | n/a | n/a | n/a | n/a | no |
-| **notes**/impress/frontend | :x: | n/a | n/a | n/a | n/a | n/a | n/a | n/a | no |
-| **notes**/impress/y-provider | :x: | n/a | n/a | n/a | n/a | n/a | n/a | n/a | no |
+| **notes**/impress/backend | :white_check_mark: | no | no | yes | yes | 1001 | 1001 | yes | yes |
+| **notes**/impress/frontend | :white_check_mark: | no | no | yes | yes | 1001 | 1001 | yes | yes |
+| **notes**/impress/yProvider | :white_check_mark: | no | no | yes | yes | 1001 | 1001 | yes | yes |
 | **nubus**/intercom-service | :white_check_mark: | no | no | yes | yes | 1000 | 1000 | yes | yes |
 | **nubus**/intercom-service/provisioning | :x: | n/a | n/a | n/a | n/a | n/a | n/a | yes | no |
 | **nubus**/opendesk-keycloak-bootstrap | :white_check_mark: | no | no | yes | yes | 1000 | 1000 | yes | yes |
 | **nubus**/ums/keycloak | :x: | no | n/a | no | yes | 1000 | 1000 | yes | yes |
+| **nubus**/ums/nubusGuardian/authorizationApi | :white_check_mark: | no | no | yes | yes | 1000 | 1000 | yes | yes |
+| **nubus**/ums/nubusGuardian/managementApi | :white_check_mark: | no | no | yes | yes | 1000 | 1000 | yes | yes |
+| **nubus**/ums/nubusGuardian/managementUi | :white_check_mark: | no | no | yes | yes | 1000 | 1000 | yes | yes |
+| **nubus**/ums/nubusGuardian/openPolicyAgent | :white_check_mark: | no | no | yes | yes | 1000 | 1000 | yes | yes |
 | **nubus**/ums/nubusKeycloakBootstrap | :x: | no | n/a | yes | yes | 1000 | 1000 | yes | yes |
 | **nubus**/ums/nubusKeycloakExtensions/handler | :x: | n/a | n/a | n/a | n/a | n/a | n/a | yes | no |
 | **nubus**/ums/nubusKeycloakExtensions/proxy | :x: | no | n/a | yes | yes | 1000 | 1000 | yes | yes |

docs/security.md

@@ -8,12 +8,12 @@ SPDX-License-Identifier: Apache-2.0
 This document covers the current status of security measures.
 
 <!-- TOC -->
-* [Helm chart trust chain](#helm-chart-trust-chain)
-* [Kubernetes security enforcements](#kubernetes-security-enforcements)
-* [Network policies](#network-policies)
+* [Helm Chart Trust Chain](#helm-chart-trust-chain)
+* [Kubernetes Security Enforcements](#kubernetes-security-enforcements)
+* [NetworkPolicies](#networkpolicies)
 <!-- TOC -->
 
-# Helm chart trust chain
+# Helm Chart Trust Chain
 
 Helm charts are signed and validated against GPG keys in `helmfile/files/gpg-pubkeys`.
 
@@ -25,22 +25,22 @@ All charts except the ones mentioned below are verifiable:
 |-------------------|:----------:|
 | open-xchange-repo |     no     |
 
-# Kubernetes security enforcements
+# Kubernetes Security Enforcements
 
 This list gives you an overview of default security settings and whether they comply with security standards:
 
 ⟶ Visit our generated detailed [Security Context](./docs/security-context.md) overview.
 
-# Network policies
+# NetworkPolicies
 
-Kubernetes network policies are an essential measure to secure your Kubernetes apps and clusters.
+Kubernetes NetworkPolicies are an essential measure to secure your Kubernetes apps and clusters.
 When applied, they restrict traffic to your services.
-`NetworkPolicy` resources protect other deployments in your cluster or other services in your deployment from getting compromised when another
+NetworkPolicies protect other deployments in your cluster or other services in your deployment from getting compromised when another
 component is compromised.
 
-We ship a default set of Otterize `ClientIntents` via
+We ship a default set of Otterize ClientIntents via
 [Otterize intents operator](https://github.com/otterize/intents-operator) which translates intent-based access control
-(IBAC) into Kubernetes native network policies.
+(IBAC) into Kubernetes native NetworkPolicies.
 
 This requires the Otterize intents operator to be installed.
 

docs/theming.md

@@ -20,11 +20,6 @@ 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>
-> Theming focuses on colors, iconography and imagery. If you like to adapt the default links in the portal 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
 
 - Portal and Keycloak screen styles, especially colors, must be applied in the [`portalStylesheets.css`](../helmfile/files/theme/portalStylesheet.css),

helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 controller:
   enableHashmapParallelization: true
@@ -32,9 +34,7 @@ imagePullSecrets:
 ingress:
   enabled: {{ .Values.ingress.enabled }}
   annotations:
-    {{- with .Values.annotations.coco.ingress }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.coco.ingress | toYaml | nindent 4 }}
   className: {{ .Values.ingress.ingressClassName | quote }}
   hosts:
     - host: "{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}"

helmfile/apps/collabora/values-enterprise.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 image:
   repository: "{{ coalesce .Values.repositories.image.registryOpencodeDeEnterprise .Values.global.imageRegistry .Values.images.collabora.registry }}/{{ .Values.images.collabora.repository }}"

helmfile/apps/collabora/values.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 autoscaling:
   enabled: false
@@ -30,7 +32,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]=wss://{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}/controller/ws
     --o:monitors.monitor[0][@retryInterval]=5
     {{- end }}
   username: "collabora-internal-admin"
@@ -77,8 +79,8 @@ ingress:
     # HAProxy
     haproxy.org/timeout-tunnel: "{{ .Values.ingress.parameters.bodyTimeout.collabora }}s"
     haproxy.org/backend-config-snippet: |
-      balance url_param WOPISrc check_post
-      hash-type consistent
+       balance url_param WOPISrc check_post
+       hash-type consistent
     # HAProxy - Community: https://haproxy-ingress.github.io/
     haproxy-ingress.github.io/timeout-tunnel: "{{ .Values.ingress.parameters.bodyTimeout.collabora }}s"
     haproxy-ingress.github.io/balance-algorithm: "url_param WOPISrc check_post"
@@ -89,9 +91,9 @@ ingress:
       acl admin_url path_beg /cool/adminws/
       acl admin_url path_beg /browser/dist/admin/admin.html
       http-request deny if admin_url
-    {{- with .Values.annotations.collabora.ingress }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+   {{- with .Values.annotations.collabora.ingress }}
+   {{ . | toYaml | nindent 4 }}
+   {{- end }}
   enabled: {{ .Values.ingress.enabled }}
   className: {{ .Values.ingress.ingressClassName | quote }}
   hosts:

helmfile/apps/cryptpad/values.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 # https://github.com/cryptpad/helm/blob/main/charts/cryptpad/README.md or
 # https://github.com/cryptpad/helm/blob/main/charts/cryptpad/values.yaml

helmfile/apps/element/values-element.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 commonAnnotations:
   {{ .Values.annotations.element.common | toYaml | nindent 2 }}

helmfile/apps/element/values-matrix-neoboard-widget.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Center for Digital Sovereignty of Public Administration (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG ZenDiS "Project group for the development of ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Center for Digital Sovereignty of Public Administration (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG ZenDiS "Project group for the development of ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 additionalAnnotations:
   {{ .Values.annotations.elementMatrixNeoboardWidget.additional | toYaml | nindent 2 }}

helmfile/apps/element/values-matrix-neochoice-widget.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Center for Digital Sovereignty of Public Administration (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG ZenDiS "Project group for the development of ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Center for Digital Sovereignty of Public Administration (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG ZenDiS "Project group for the development of ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 additionalAnnotations:
   {{ .Values.annotations.elementMatrixNeochoiceWidget.additional | toYaml | nindent 2 }}

helmfile/apps/element/values-matrix-neodatefix-bot-bootstrap.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Center for Digital Sovereignty of Public Administration (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG ZenDiS "Project group for the development of ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Center for Digital Sovereignty of Public Administration (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG ZenDiS "Project group for the development of ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 cleanup:
   deletePodsOnSuccess: {{ .Values.debug.cleanup.deletePodsOnSuccess }}

helmfile/apps/element/values-matrix-neodatefix-bot.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Center for Digital Sovereignty of Public Administration (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG ZenDiS "Project group for the development of ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Center for Digital Sovereignty of Public Administration (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG ZenDiS "Project group for the development of ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 additionalAnnotations:
   {{ .Values.annotations.elementMatrixNeodatefixBot.additional | toYaml | nindent 2 }}

helmfile/apps/element/values-matrix-neodatefix-widget.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Center for Digital Sovereignty of Public Administration (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG ZenDiS "Project group for the development of ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Center for Digital Sovereignty of Public Administration (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG ZenDiS "Project group for the development of ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 additionalAnnotations:
   {{ .Values.annotations.elementMatrixNeodatefixWidget.additional | toYaml | nindent 2 }}

helmfile/apps/element/values-matrix-user-verification-service-bootstrap.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Center for Digital Sovereignty of Public Administration (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG ZenDiS "Project group for the development of ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Center for Digital Sovereignty of Public Administration (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG ZenDiS "Project group for the development of ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 cleanup:
   deletePodsOnSuccess: {{ .Values.debug.cleanup.deletePodsOnSuccess }}

helmfile/apps/element/values-matrix-user-verification-service.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Center for Digital Sovereignty of Public Administration (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG ZenDiS "Project group for the development of ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Center for Digital Sovereignty of Public Administration (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG ZenDiS "Project group for the development of ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 additionalAnnotations:
   {{ .Values.annotations.elementMatrixUserVerificationService.additional | toYaml | nindent 2 }}

helmfile/apps/element/values-synapse-admin.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 global:
   domain: {{ .Values.global.domain | quote }}

helmfile/apps/element/values-synapse-adminbot-bootstrap.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 global:
   domain: {{ .Values.global.domain | quote }}

helmfile/apps/element/values-synapse-adminbot-pipe.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 global:
   domain: {{ .Values.global.domain | quote }}

helmfile/apps/element/values-synapse-adminbot-web.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 global:
   domain: {{ .Values.global.domain | quote }}

helmfile/apps/element/values-synapse-auditbot-bootstrap.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 global:
   domain: {{ .Values.global.domain | quote }}

helmfile/apps/element/values-synapse-auditbot-pipe.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 global:
   domain: {{ .Values.global.domain | quote }}

helmfile/apps/element/values-synapse-groupsync.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 global:
   domain: {{ .Values.global.domain | quote }}

helmfile/apps/element/values-synapse-web.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 commonAnnotations:
   {{ .Values.annotations.elementSynapseWeb.common | toYaml | nindent 2 }}

helmfile/apps/element/values-synapse.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 commonAnnotations:
   {{ .Values.annotations.elementSynapse.common | toYaml | nindent 2 }}
@@ -132,7 +134,7 @@ configuration:
       allowUsersToUpdateDisplayname: {{ .Values.functional.chat.matrix.profile.allowUsersToUpdateDisplayname }}
 
     smtp:
-      senderAddress: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}"
+      senderAddress: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}"
       host: {{ printf "%s.%s.svc.%s" "postfix" (.Values.apps.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
       port: 25
       tls: false

helmfile/apps/element/values-well-known.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 commonAnnotations:
   {{ .Values.annotations.elementWellKnown.common | toYaml | nindent 2 }}

helmfile/apps/jitsi/values-jitsi.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 global:
   domain: {{ .Values.global.domain | quote }}
@@ -322,7 +324,7 @@ patchJVB:
       {{ .Values.seLinuxOptions.jitsiPatchJVB | toYaml | nindent 6 }}
   image:
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-    registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.jitsiPatchJVB.registry | quote }}
+    registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.jitsiPatchJVB.registry | quote }}
     repository: {{ .Values.images.jitsiPatchJVB.repository | quote }}
     tag: {{ .Values.images.jitsiPatchJVB.tag | quote }}
 

helmfile/apps/nextcloud/helmfile-child.yaml.gotmpl

@@ -24,9 +24,9 @@ releases:
     chart: "nextcloud-repo/{{ .Values.charts.nextcloudManagement.name }}"
     version: "{{ .Values.charts.nextcloudManagement.version }}"
     values:
-      - "values-nextcloud-management.yaml.gotmpl"
+      - "values-nextcloud-mgmt.yaml.gotmpl"
       {{- if eq (env "OPENDESK_ENTERPRISE") "true" }}
-      - "values-nextcloud-management-ee.yaml.gotmpl"
+      - "values-nextcloud-mgmt-enterprise.yaml.gotmpl"
       {{- end }}
       {{- range .Values.customization.release.opendeskNextcloudManagement }}
       - {{ . }}
@@ -34,14 +34,14 @@ releases:
     waitForJobs: true
     wait: true
     installed: {{ .Values.apps.nextcloud.enabled }}
-    timeout: 1800
+    timeout: 900
   - name: "opendesk-nextcloud"
     chart: "nextcloud-repo/{{ .Values.charts.nextcloud.name }}"
     version: "{{ .Values.charts.nextcloud.version }}"
     values:
       - "values-nextcloud.yaml.gotmpl"
       {{- if eq (env "OPENDESK_ENTERPRISE") "true" }}
-      - "values-nextcloud-ee.yaml.gotmpl"
+      - "values-nextcloud-enterprise.yaml.gotmpl"
       {{- end }}
       {{- range .Values.customization.release.opendeskNextcloud }}
       - {{ . }}
@@ -49,23 +49,6 @@ releases:
     needs:
       - "opendesk-nextcloud-management"
     installed: {{ .Values.apps.nextcloud.enabled }}
-    timeout: 1800
-  - name: "opendesk-nextcloud-notifypush"
-    chart: "nextcloud-repo/{{ .Values.charts.nextcloudNotifyPush.name }}"
-    version: "{{ .Values.charts.nextcloudNotifyPush.version }}"
-    values:
-      - "values-nextcloud-notifypush.yaml.gotmpl"
-      {{- if eq (env "OPENDESK_ENTERPRISE") "true" }}
-      - "values-nextcloud-notifypush-ee.yaml.gotmpl"
-      {{- end }}
-      {{- range .Values.customization.release.opendeskNextcloudNotifyPush }}
-      - {{ . }}
-      {{- end }}
-    wait: true
-    needs:
-      - "opendesk-nextcloud"
-    installed: {{ and .Values.apps.nextcloud.enabled (gt .Values.replicas.nextcloudNotifyPush 0) }}
-    timeout: 1800
 
 commonLabels:
   deployStage: "050-components"

helmfile/apps/nextcloud/values-nextcloud-enterprise.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 aio:
   image:

helmfile/apps/nextcloud/values-nextcloud-mgmt-enterprise.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 image:
   registry: {{ coalesce .Values.repositories.image.registryOpencodeDeEnterprise .Values.global.imageRegistry .Values.images.nextcloud.registry | quote }}

helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 global:
   domain: {{ .Values.global.domain | quote }}
@@ -65,8 +67,6 @@ configuration:
         enabled: true
       integrationOpenproject:
         enabled: {{ .Values.apps.openproject.enabled }}
-      notifyPush:
-        enabled: {{ gt .Values.replicas.nextcloudNotifyPush 0 }}
       spreed:
         enabled: true
     circles:
@@ -101,9 +101,7 @@ configuration:
         {{- end }}
 
   ldap:
-    base: {{ .Values.ldap.baseDn | quote }}
     host: {{ .Values.ldap.host | quote }}
-    dn: "uid=ldapsearch_nextcloud,cn=users,{{ .Values.ldap.baseDn }}"
     password:
       value: {{ .Values.secrets.nubus.ldapSearch.nextcloud | quote }}
     adminGroupName: "managed-by-attribute-FileshareAdmin"
@@ -161,7 +159,7 @@ configuration:
     host: {{ printf "%s.%s.svc.%s" "postfix" (.Values.apps.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
     port: 587
     fromAddress: {{ .Values.smtp.localpartNoReply | quote }}
-    mailDomain: "{{ .Values.global.mailDomain | default .Values.global.domain }}"
+    mailDomain: "{{ .Values.global.domain }}"
     security: "tls"
     skipVerifyPeer: true
 
@@ -175,9 +173,6 @@ configuration:
     token:
       value: {{ .Values.secrets.nextcloud.metricsToken | quote }}
 
-  # A sane default for windows clients would be: `* " | & ? , ; : \ / ~ < >`
-  forbiddenChars: "* \" | & ? , ; : \\ / ~ < >"
-
 containerSecurityContext:
   allowPrivilegeEscalation: false
   capabilities:
@@ -235,33 +230,6 @@ serviceAccount:
     {{ .Values.annotations.nextcloudNextcloudMgmt.serviceAccount | toYaml | nindent 4 }}
 
 theme:
-  background:
-    # Static color background
-    # NOTE: Not available yet because of a bug in Nextcloud 31.X
-    # Ref: https://github.com/nextcloud/server/commit/da51459022d21a569ab8271c5456f69c9316cdad
-    color: {{ .Values.theme.colors.primary | quote }}
-    # PNG or JPEG image background. Overwrites `theme.background.color`
-    imgBase64: {{ .Values.theme.imagery.files.backgroudImg | quote }}
+  {{ .Values.theme | toYaml | nindent 2 }}
 
-  colors:
-    primary: {{ .Values.theme.colors.primary | quote }}
-
-  favicon:
-    pngBase64: {{ .Values.theme.imagery.files.faviconPng | quote }}
-
-  logo:
-    svgBase64: {{ .Values.theme.imagery.logoHeaderSvgB64 | quote }}
-
-  # Overwrites the header color of Nextcloud with the value set in the `integration_swp` app
-  # This can *intentionally* only be adjusted via customizing
-  swpOverrideHeaderColor: true
-
-  texts:
-    slogan: {{ .Values.theme.texts.slogan | quote }}
-    productName: {{ .Values.theme.texts.productName | quote }}
-
-  urls:
-    imprint: {{ .Values.functional.portal.linkLegalNotice | quote }}
-    privacy: {{ .Values.functional.portal.linkPrivacyStatement | quote }}
-    main: {{ printf "%s.%s" .Values.global.hosts.nubus .Values.global.domain }}
 ...

helmfile/apps/nextcloud/values-nextcloud-notifypush-ee.yaml.gotmpl

@@ -1,6 +0,0 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
----
-image:
-  registry: {{ coalesce .Values.repositories.image.registryOpencodeDeEnterprise .Values.global.imageRegistry .Values.images.nextcloud.registry | quote }}
-...

helmfile/apps/nextcloud/values-nextcloud-notifypush.yaml.gotmpl

@@ -1,141 +0,0 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
----
-global:
-  domain: {{ .Values.global.domain | quote }}
-  hosts:
-    {{ .Values.global.hosts | toYaml | nindent 4 }}
-  imagePullSecrets:
-    {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
-
-additionalAnnotations:
-  intents.otterize.com/service-name: "opendesk-nextcloud-notifypush"
-  {{- with .Values.annotations.nextcloudNotifyPush.additional }}
-  {{ . | toYaml | nindent 4 }}
-  {{- end }}
-
-configuration:
-  cache:
-    auth:
-      enabled: true
-      username:
-        value: {{ .Values.cache.nextcloud.username }}
-      password:
-        value: {{ .Values.cache.nextcloud.password | default .Values.secrets.redis.password | quote }}
-    host: {{ .Values.cache.nextcloud.host | quote }}
-    port: {{ .Values.cache.nextcloud.port | quote }}
-    tls: {{ .Values.cache.nextcloud.tls }}
-  database:
-    {{ if eq .Values.databases.nextcloud.type "mariadb" }}
-    type: "mysql"
-    {{ else if eq .Values.databases.nextcloud.type "postgresql" }}
-    type: "postgres"
-    {{ else }}
-    {{ .Values.databases.nextcloud.type | quote }}
-    {{ end }}
-    host: {{ .Values.databases.nextcloud.host | quote }}
-    port: {{ .Values.databases.nextcloud.port | quote }}
-    name: {{ .Values.databases.nextcloud.name | quote }}
-    auth:
-      username:
-        value: {{ .Values.databases.nextcloud.username | quote }}
-      password:
-        {{- if or (eq .Values.databases.nextcloud.type "mariadb") (eq .Values.databases.nextcloud.type "mysql") }}
-        value: {{ .Values.databases.nextcloud.password | default .Values.secrets.mariadb.nextcloudUser | quote }}
-        {{- else if or (eq .Values.databases.nextcloud.type "postgresql") (eq .Values.databases.nextcloud.type "psql") }}
-        value: {{ .Values.databases.nextcloud.password | default .Values.secrets.postgresql.nextcloudUser | quote }}
-        {{- else }}
-        value: {{ .Values.databases.nextcloud.password | quote }}
-        {{- end }}
-  trustedProxy: {{ join " " .Values.cluster.networking.cidr | quote }}
-  # Nextcloud connection
-  # FIXME: Dynamically get the service name of the `opendesk-nextcloud-aio` chart
-  # IDEA: helmfile > service-names.yaml.gotmpl with service names (external/internal)
-  # So this is controller on a more "global" level
-  # TODO: Find a sensible default
-  nextcloudUrl: "http://opendesk-nextcloud-aio"
-  logging:
-    # Default value for logging is "error" we bump it to "info" for better information in logs
-    # NOTE: "trace", which includes "debug" might be too verbose
-    # https://docs.rs/env_logger/latest/env_logger/#enabling-logging
-    level: {{ if .Values.debug.enabled }}"debug"{{ else }}"info"{{ end }}
-
-containerSecurityContext:
-  allowPrivilegeEscalation: false
-  capabilities:
-    drop:
-      - "ALL"
-  enabled: true
-  privileged: false
-  runAsUser: 101
-  runAsGroup: 101
-  seccompProfile:
-    type: "RuntimeDefault"
-  readOnlyRootFilesystem: true
-  runAsNonRoot: true
-  seLinuxOptions:
-    {{ .Values.seLinuxOptions.nextcloud | toYaml | nindent 6 }}
-{{- if .Values.certificate.selfSigned }}
-extraEnvVars:
-  - name: "FS_ENV_CA_CERTIFICATE_PATH"
-    value: "/etc/ssl/certs/ca-certificates.crt"
-extraVolumes:
-  - name: "trusted-cert-secret-volume"
-    secret:
-      secretName: "opendesk-certificates-ca-tls"
-      items:
-        - key: "ca.crt"
-          path: "ca-certificates.crt"
-extraVolumeMounts:
-  - name: "trusted-cert-secret-volume"
-    mountPath: "/etc/ssl/certs/ca-certificates.crt"
-    subPath: "ca-certificates.crt"
-{{- end }}
-image:
-  registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nextcloud.registry | quote }}
-  repository: {{ .Values.images.nextcloud.repository | quote }}
-  imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-  tag: {{ .Values.images.nextcloud.tag | quote }}
-ingress:
-  enabled: {{ .Values.ingress.enabled }}
-  annotations:
-    {{- with .Values.annotations.nextcloudNotifyPush.ingress }}
-      {{ . | toYaml | nindent 6 }}
-    {{- end }}
-  ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
-  host: "{{ .Values.global.hosts.nextcloud }}.{{ .Values.global.domain }}"
-  tls:
-    secretName: {{ .Values.ingress.tls.secretName | quote }}
-metrics:
-  enabled: true
-  service:
-    annotations:
-      {{ .Values.annotations.nextcloudNotifyPush.serviceMetrics | toYaml | nindent 6 }}
-
-podAnnotations:
-  {{ .Values.annotations.nextcloudNotifyPush.pod | toYaml | nindent 4 }}
-podSecurityContext:
-  fsGroup: 101
-# prometheus:
-#   serviceMonitor:
-#     enabled: { .Values.monitoring.prometheus.serviceMonitors.enabled }}
-#     labels:
-#       { .Values.monitoring.prometheus.serviceMonitors.labels | toYaml | nindent 8 }}
-#   prometheusRule:
-#     enabled: { .Values.monitoring.prometheus.prometheusRules.enabled }}
-#     additionalLabels:
-#       { .Values.monitoring.prometheus.prometheusRules.labels | toYaml | nindent 8 }}
-replicaCount: {{ .Values.replicas.nextcloudNotifyPush }}
-resources:
-  {{ .Values.resources.nextcloudNotifyPush | toYaml | nindent 4 }}
-
-service:
-  annotations:
-    {{ .Values.annotations.nextcloudNotifyPush.service | toYaml | nindent 6 }}
-
-serviceAccount:
-  annotations:
-    {{ .Values.annotations.nextcloudNotifyPush.serviceAccount | toYaml | nindent 6 }}
-
-...

helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 global:
   imagePullSecrets:

helmfile/apps/notes/values.yaml.gotmpl

@@ -1,233 +1,145 @@
-# SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
-global:
-  collaborationServerSecret:
-    value: {{ .Values.secrets.notes.collaborationSecret | quote }}
-  fqdn: "{{ .Values.global.hosts.notes }}.{{ .Values.global.domain }}"
-  imagePullSecrets:
-    {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
-  tlsSecretName: {{ .Values.ingress.tls.secretName | quote }}
-  yProviderApiKey:
-    value: {{ .Values.secrets.notes.collaborationSecret | quote }}
+image:
+  repository: {{ printf "%s/%s" (coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.notesBackend.registry) (.Values.images.notesBackend.repository) | quote }}
+  pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
+  tag: {{ .Values.images.notesBackend.tag }}
+  credentials:
+    name: {{ .Values.global.imagePullSecrets | first | quote }}
 
-backend:
-  image:
-    registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.notesBackend.registry | quote }}
-    repository: {{ .Values.images.notesBackend.repository | quote }}
-    pullPolicy: "IfNotPresent"
-    tag: {{ .Values.images.notesBackend.tag | quote }}
-  ingress:
-    annotations:
-      "nginx.ingress.kubernetes.io/proxy-body-size": "{{ .Values.ingress.parameters.bodySize.notes }}"
-      "nginx.ingress.kubernetes.io/proxy-read-timeout": "{{ .Values.ingress.parameters.bodyTimeout.notes }}"
-      "nginx.ingress.kubernetes.io/proxy-send-timeout": "{{ .Values.ingress.parameters.bodyTimeout.notes }}"
-      {{- if .Values.annotations.notesBackend.ingress }}
-      {{ .Values.annotations.notesBackend.ingress | toYaml | nindent 6 }}
-      {{- end }}
-    ingressClassName: {{ .Values.ingress.ingressClassName }}
-  ingressAdmin:
-    enabled: true
-    annotations:
-      {{ .Values.annotations.notesBackend.ingressAdmin | toYaml | nindent 6 }}
-    ingressClassName: {{ .Values.ingress.ingressClassName }}
-  replicaCount: {{ .Values.replicas.notesBackend }}
-  configuration:
-    ai:
-      apiKey:
-        value: {{ .Values.ai.apiKey }}
-      baseUrl: {{ .Values.ai.endpoint }}
-      model: {{ .Values.ai.model | quote }}
-    aws:
-      endpointUrl: {{ printf "https://%s" (.Values.objectstores.notes.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain)) | quote }}
-      s3AccessKeyId:
-        value: {{ .Values.objectstores.notes.username }}
-      s3SecretAccessKey:
-        value: {{ .Values.objectstores.notes.secretKey | default .Values.secrets.minio.notesUser | quote }}
-      storageBucketName: {{ .Values.objectstores.notes.bucket }}
-    collaboration:
-      apiUrl: {{ printf "https://%s.%s/collaboration/api/" .Values.global.hosts.notes .Values.global.domain | quote }}
-      wsUrl: {{ printf "wss://%s.%s/collaboration/ws/" .Values.global.hosts.notes .Values.global.domain | quote }}
-    database:
-      host: {{ .Values.databases.notes.host | quote }}
-      name: {{ .Values.databases.notes.name | quote }}
-      password:
-        value: {{ .Values.databases.notes.password | default .Values.secrets.postgresql.notesUser | quote }}
-      port: {{ .Values.databases.notes.port | quote }}
-      user:
-        value: {{ .Values.databases.notes.username | quote }}
-    email:
-      brandName: "openDesk"
-      from: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}"
-      host: "postfix"
-      port: "25"
-      logoImage: {{ printf "https://%s.%s/univention/portal/icons/entries/swp.notes.svg" .Values.global.hosts.nubus .Values.global.domain | quote }}
-      user:
-        value: {{ printf "%s@%s" "opendesk-system" ( .Values.global.mailDomain | default .Values.global.domain ) }}
-      password:
-        value: {{ .Values.secrets.postfix.opendeskSystemPassword | quote }}
-    oidc:
-      enabled: true
-      rpClientId:
-        value: "opendesk-notes"
-      rpClientSecret:
-        value: {{ .Values.secrets.keycloak.clientSecret.notes | quote }}
-      opJWKSEndpoint: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}/protocol/openid-connect/certs"
-      opAuthorizationEndpoint: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}/protocol/openid-connect/auth"
-      opTokenEndpoint: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}/protocol/openid-connect/token"
-      opUserEndpoint: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}/protocol/openid-connect/userinfo"
-      opLogoutEndpoint: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}/protocol/openid-connect/logout"
-      rpScopes: "openid opendesk-notes-scope"
-      loginRedirectUrl: {{ printf "https://%s.%s" .Values.global.hosts.notes .Values.global.domain | quote }}
-      loginRedirectUrlFailure: {{ printf "https://%s.%s" .Values.global.hosts.nubus .Values.global.domain | quote }}
-      logoutRedirectUrl: {{ printf "https://%s.%s" .Values.global.hosts.nubus .Values.global.domain | quote }}
-      redirectAllowedHosts: {{ printf "https://%s.%s/*" .Values.global.hosts.notes .Values.global.domain | quote }}
-      essentialClaims: "email"
-      fullnameFields: "given_name,family_name"
-      shortnameField: "given_name"
-    django:
-      secretKey:
-        value: {{ .Values.secrets.notes.djangoSecretKey }}
-      createSuperuser: true
-      superuserEmail:
-        value: {{ printf "default.admin@%s" .Values.global.domain | quote }}
-      superuserPassword:
-        value: {{ .Values.secrets.notes.superuser }}
-    frontendTheme: "openDesk"
-    redisUrl:
-      value: "redis://default:{{ .Values.cache.notes.password | default .Values.secrets.redis.password }}@{{ .Values.cache.notes.host }}:{{ .Values.cache.notes.port }}/7"
-  extraEnvVars:
-    - name: "FRONTEND_HOMEPAGE_FEATURE_ENABLED"
-      value: "False"
-    - name: "FRONTEND_FOOTER_FEATURE_ENABLED"
-      value: "False"
-  containerSecurityContext:
-    allowPrivilegeEscalation: false
-    capabilities:
-      drop:
-        - "ALL"
-    enabled: true
-    privileged: false
-    runAsUser: 1001
-    runAsGroup: 1001
-    seccompProfile:
-      type: "RuntimeDefault"
-    readOnlyRootFilesystem: true
-    runAsNonRoot: true
-    seLinuxOptions:
-      {{ .Values.seLinuxOptions.notesBackend | toYaml | nindent 6 }}
-  podAnnotations:
-    {{ .Values.annotations.notesBackend.pod | toYaml | nindent 4 }}
-  podAnnotationsCreateUser:
-    {{ .Values.annotations.notesBackend.createUserJob | toYaml | nindent 4 }}
-  podAnnotationsMigrate:
-    {{ .Values.annotations.notesBackend.migrateJob | toYaml | nindent 4 }}
-  podSecurityContext:
-    enabled: true
-    fsGroup: 1000
-    fsGroupChangePolicy: "Always"
-  resources:
-    {{ .Values.resources.notesBackend | toYaml | nindent 4 }}
-  service:
-    annotations:
-      {{ .Values.annotations.notesBackend.service | toYaml | nindent 6 }}
-  {{- if .Values.certificate.selfSigned }}
-  extraVolumes:
-    - name: "trusted-cert-secret-volume"
-      secret:
-        secretName: "opendesk-certificates-ca-tls"
-        items:
-          - key: "ca.crt"
-            path: "ca-certificates.crt"
-  extraVolumeMounts:
-    - name: "trusted-cert-secret-volume"
-      mountPath: "/usr/local/lib/python3.12/site-packages/certifi/cacert.pem"
-      subPath: "ca-certificates.crt"
-  {{- end }}
+ingress:
+  enabled: {{ .Values.ingress.enabled }}
+  className: {{ .Values.ingress.ingressClassName }}
+  host: "{{ .Values.global.hosts.notes }}.{{ .Values.global.domain }}"
+  tls:
+    enabled: "{{ .Values.ingress.tls.enabled }}"
+    secretName: {{ .Values.ingress.tls.secretName | quote }}
+  annotations:
+    nginx.ingress.kubernetes.io/proxy-body-size: "{{ .Values.ingress.parameters.bodySize.notes }}"
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "{{ .Values.ingress.parameters.bodyTimeout.notes }}"
+    nginx.ingress.kubernetes.io/proxy-send-timeout: "{{ .Values.ingress.parameters.bodyTimeout.notes }}"
+    nginx.org/client-max-body-size: "{{ .Values.ingress.parameters.bodySize.notes }}"
+    nginx.org/proxy-read-timeout: "{{ .Values.ingress.parameters.bodyTimeout.notes }}s"
+    nginx.org/proxy-send-timeout: "{{ .Values.ingress.parameters.bodyTimeout.notes }}s"
+
+ingressCollaborationWS:
+  enabled: {{ .Values.ingress.enabled }}
+  className: {{ .Values.ingress.ingressClassName }}
+  host: "{{ .Values.global.hosts.notes }}.{{ .Values.global.domain }}"
+  path: "/collaboration/ws/"
+  tls:
+    enabled: "{{ .Values.ingress.tls.enabled }}"
+    secretName: {{ .Values.ingress.tls.secretName | quote }}
+  annotations:
+    nginx.ingress.kubernetes.io/enable-websocket: "true"
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "86400"
+    nginx.ingress.kubernetes.io/proxy-send-timeout: "86400"
+    nginx.ingress.kubernetes.io/upstream-hash-by: $arg_room
+    nginx.ingress.kubernetes.io/auth-response-headers: null
+    nginx.ingress.kubernetes.io/auth-url: null
+    {{- with .Values.annotations.notes.ingressCollaborationWS }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
+
+ingressAdmin:
+  enabled: {{ .Values.ingress.enabled }}
+  className: {{ .Values.ingress.ingressClassName }}
+  host: "{{ .Values.global.hosts.notes }}.{{ .Values.global.domain }}"
+  tls:
+    enabled: "{{ .Values.ingress.tls.enabled }}"
+    secretName: {{ .Values.ingress.tls.secretName | quote }}
+  annotations:
+    {{ .Values.annotations.notes.ingressAdmin | toYaml | nindent 4 }}
+
+ingressMedia:
+  enabled: {{ .Values.ingress.enabled }}
+  className: {{ .Values.ingress.ingressClassName }}
+  host: "{{ .Values.global.hosts.notes }}.{{ .Values.global.domain }}"
+  annotations:
+    nginx.ingress.kubernetes.io/auth-response-headers: "Authorization, X-Amz-Date, X-Amz-Content-SHA256"
+    nginx.ingress.kubernetes.io/auth-url: "https://{{ .Values.global.hosts.notes }}.{{ .Values.global.domain }}/api/v1.0/documents/media-auth/"
+    nginx.ingress.kubernetes.io/upstream-vhost: {{ .Values.objectstores.notes.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain) | quote }}
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
+    nginx.ingress.kubernetes.io/use-regex: "true"
+    nginx.ingress.kubernetes.io/rewrite-target: /{{ .Values.objectstores.notes.bucket }}/$1
+    nginx.ingress.kubernetes.io/session-cookie-path: /media
+    {{- with .Values.annotations.notes.ingressMedia }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
+  tls:
+    enabled: "{{ .Values.ingress.tls.enabled }}"
+    secretName: {{ .Values.ingress.tls.secretName | quote }}
+
+ingressCollaborationApi:
+  enabled: {{ .Values.ingress.enabled }}
+  className: {{ .Values.ingress.ingressClassName }}
+  host: "{{ .Values.global.hosts.notes }}.{{ .Values.global.domain }}"
+  path: /collaboration/api/
+  tls:
+    enabled: "{{ .Values.ingress.tls.enabled }}"
+    secretName: {{ .Values.ingress.tls.secretName | quote }}
+  annotations:
+    {{ .Values.annotations.notes.ingressCollaborationAPI | toYaml | nindent 4 }}
+
+serviceMedia:
+  host: {{ .Values.objectstores.notes.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain) | quote }}
+  port: {{ .Values.objectstores.notes.port | default 443 }}
+  annotations:
+    {{ .Values.annotations.notes.serviceMedia | toYaml | nindent 4 }}
 
 frontend:
   image:
-    registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.notesFrontend.registry | quote }}
-    repository: {{ .Values.images.notesFrontend.repository | quote }}
-    pullPolicy: "IfNotPresent"
-    tag: {{ .Values.images.notesFrontend.tag | quote }}
-  ingress:
-    enabled: true
-    annotations:
-      {{ .Values.annotations.notesFrontend.ingress | toYaml | nindent 6 }}
-    ingressClassName: {{ .Values.ingress.ingressClassName }}
-  ingressMedia:
-    enabled: true
-    annotations:
-      {{ .Values.annotations.notesFrontend.ingressMedia | toYaml | nindent 6 }}
-    ingressClassName: {{ .Values.ingress.ingressClassName }}
-  extraEnvVars:
-    - name: "ICS_BASE_URL"
-      value: {{ printf "https://%s.%s" .Values.global.hosts.intercomService .Values.global.domain | quote }}
-    - name: "PORTAL_BASE_URL"
-      value: {{ printf "https://%s.%s" .Values.global.hosts.nubus .Values.global.domain | quote }}
-  configuration:
-    objectStoreHost: {{ printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain | quote }}
+    repository: {{ printf "%s/%s" (coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.notesFrontend.registry) (.Values.images.notesFrontend.repository) | quote }}
+    pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
+    tag: {{ .Values.images.notesFrontend.tag }}
+  envVars:
+    PORT: 8080
+    NEXT_PUBLIC_API_ORIGIN: {{ printf "https://%s.%s" .Values.global.hosts.notes .Values.global.domain | quote }}
+    NEXT_PUBLIC_MEDIA_URL: {{ printf "https://%s" (.Values.objectstores.notes.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain)) | quote }}
+  runtimeEnvs:
+    ICS_BASE_URL: {{ printf "https://%s.%s" .Values.global.hosts.intercomService .Values.global.domain | quote }}
+    PORTAL_BASE_URL: {{ printf "https://%s.%s" .Values.global.hosts.nubus .Values.global.domain | quote }}
+  replicas: {{ .Values.replicas.notesFrontend }}
   resources:
     {{ .Values.resources.notesFrontend | toYaml | nindent 4 }}
-  containerSecurityContext:
+  securityContext:
     allowPrivilegeEscalation: false
     capabilities:
       drop:
         - "ALL"
-    enabled: true
     privileged: false
-    runAsUser: 1000
-    runAsGroup: 1000
+    runAsUser: 1001
+    runAsGroup: 1001
     seccompProfile:
       type: "RuntimeDefault"
     readOnlyRootFilesystem: true
     runAsNonRoot: true
     seLinuxOptions:
       {{ .Values.seLinuxOptions.notesFrontend | toYaml | nindent 6 }}
+
   podAnnotations:
     {{ .Values.annotations.notesFrontend.pod | toYaml | nindent 4 }}
-  podSecurityContext:
-    enabled: true
-    fsGroup: 1000
-    fsGroupChangePolicy: "Always"
+
   service:
     annotations:
       {{ .Values.annotations.notesFrontend.service | toYaml | nindent 6 }}
-  serviceMedia:
-    annotations:
-      {{ .Values.annotations.notesFrontend.service | toYaml | nindent 6 }}
 
-y-provider:
+yProvider:
   image:
-    registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.notesYProvider.registry | quote }}
-    repository: {{ .Values.images.notesYProvider.repository | quote }}
-    pullPolicy: "IfNotPresent"
+    repository: {{ printf "%s/%s" (coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.notesYProvider.registry) (.Values.images.notesYProvider.repository) | quote }}
+    pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     tag: {{ .Values.images.notesYProvider.tag }}
-  replicaCount: 1
-  debug: true
-  {{- if .Values.certificate.selfSigned }}
-  extraEnvVars:
-    - name: "NODE_EXTRA_CA_CERTS"
-      value: "/etc/ssl/certs/cacert.pem"
-  extraVolumes:
-    - name: "trusted-cert-secret-volume"
-      secret:
-        secretName: "opendesk-certificates-ca-tls"
-        items:
-          - key: "ca.crt"
-            path: "ca-certificates.crt"
-  extraVolumeMounts:
-    - name: "trusted-cert-secret-volume"
-      mountPath: "/etc/ssl/certs/cacert.pem"
-      subPath: "ca-certificates.crt"
-  {{- end }}
-  containerSecurityContext:
+  resources:
+    {{ .Values.resources.notesYProvider | toYaml | nindent 4 }}
+  replicas: {{ .Values.replicas.notesYProvider }}
+  securityContext:
     allowPrivilegeEscalation: false
     capabilities:
       drop:
         - "ALL"
-    enabled: true
     privileged: false
     runAsUser: 1001
     runAsGroup: 1001
@@ -237,21 +149,139 @@ y-provider:
     runAsNonRoot: true
     seLinuxOptions:
       {{ .Values.seLinuxOptions.notesBackend | toYaml | nindent 6 }}
-  ingressCollaborationApi:
-    annotations:
-      {{ .Values.annotations.notesYProvider.ingressCollaborationAPI | toYaml | nindent 6 }}
-    ingressClassName: {{ .Values.ingress.ingressClassName }}
-  ingressCollaborationWs:
-    annotations:
-      {{ .Values.annotations.notesYProvider.ingressCollaborationWS | toYaml | nindent 6 }}
-    ingressClassName: {{ .Values.ingress.ingressClassName }}
+  envVars:
+    COLLABORATION_BACKEND_BASE_URL: {{ printf "https://%s.%s" .Values.global.hosts.notes .Values.global.domain | quote }}
+    COLLABORATION_LOGGING: {{ if .Values.debug.enabled }}"true"{{ else }}"false"{{ end }}
+    COLLABORATION_SERVER_ORIGIN: {{ printf "https://%s.%s" .Values.global.hosts.notes .Values.global.domain | quote }}
+    COLLABORATION_SERVER_SECRET: {{ .Values.secrets.notes.collaborationSecret | quote }}
+    Y_PROVIDER_API_KEY: {{ .Values.secrets.notes.collaborationSecret | quote }}
+
   podAnnotations:
     {{ .Values.annotations.notesYProvider.pod | toYaml | nindent 4 }}
-  podSecurityContext:
-    enabled: true
-    fsGroup: 1001
-    fsGroupChangePolicy: "Always"
+
   service:
     annotations:
       {{ .Values.annotations.notesYProvider.service | toYaml | nindent 6 }}
+
+oidc:
+  clientId: "opendesk-notes"
+  clientSecret: {{ .Values.secrets.keycloak.clientSecret.notes | quote }}
+
+aiApiKey: {{ .Values.ai.apiKey }}
+aiBaseUrl: {{ .Values.ai.endpoint }}
+
+djangoSuperUserEmail: "default.admin@{{ .Values.global.domain }}"
+djangoSuperUserPass: {{ .Values.secrets.notes.superuser }}
+djangoSecretKey: {{ .Values.secrets.notes.djangoSecretKey }}
+
+backend:
+  image:
+    repository: {{ printf "%s/%s" (coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.notesBackend.registry) (.Values.images.notesBackend.repository) | quote }}
+    pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
+    tag: {{ .Values.images.notesBackend.tag }}
+  replicas: {{ .Values.replicas.notesBackend }}
+  envVars:
+    DB_HOST: {{ .Values.databases.notes.host | quote }}
+    DB_NAME: {{ .Values.databases.notes.name | quote }}
+    DB_USER: {{ .Values.databases.notes.username | quote }}
+    DB_PASSWORD: {{ .Values.databases.notes.password | default .Values.secrets.postgresql.notesUser | quote }}
+    DB_PORT: {{ .Values.databases.notes.port | quote }}
+    POSTGRES_DB: {{ .Values.databases.notes.name | quote }}
+    POSTGRES_USER: {{ .Values.databases.notes.username | quote }}
+    POSTGRES_PASSWORD: {{ .Values.databases.notes.password | default .Values.secrets.postgresql.notesUser | quote }}
+    FRONTEND_THEME: "openDesk"
+    REDIS_URL: "redis://default:{{ .Values.cache.notes.password | default .Values.secrets.redis.password }}@{{ .Values.cache.notes.host }}:{{ .Values.cache.notes.port }}/7"
+    AWS_S3_ENDPOINT_URL: {{ printf "https://%s" (.Values.objectstores.notes.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain)) | quote }}
+    AWS_S3_ACCESS_KEY_ID: {{ .Values.objectstores.notes.username }}
+    AWS_S3_SECRET_ACCESS_KEY: {{ .Values.objectstores.notes.secretKey | default .Values.secrets.minio.notesUser | quote }}
+    AWS_STORAGE_BUCKET_NAME: {{ .Values.objectstores.notes.bucket }}
+    DJANGO_CSRF_TRUSTED_ORIGINS: {{ printf "https://%s.%s" .Values.global.hosts.notes .Values.global.domain | quote }}
+    DJANGO_SITE_DOMAIN: {{ printf "%s.%s" .Values.global.hosts.notes .Values.global.domain | quote }}
+    DJANGO_SITE_NAME: {{ printf "%s.%s" .Values.global.hosts.notes .Values.global.domain | quote }}
+    DJANGO_CONFIGURATION: Production
+    DJANGO_ALLOWED_HOSTS: "*"
+    DJANGO_SECRET_KEY: {{ .Values.secrets.notes.djangoSecretKey }}
+    DJANGO_SETTINGS_MODULE: impress.settings
+    DJANGO_SUPERUSER_PASSWORD: {{ .Values.secrets.notes.superuser }}
+    DJANGO_EMAIL_BRAND_NAME: "openDesk"
+    DJANGO_EMAIL_LOGO_IMG: {{ printf "https://%s.%s/univention/portal/icons/entries/swp.notes.svg" .Values.global.hosts.nubus .Values.global.domain | quote }}
+    DJANGO_EMAIL_FROM: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}"
+    DJANGO_EMAIL_HOST: "postfix"
+    DJANGO_EMAIL_PORT: 25
+    DJANGO_EMAIL_USE_SSL: False
+    DJANGO_EMAIL_HOST_USER: {{ printf "%s@%s" "opendesk-system" ( .Values.global.mailDomain | default .Values.global.domain ) }}
+    DJANGO_EMAIL_HOST_PASSWORD: {{ .Values.secrets.postfix.opendeskSystemPassword | quote }}
+    DJANGO_EMAIL_USE_TLS: False
+    OIDC_RP_CLIENT_ID: "opendesk-notes"
+    OIDC_RP_CLIENT_SECRET: {{ .Values.secrets.keycloak.clientSecret.notes | quote }}
+    OIDC_OP_JWKS_ENDPOINT: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}/protocol/openid-connect/certs"
+    OIDC_OP_AUTHORIZATION_ENDPOINT: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}/protocol/openid-connect/auth"
+    OIDC_OP_TOKEN_ENDPOINT: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}/protocol/openid-connect/token"
+    OIDC_OP_USER_ENDPOINT: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}/protocol/openid-connect/userinfo"
+    OIDC_OP_LOGOUT_ENDPOINT: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}/protocol/openid-connect/logout"
+    OIDC_RP_SIGN_ALGO: RS256
+    OIDC_RP_SCOPES: "openid opendesk-notes-scope"
+    OIDC_USERINFO_SHORTNAME_FIELD: "given_name"
+    OIDC_USERINFO_FULLNAME_FIELDS: "given_name,family_name"
+    USER_OIDC_ESSENTIAL_CLAIMS: "email"
+    OIDC_REDIRECT_ALLOWED_HOSTS: {{ printf "https://%s.%s/*" .Values.global.hosts.notes .Values.global.domain | quote }}
+    OIDC_AUTH_REQUEST_EXTRA_PARAMS: "{}"
+    OIDC_RENEW_ID_TOKEN: "False"
+    LOGIN_REDIRECT_URL: {{ printf "https://%s.%s" .Values.global.hosts.notes .Values.global.domain | quote }}
+    LOGIN_REDIRECT_URL_FAILURE: {{ printf "https://%s.%s" .Values.global.hosts.nubus .Values.global.domain | quote }}
+    LOGOUT_REDIRECT_URL: {{ printf "https://%s.%s" .Values.global.hosts.nubus .Values.global.domain | quote }}
+    AI_BASE_URL: {{ .Values.ai.endpoint | quote }}
+    AI_API_KEY: {{ .Values.ai.apiKey | quote }}
+    AI_MODEL: {{ .Values.ai.model | quote }}
+    Y_PROVIDER_API_KEY: {{ .Values.secrets.notes.collaborationSecret | quote }}
+    Y_PROVIDER_API_BASE_URL: {{ printf "https://%s.%s/api/" .Values.global.hosts.notes .Values.global.domain | quote }}
+    COLLABORATION_API_URL: {{ printf "https://%s.%s/collaboration/api/" .Values.global.hosts.notes .Values.global.domain | quote }}
+    COLLABORATION_SERVER_ORIGIN: {{ printf "https://%s.%s" .Values.global.hosts.notes .Values.global.domain | quote }}
+    COLLABORATION_SERVER_SECRET: {{ .Values.secrets.notes.collaborationSecret | quote }}
+    COLLABORATION_WS_URL:  {{ printf "wss://%s.%s/collaboration/ws/" .Values.global.hosts.notes .Values.global.domain | quote }}
+    FRONTEND_HOMEPAGE_FEATURE_ENABLED: False
+    FRONTEND_FOOTER_FEATURE_ENABLED: False
+  migrate:
+    command:
+      - "/bin/sh"
+      - "-c"
+      - |
+        python manage.py migrate --no-input
+    restartPolicy: Never
+
+  migrateJobAnnotations:
+    {{ .Values.annotations.notesBackend.migrateJob | toYaml | nindent 4 }}
+
+  createsuperuser:
+    command:
+      - "/bin/sh"
+      - "-c"
+      - |
+        python manage.py createsuperuser --email default.admin@{{ .Values.global.domain }} --password {{ .Values.secrets.notes.superuser }}
+    restartPolicy: Never
+
+  podAnnotations:
+    {{ .Values.annotations.notesBackend.pod | toYaml | nindent 4 }}
+
+  resources:
+    {{ .Values.resources.notesBackend | toYaml | nindent 4 }}
+  securityContext:
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop:
+        - "ALL"
+    privileged: false
+    runAsUser: 1001
+    runAsGroup: 1001
+    seccompProfile:
+      type: "RuntimeDefault"
+    readOnlyRootFilesystem: true
+    runAsNonRoot: true
+    seLinuxOptions:
+      {{ .Values.seLinuxOptions.notesBackend | toYaml | nindent 6 }}
+
+  service:
+    annotations:
+      {{ .Values.annotations.notesBackend.service | toYaml | nindent 6 }}
+
 ...

helmfile/apps/nubus/helmfile-child.yaml.gotmpl

@@ -10,7 +10,7 @@ repositories:
     password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
     oci: true
     url:
-      "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default  .Values.charts.nubus.registry }}/{{ .Values.charts.nubus.repository }}"
+      "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.nubus.registry }}/{{ .Values.charts.nubus.repository }}"
   # Intercom Service
   # Source: https://gitlab.souvap-univention.de/souvap/tooling/charts/intercom-service
   - name: "intercom-service-repo"

helmfile/apps/nubus/values-intercom-service.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 additionalAnnotations:
   {{ .Values.annotations.nubusIntercomService.additional | toYaml | nindent 2 }}
@@ -51,36 +53,31 @@ global:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 
 ics:
-  session:
-    secret: {{ .Values.secrets.intercom.secret | quote }}
+  secret: {{ .Values.secrets.intercom.secret | quote }}
   issuerBaseUrl: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}"
   originRegex: "{{ .Values.global.domain }}"
   enableSessionCookie: true
   userUniqueMapper: {{ if .Values.functional.chat.matrix.profile.useImmutableIdentifierForLocalpart }}"opendesk_useruuid"{{ else }}"opendesk_username"{{ end }}
   usernameClaim: "opendesk_username"
-  logLevel: {{ if .Values.debug.enabled }}"DEBUG"{{ else }}"INFO"{{ end }}
   keycloak:
     realm: {{ .Values.platform.realm | quote }}
   default:
     domain: {{ .Values.global.domain | quote }}
   oidc:
     id: "opendesk-intercom"
-    clientSecret: {{ .Values.secrets.keycloak.clientSecret.intercom | quote }}
+    secret: {{ .Values.secrets.keycloak.clientSecret.intercom | quote }}
   matrix:
+    asSecret: {{ .Values.secrets.intercom.synapseAsToken | quote }}
     subdomain: {{ .Values.global.hosts.synapse | quote }}
     serverName: "{{ .Values.global.hosts.synapse }}.{{ .Values.global.domain }}"
-    auth:
-      applicationServiceSecret: {{ .Values.secrets.intercom.synapseAsToken | quote }}
   nordeck:
     subdomain: {{ .Values.global.hosts.matrixNeoDateFixBot | quote }}
   portal:
-    auth:
-      sharedSecret: {{ .Values.secrets.centralnavigation.apiKey | quote }}
+    apiKey: {{ .Values.secrets.centralnavigation.apiKey | quote }}
   redis:
     host: {{ .Values.cache.intercomService.host | quote }}
     port: {{ .Values.cache.intercomService.port }}
-    auth:
-      password: {{ .Values.cache.intercomService.password | default .Values.secrets.redis.password | quote }}
+    password: {{ .Values.cache.intercomService.password | default .Values.secrets.redis.password | quote }}
   openxchange:
     oci: true
     url: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}"
@@ -121,20 +118,21 @@ provisioning:
   # client's claims this way.
   enabled: false
   config:
-    clientBaseUrl: "https://{{ .Values.global.hosts.intercomService }}.{{ .Values.global.domain }}"
+    nubusBaseUrl: "https://{{ .Values.global.hosts.intercomService }}.{{ .Values.global.domain }}"
     keycloak:
+      url: "http://ums-keycloak:8080/realms/{{ .Values.platform.realm }}/"
+      username: "kcadmin"
       realm: {{ .Values.platform.realm | quote }}
       connection:
-        protocol: "http"
-        host: "ums-keycloak"
-        port: 8080
-      auth:
-        username: "kcadmin"
-        existingSecret:
-          name: "ums-opendesk-keycloak-credentials"
-          keyMapping:
-            password: "admin_password"
+        host: "{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}"
+        baseUrl: "http://ums-keycloak:8080"
+      credentialSecret:
+        name: "ums-opendesk-keycloak-credentials"
         key: "admin_password"
+    ics_client:
+      clientSecret: {{ .Values.secrets.keycloak.clientSecret.intercom | quote }}
+      credentialSecret:
+        key: "ics_secret"
   image:
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusWaitForDependency.registry | quote }}

helmfile/apps/nubus/values-nginx-s3-gateway.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 global:
   imagePullSecrets:

helmfile/apps/nubus/values-nubus-guardian.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 #
 # This file is currently optional for customizing purposes only. It will be a mandatory part of Nubus in a later release.

helmfile/apps/nubus/values-nubus.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 additionalAnnotations:
   {{ .Values.annotations.nubus.additional | toYaml | nindent 2 }}
@@ -113,11 +115,6 @@ global:
           token_validity_period: 172800
           blacklist:
             groups: __DELETE_KEY__
-          limit:
-            total:
-              day: {{ .Values.security.passwordResetLimits.day }}
-              hour: {{ .Values.security.passwordResetLimits.hour }}
-              minute: {{ .Values.security.passwordResetLimits.minute }}
 
 ingress:
   annotations:
@@ -264,9 +261,6 @@ keycloak:
 nubusGuardian:
   enabled: false
 
-nubusTwofaHelpdesk:
-  enabled: false
-
 nubusNotificationsApi:
   enabled: false
   additionalAnnotations:
@@ -415,12 +409,8 @@ nubusPortalFrontend:
   portalFrontend:
     branding:
       css: {{ .Values.theme.styles.portal.main | toJson }}
+      # Requires .ico, .svg does not work.
       favicon: {{ .Values.theme.imagery.portal.faviconIco | toJson }}
-      faviconSvg: {{ .Values.theme.imagery.portal.faviconSvg | toJson }}
-      favicon96Png: {{ .Values.theme.imagery.portal.favicon96Png | toJson }}
-      appleTouchIcon: {{ .Values.theme.imagery.portal.appleTouchIcon | toJson }}
-      webManifestIcon192: {{ .Values.theme.imagery.portal.webManifestIcon192 | toJson }}
-      webManifestIcon512: {{ .Values.theme.imagery.portal.webManifestIcon512 | toJson }}
       # The actual `logo` is set in customizing image, the logo down here is for waiting spinner.
       logo: {{ .Values.theme.imagery.portal.waitingSpinnerSvg | toJson }}
       backgroundImage: {{ .Values.theme.imagery.portal.backgroundSvg | toJson }}
@@ -550,7 +540,7 @@ nubusKeycloakExtensions:
       newDeviceLoginNotificationEnable: {{ if .Values.functional.authentication.newDeviceLoginNotification.enabled }}"True"{{ else }}"False"{{ end }}
       logLevel: {{ if .Values.debug.enabled }}"DEBUG"{{ else }}"WARN"{{ end }}
       newDeviceLoginSubject: "New device login on your {{ .Values.theme.texts.productName }} account"
-      mailFrom: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}"
+      mailFrom: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}"
     image:
       registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusKeycloakExtensionHandler.registry | quote }}
       repository: {{ .Values.images.nubusKeycloakExtensionHandler.repository }}
@@ -690,6 +680,7 @@ nubusPortalServer:
         {{- with .Values.annotations.nubusPortalServer.ingress }}
         {{ . | toYaml | nindent 8 }}
         {{- end }}
+
     certManager:
       enabled: false
     tls:
@@ -713,25 +704,6 @@ nubusPortalServer:
         sharedSecret: {{ .Values.secrets.centralnavigation.apiKey | quote }}
     featureToggles:
       notifications_api: false
-      centered_layout: true
-      newsfeed: {{ and .Values.apps.xwiki.enabled .Values.functional.portal.newsfeed.enabled }}
-      umc_session_refresh: true
-      welcome_message: {{ .Values.functional.portal.welcomeMessage.enabled }}
-    newsfeed:
-      feedType: "xwiki"
-      feedUrl:
-        en_US: {{ printf "https://%s.%s/wiki/bin/get/Blog/BlogRss?xpage=plain&blog=openDesk.Newsfeed.WebHome" .Values.global.hosts.intercomService .Values.global.domain }}
-        de_DE: {{ printf "https://%s.%s/wiki/bin/get/Blog/BlogRss?xpage=plain&blog=openDesk.Newsfeed.WebHome" .Values.global.hosts.intercomService .Values.global.domain }}
-      homeUrl:
-        en_US: {{ printf "https://%s.%s/bin/view/openDesk/Newsfeed/" .Values.global.hosts.xwiki .Values.global.domain }}
-        de_DE: {{ printf "https://%s.%s/bin/view/openDesk/Newsfeed/" .Values.global.hosts.xwiki .Values.global.domain }}
-      icsSilentLoginUrl: {{ printf "https://%s.%s/silent" .Values.global.hosts.intercomService .Values.global.domain }}
-    objectStorageEndpoint: {{ printf "https://%s" (.Values.objectstores.nubus.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain)) | quote }}
-    objectStorageBucket: {{ .Values.objectstores.nubus.bucket | quote }}
-    objectStorageCredentialSecret:
-      name: "ums-portal-server-minio-opendesk-credentials"
-      accessKeyKey: "access-key-id"
-      secretKeyKey: "secret-key-id"
   replicaCount: {{ .Values.replicas.umsPortalServer }}
   resources:
     {{ .Values.resources.umsPortalServer | toYaml | nindent 4 }}
@@ -795,7 +767,6 @@ nubusUdmRestApi:
     enabled: {{ .Values.functional.externalServices.nubus.udmRestApi.enabled }}
     annotations:
       nginx.ingress.kubernetes.io/proxy-buffer-size: "64k"
-      nginx.ingress.kubernetes.io/proxy-busy-buffers-size: "128k"
       nginx.ingress.kubernetes.io/configuration-snippet-disabled: |
         rewrite ^/univention(/udm/.*)$ $1 break;
       nginx.ingress.kubernetes.io/use-regex: "true"
@@ -1146,11 +1117,6 @@ nubusUdmListener:
     registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusProvisioningUdmListener.registry | quote }}
     repository: {{ .Values.images.nubusProvisioningUdmListener.repository }}
     tag: {{ .Values.images.nubusProvisioningUdmListener.tag }}
-  waitForDependency:
-    image:
-      registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusWaitForDependency.registry | quote }}
-      repository: {{ .Values.images.nubusWaitForDependency.repository }}
-      tag: {{ .Values.images.nubusWaitForDependency.tag }}
   persistence:
     size: {{ .Values.persistence.storages.nubusUdmListener.size | quote }}
 #    storageClass: -- coalesce .Values.persistence.storages.nubusUdmListener.storageClassName .Values.persistence.storageClassNames.RWO | quote --
@@ -1311,15 +1277,10 @@ nubusStackDataUms:
     portalNotesLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.notes .Values.global.domain }}
     portalTitleDE: "Portal - {{ .Values.theme.texts.productName }}"
     portalTitleEN: "Portal - {{ .Values.theme.texts.productName }}"
-    portalLinkLegalNotice: {{ .Values.functional.portal.linkLegalNotice | quote }}
-    portalLinkPrivacyStatement: {{ .Values.functional.portal.linkPrivacyStatement | quote }}
-    portalLinkDocumentation: {{ .Values.functional.portal.linkDocumentation | quote }}
-    portalLinkSupport: {{ .Values.functional.portal.linkSupport | quote }}
-    portalLinkFeedback: {{ .Values.functional.portal.linkFeedback | quote }}
+    portalLinkLegalNotice: {{ .Values.functional.portal.linkLegalNotice }}
+    portalLinkPrivacyStatement: {{ .Values.functional.portal.linkPrivacyStatement }}
     oxDefaultContext: "1"
     oxContextHidden: true
-    oxSystemUserPassword: {{ .Values.secrets.nubus.ldapSearch.ox }}
-    portalOxLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.openxchange .Values.global.domain }}
     ldapSearchUsers:
       {{- range $username, $password := .Values.secrets.nubus.ldapSearch }}
       - username: {{ printf "ldapsearch_%s" $username | quote }}

helmfile/apps/nubus/values-opendesk-keycloak-bootstrap.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 global:
   domain: "{{ .Values.global.domain }}"
@@ -527,10 +529,7 @@ config:
         publicClient: false
         authorizationServicesEnabled: false
         attributes:
-          use.refresh.tokens: true
           backchannel.logout.session.required: true
-          standard.token.exchange.enabled: true
-          standard.token.exchange.enableRefreshRequestedTokenType: "SAME_SESSION"
           backchannel.logout.revoke.offline.tokens: true
           backchannel.logout.url: "https://{{ .Values.global.hosts.intercomService }}.{{ .Values.global.domain }}/backchannel-logout"
         protocolMappers:

helmfile/apps/open-xchange/values-dovecot-enterprise.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 image:
   registry: {{ coalesce .Values.repositories.image.registryOpencodeDeEnterprise .Values.global.imageRegistry .Values.images.dovecot.registry | quote }}
@@ -8,7 +10,7 @@ image:
   pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 
 imageInitCassandra:
-  registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.cassandra.registry | quote }}
+  registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.cassandra.registry | quote }}
   repository: {{ .Values.images.cassandra.repository | quote }}
   tag: {{ .Values.images.cassandra.tag | quote }}
   pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
@@ -37,11 +39,11 @@ dovecot:
     bucket: {{ .Values.objectstores.dovecot.bucket | quote }}
     encryption:
       privateKey:
-        value: {{ requiredEnv "DOVECOT_CRYPT_PRIVATE_KEY" | quote }}
+        value: {{ env "DOVECOT_CRYPT_PRIVATE_KEY" | quote }}
       publicKey:
-        value: {{ requiredEnv "DOVECOT_CRYPT_PUBLIC_KEY" | quote }}
+        value: {{ env "DOVECOT_CRYPT_PUBLIC_KEY" | 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:
-      value: {{ .Values.objectstores.dovecot.secretKey | default .Values.secrets.minio.dovecotUser | quote }}
+      value: {{ .Values.secrets.minio.dovecotUser | quote }}
 ...

helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 commonAnnotations:
   {{ .Values.annotations.openxchangeDovecot.common | toYaml | nindent 2 }}
@@ -37,7 +39,6 @@ dovecot:
     dn: "uid=ldapsearch_dovecot,cn=users,{{ .Values.ldap.baseDn }}"
     password:
       value: {{ .Values.secrets.nubus.ldapSearch.dovecot | quote }}
-  loginTrustedNetworks: {{ join " " .Values.cluster.networking.cidr | quote }}
   oidc:
     enabled: true
     clientID:
@@ -47,14 +48,7 @@ dovecot:
     introspectionHost: {{ printf "%s.%s" .Values.global.hosts.keycloak .Values.global.domain | quote }}
     introspectionPath: "/realms/{{ .Values.platform.realm }}/protocol/openid-connect/token/introspect"
     usernameAttribute: "opendesk_username"
-  quotaRules:
-    - "*:storage={{ mul .Values.functional.groupware.quota.default 1024 }}M"
-    - "Trash:storage=+{{ div (mul (mul .Values.functional.groupware.quota.default 1024) 20) 100 }}M"
-    - "LAZY_EXPUNGE:ignore"
-  quotaGrace: "{{ div (mul (mul .Values.functional.groupware.quota.default 1024) 10) 100 }}M"
-  sieve:
-    notify:
-      mailtoEnvelopeFrom: "orig_recipient"
+  loginTrustedNetworks: {{ join " " .Values.cluster.networking.cidr | quote }}
   submission:
     enabled: true
     ssl: "no"

helmfile/apps/open-xchange/values-openxchange-bootstrap.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 additionalAnnotations:
   argocd.argoproj.io/hook: "Sync"

helmfile/apps/open-xchange/values-openxchange-contact-picker.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 appsuite:
   core-mw:

helmfile/apps/open-xchange/values-openxchange-enterprise.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 appsuite:
   plugins-ui:

helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 global:
   hostname: "{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}"
@@ -120,9 +122,6 @@ appsuite:
         annotations:
           {{ .Values.annotations.openxchangeAppsuiteIngress.trailslash | toYaml | nindent 10 }}
       rest-routes-admin:
-        {{- if .Values.technical.oxAppSuite.provisioning.dedicatedCoreMwPod }}
-        enabled: false
-        {{- end }}
         annotations:
           {{ .Values.annotations.openxchangeAppsuiteIngress.restRoutesAdmin | toYaml | nindent 10 }}
       rest-routes-advertisement:
@@ -218,78 +217,6 @@ appsuite:
         productName: {{ .Values.theme.texts.productName | quote }}
         oidcLogin: true
         oidcPath: "/oidc/"
-    defaultScaling:
-      nodes:
-        default:
-          roles:
-            - http-api
-            - sync
-            - admin
-            - businessmobility
-            - request-analyzer
-    roles:
-      admin:
-        values:
-          features:
-            status:
-              admin: "enabled"
-          packages:
-            status:
-              open-xchange-admin-contextrestore: "enabled"
-              open-xchange-admin-oauth-provider: "enabled"
-              open-xchange-admin-soap: "enabled"
-              open-xchange-admin-soap-usercopy: "enabled"
-              open-xchange-admin-user-copy: "enabled"
-      {{- if .Values.functional.migration.oxAppSuite.enabled }}
-      migration:
-        values:
-          packages:
-            status:
-              open-xchange-oidc: "disabled"
-              open-xchange-authentication-masterpassword: "enabled"
-          properties:
-            com.openexchange.calendar.allowOrganizerPartStatChanges: "true"
-          propertiesFiles:
-            /opt/open-xchange/etc/masterpassword-authentication.properties:
-              com.openexchange.authentication.masterpassword.password: {{ .Values.secrets.oxAppSuite.migrationsMasterPassword | quote }}
-        services:
-          - type: ClusterIP
-            ports:
-              - port: 80
-                targetPort: http
-                protocol: TCP
-                name: http
-      {{- end }}
-    scaling:
-      nodes:
-        {{- if .Values.functional.migration.oxAppSuite.enabled }}
-        migration:
-          replicas: 1
-          roles:
-            - "migration"
-        {{- end }}
-        {{- if .Values.technical.oxAppSuite.provisioning.dedicatedCoreMwPod }}
-        groupware:
-          replicas: {{ .Values.replicas.openxchangeCoreMW }}
-          roles:
-            - "http-api"
-            - "sync"
-            - "businessmobility"
-            - "request-analyzer"
-        admin:
-          replicas: 1
-          roles:
-            - "admin"
-        {{- else }}
-        groupware:
-          replicas: {{ .Values.replicas.openxchangeCoreMW }}
-          roles:
-            - "http-api"
-            - "sync"
-            - "businessmobility"
-            - "request-analyzer"
-            - "admin"
-        {{- end }}
     masterAdmin: "admin"
     masterPassword: {{ .Values.secrets.oxAppSuite.adminPassword | quote }}
     hzGroupName: "hzgroup"
@@ -311,10 +238,6 @@ appsuite:
         # admin: enabled
         documents: "disabled"
         guard: "enabled"
-        # disabling admin role breaks webmail
-        # {{- if .Values.technical.oxAppSuite.provisioning.dedicatedCoreMwPod }}
-        # admin: "disabled"
-        # {{- end }}
     gotenberg:
       enabled: true
       imagePullSecrets:
@@ -354,8 +277,13 @@ appsuite:
           chown open-xchange:open-xchange /opt/open-xchange/guard-files
     packages:
       status:
+        {{- if .Values.functional.migration.oxAppSuite.enabled }}
+        open-xchange-oidc: "disabled"
+        open-xchange-authentication-masterpassword: "enabled"
+        {{- else }}
         open-xchange-oidc: "enabled"
         open-xchange-authentication-masterpassword: "disabled"
+        {{- end }}
         open-xchange-authentication-oauth: "disabled"
         open-xchange-authentication-database: "disabled"
         open-xchange-authentication-ldap: "disabled"
@@ -369,17 +297,6 @@ appsuite:
         open-xchange-hostname-config-cascade: "enabled"
         # Enable s3 storage
         open-xchange-filestore-s3: "enabled"
-        {{- if .Values.technical.oxAppSuite.provisioning.dedicatedCoreMwPod }}
-        # disabling admin feature breaks webmail, so only sub packages are disabled:
-        open-xchange-admin-contextrestore: "disabled"
-        open-xchange-admin-oauth-provider: "disabled"
-        open-xchange-admin-soap: "disabled"
-        open-xchange-admin-soap-usercopy: "disabled"
-        open-xchange-admin-user-copy: "disabled"
-        {{- end }}
-        {{- if .Values.functional.groupware.davSupport.enabled }}
-        open-xchange-authentication-application-storage-rdb: "enabled"
-        {{- end }}
     properties:
       com.openexchange.hostname: {{ printf "%s.%s" .Values.global.hosts.openxchange .Values.global.domain }}
       com.openexchange.UIWebPath: "/appsuite/"
@@ -439,7 +356,7 @@ 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"
-      # Requirements for OX Connector
+      # Requirements for OX-Connector
       com.openexchange.user.enforceUniqueDisplayName: "false"
       com.openexchange.folderstorage.database.preferDisplayName: "false"
       # Mailfilter
@@ -502,9 +419,6 @@ appsuite:
       com.openexchange.carddav.url: {{ printf "https://%s.%s/carddav/[folderId]" .Values.global.hosts.openxchangeDav .Values.global.domain }}
       com.openexchange.client.onboarding.caldav.url: {{ printf "https://%s.%s/" .Values.global.hosts.openxchangeDav .Values.global.domain }}
       com.openexchange.client.onboarding.carddav.url: {{ printf "https://%s.%s/" .Values.global.hosts.openxchangeDav .Values.global.domain }}
-      {{- else }}
-      com.openexchange.caldav.enabled: "false"
-      com.openexchange.carddav.enabled: "false"
       {{- end }}
       # Other
       com.openexchange.secret.secretSource: "\"<user-id> + '@' + <context-id> + '/' + <random>\""
@@ -515,12 +429,6 @@ appsuite:
       com.openexchange.net.ssl.custom.truststore.path: "/etc/ssl/certs/truststore.jks"
       com.openexchange.net.ssl.custom.truststore.password: {{ .Values.secrets.certificates.password | quote }}
       {{- end }}
-      {{- if .Values.functional.groupware.davSupport.enabled }}
-      com.openexchange.authentication.application.appTypes: "caldav,carddav"
-      com.openexchange.authentication.application.enabled: "true"
-      com.openexchange.authentication.application.storage.rdb.loginNameSource: "mail"
-      com.openexchange.authentication.application.storage.rdb.contextLookupNamePart: "full"
-      {{- end }}
     {{- if .Values.certificate.selfSigned }}
     extraEnv:
     - name: "JAVA_OPTS_APPEND"
@@ -544,10 +452,21 @@ appsuite:
       com.openexchange.share.cryptKey: {{ .Values.secrets.oxAppSuite.shareCryptKey | quote }}
       com.openexchange.conference.element.authToken: {{ .Values.secrets.oxAppSuite.synapseAsToken | quote }}
     propertiesFiles:
+      {{- if .Values.functional.migration.oxAppSuite.enabled }}
+      /opt/open-xchange/etc/masterpassword-authentication.properties:
+        com.openexchange.authentication.masterpassword.password: {{ .Values.secrets.oxAppSuite.migrationsMasterPassword | quote }}
+      {{- end }}
       /opt/open-xchange/etc/AdminDaemon.properties:
         MASTER_ACCOUNT_OVERRIDE: "true"
       /opt/open-xchange/etc/AdminUser.properties:
         USERNAME_CHANGEABLE: "true"
+      /opt/open-xchange/etc/system.properties:
+        SERVER_NAME: "oxserver"
+      /opt/open-xchange/etc/ldapauth.properties:
+        java.naming.provider.url: "ldap://{{ .Values.ldap.host }}:389/{{ .Values.ldap.baseDn }}"
+        bindDN: "uid=ldapsearch_ox,cn=users,{{ .Values.ldap.baseDn }}"
+        bindDNPassword: {{ .Values.secrets.nubus.ldapSearch.ox | quote }}
+        bindOnly: "false"
       /opt/open-xchange/etc/antivirus.properties:
         com.openexchange.antivirus.enabled: "true"
         {{- if .Values.antivirus.icap.host }}
@@ -567,20 +486,6 @@ appsuite:
         com.openexchange.filestore.s3.ox-filestore-s3.bucketName: {{ .Values.objectstores.openxchange.bucket | quote }}
         com.openexchange.filestore.s3.ox-filestore-s3.accessKey: {{ .Values.objectstores.openxchange.username | quote }}
         com.openexchange.filestore.s3.ox-filestore-s3.secretKey: {{ .Values.objectstores.openxchange.secretKey | default .Values.secrets.minio.openxchangeUser | quote }}
-      /opt/open-xchange/etc/ldapauth.properties:
-        java.naming.provider.url: "ldap://{{ .Values.ldap.host }}:389/{{ .Values.ldap.baseDn }}"
-        bindDN: "uid=ldapsearch_ox,cn=users,{{ .Values.ldap.baseDn }}"
-        bindDNPassword: {{ .Values.secrets.nubus.ldapSearch.ox | quote }}
-        bindOnly: "false"
-      /opt/open-xchange/etc/noreply.properties:
-        com.openexchange.noreply.address: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}"
-        com.openexchange.noreply.login: {{ printf "%s@%s" "opendesk-system" ( .Values.global.mailDomain | default .Values.global.domain ) }}
-        com.openexchange.noreply.password: {{ .Values.secrets.postfix.opendeskSystemPassword | quote }}
-        com.openexchange.noreply.server: "postfix"
-        com.openexchange.noreply.port: "25"
-        com.openexchange.noreply.secureMode: "plain"
-      /opt/open-xchange/etc/system.properties:
-        SERVER_NAME: "oxserver"
     uiSettings:
       io.ox.nextcloud//server: "https://{{ .Values.global.hosts.intercomService }}.{{ .Values.global.domain }}/fs/"
       io.ox.public-sector//ics/url: "https://{{ .Values.global.hosts.intercomService }}.{{ .Values.global.domain }}/"
@@ -620,8 +525,6 @@ appsuite:
       io.ox/dynamic-theme//folderBackground: {{ .Values.theme.colors.white | quote }}
       io.ox/dynamic-theme//folderSelected: {{ .Values.theme.colors.primary15 | quote }}
       io.ox/dynamic-theme//folderHover: {{ .Values.theme.colors.secondaryGreyLight | quote }}
-      # openDesk logo in top bar links to portal
-      io.ox/core//logoAction: {{ printf "https://%s.%s" .Values.global.hosts.nubus .Values.global.domain | quote }}
     secretETCFiles:
       # Format of the OX Guard master key:
       # MC+base64(20 random bytes)
@@ -662,20 +565,6 @@ appsuite:
     initContainer:
       resources:
         {{ .Values.resources.openxchangeCoreMW | toYaml | nindent 8 }}
-    {{- if .Values.functional.groupware.davSupport.enabled }}
-    yamlFiles:
-      app-password-apps.yml:
-        caldav:
-          displayName_t10e: "Calendar Client (CalDAV)"
-          restrictedScopes: [dav,read_caldav,write_caldav]
-          requiredCapabilities: [caldav]
-          sortOrder: 30
-        carddav:
-          displayName_t10e: "Addressbook Client (CardDAV)"
-          restrictedScopes: [dav,read_carddav,write_carddav]
-          requiredCapabilities: [carddav]
-          sortOrder: 40
-    {{- end }}
 
   core-ui:
     enabled: true

helmfile/apps/open-xchange/values-oxconnector.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 {{- if .Values.certificate.selfSigned }}
 extraVolumes:
@@ -49,7 +51,7 @@ oxConnector:
   oxMasterAdmin: "admin"
   oxMasterPassword: {{ .Values.secrets.oxAppSuite.adminPassword | quote }}
   oxSmtpServer: "smtp://127.0.0.1:587"
-  oxSoapServer: "http://open-xchange-core-mw-admin"
+  oxSoapServer: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}"
 
 provisioningApi:
   connection:
@@ -65,7 +67,7 @@ resourcesWaitForDependency:
 
 persistence:
   size: {{ .Values.persistence.storages.oxConnector.size | quote }}
-  #storageClass: {{ coalesce .Values.persistence.storages.oxConnector.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
+  storageClass: {{ coalesce .Values.persistence.storages.oxConnector.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
 
 podAnnotations:
   {{ .Values.annotations.nubusOxConnector.pod | toYaml | nindent 2 }}

helmfile/apps/open-xchange/values-postfix.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 certificate:
   secretName: {{ .Values.ingress.tls.secretName | quote }}
@@ -46,6 +48,10 @@ postfix:
   hostname: "postfix"
   inetProtocols: "ipv4"
   milterDefaultAction: "tempfail"
+  overrides:
+    - fileName: "sasl_passwd.map"
+      content:
+        - {{ printf "%s %s:%s" .Values.smtp.host .Values.smtp.username .Values.smtp.password | quote }}
   {{- if .Values.apps.dkimpy.enabled }}
   dkimpyHost: "opendesk-dkimpy-milter.{{ .Release.Namespace }}.svc.{{.Values.cluster.networking.domain }}:8892"
   {{- end }}
@@ -54,17 +60,7 @@ postfix:
   smtpdTLSMandatoryCiphers: "high"
 
   rspamdHost: ""
-  {{- if .Values.smtp.host }}
-  relayHost:
-    enabled: true
-    host: {{ .Values.smtp.host }}
-    port: {{ .Values.smtp.port }}
-    authentication:
-      username:
-        value: {{ .Values.smtp.username }}
-      password:
-        value: {{ .Values.smtp.password }}
-  {{- end }}
+  relayHost: {{ if .Values.smtp.host }}{{ printf "[%s]:%d" .Values.smtp.host .Values.smtp.port | quote }}{{ else }}""{{ end }}
   allowRelayNets: false
   smtpSASLAuthEnable: "yes"
   smtpSASLPasswordMaps: "lmdb:/etc/postfix/sasl_passwd.map"

helmfile/apps/opendesk-migrations-post/values.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 additionalAnnotations:
   {{ .Values.annotations.opendeskMigrationsPost.additional | toYaml | nindent 2 }}

helmfile/apps/opendesk-migrations-pre/values.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 additionalAnnotations:
   {{ .Values.annotations.opendeskMigrationsPre.additional | toYaml | nindent 2 }}

helmfile/apps/opendesk-openproject-bootstrap/values.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 global:
   domain: {{ .Values.global.domain | quote }}
@@ -23,16 +25,28 @@ config:
   openproject:
     fileshareName: "Nextcloud at {{ .Values.global.domain }}"
     admin:
-      username:
+      username: 
         value: {{ .Values.secrets.openproject.apiAdminUsername | quote }}
+        secret:
+          name: {{ .Values.externalSecrets.openproject.apiAdminUsername.name | quote }}
+          key: {{ .Values.externalSecrets.openproject.apiAdminUsername.key | quote }}
       password:
         value: {{ .Values.secrets.openproject.apiAdminPassword | quote }}
+        secret:
+          name: {{ .Values.externalSecrets.openproject.apiAdminPassword.name | quote }}
+          key: {{ .Values.externalSecrets.openproject.apiAdminPassword.key | quote }}
   nextcloud:
     admin:
       username:
         value: "nextcloud"
+        secret:
+          name: {{ .Values.externalSecrets.nextcloud.adminUsername.name | quote }}
+          key: {{ .Values.externalSecrets.nextcloud.adminUsername.key | quote }}
       password:
         value: {{ .Values.secrets.nextcloud.adminPassword | quote }}
+        secret:
+          name: {{ .Values.externalSecrets.nextcloud.adminPassword.name | quote }}
+          key: {{ .Values.externalSecrets.nextcloud.adminPassword.key | quote }}
 
 containerSecurityContext:
   allowPrivilegeEscalation: false

helmfile/apps/opendesk-services/values-certificates.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 global:
   domain: {{ .Values.global.domain | quote }}
@@ -21,9 +23,8 @@ global:
     synapseFederation: {{ .Values.global.hosts.synapseFederation }}
     whiteboard: {{ .Values.global.hosts.whiteboard }}
     {{- end }}
-    {{- if .Values.apps.elementAdmin.enabled }}
-    adminBot: {{ .Values.global.hosts.adminBot }}
-    synapseAdmin: {{ .Values.global.hosts.synapseAdmin }}
+    {{- if .Values.apps.nubus.enabled }}
+    intercomService: {{ .Values.global.hosts.intercomService }}
     {{- end }}
     {{- if .Values.apps.jitsi.enabled }}
     jitsi: {{ .Values.global.hosts.jitsi }}
@@ -35,27 +36,23 @@ global:
     {{- if .Values.apps.nextcloud.enabled }}
     nextcloud: {{ .Values.global.hosts.nextcloud }}
     {{- end }}
-    {{- if .Values.apps.notes.enabled }}
-    notes: {{ .Values.global.hosts.notes }}
-    {{- end }}
-    {{- if .Values.apps.nubus.enabled }}
-    intercomService: {{ .Values.global.hosts.intercomService }}
-    keycloak: {{ .Values.global.hosts.keycloak }}
-    nubus: {{ .Values.global.hosts.nubus }}
-    {{- end }}
     {{- if .Values.apps.openproject.enabled }}
     openproject: {{ .Values.global.hosts.openproject }}
     {{- end }}
     {{- if .Values.apps.oxAppSuite.enabled }}
     openxchange: {{ .Values.global.hosts.openxchange }}
-    openxchangeDav: {{ .Values.global.hosts.openxchangeDav }}
     {{- end }}
-    {{- if .Values.apps.staticFiles.enabled }}
-    static: {{ .Values.global.hosts.static }}
+    {{- if .Values.apps.nubus.enabled }}
+    keycloak: {{ .Values.global.hosts.keycloak }}
+    nubus: {{ .Values.global.hosts.nubus }}
     {{- end }}
     {{- if .Values.apps.xwiki.enabled }}
     xwiki: {{ .Values.global.hosts.xwiki }}
     {{- end }}
+    {{- if .Values.apps.notes.enabled }}
+    notes: {{ .Values.global.hosts.notes }}
+    {{- end }}
+
 
 issuerRef:
   name: {{ .Values.certificate.issuerRef.name | quote }}

helmfile/apps/opendesk-services/values-home.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 additionalAnnotations:
   {{ .Values.annotations.opendeskServicesHome.additional | toYaml | nindent 2 }}

helmfile/apps/opendesk-services/values-opendesk-alerts.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 additionalAnnotations:
   {{ .Values.monitoring.prometheus.prometheusRules.annotations | toYaml | nindent 2 }}
@@ -7,5 +9,44 @@ additionalLabels:
   {{ .Values.monitoring.prometheus.prometheusRules.labels | toYaml | nindent 2 }}
 
 config:
-  {{ .Values.apps | toYaml | nindent 2 }}
+  collabora:
+    enable: {{ .Values.apps.collabora.enabled }}
+    selectors:
+      namespace: {{ .Values.apps.collabora.namespace | quote }}
+  matrix:
+    enable: {{ .Values.apps.element.enabled }}
+    selectors:
+      namespace: {{ .Values.apps.element.namespace | quote }}
+  diagrams:
+    enable: {{ .Values.apps.cryptpad.enabled }}
+    selectors:
+      namespace: {{ .Values.apps.cryptpad.namespace | quote }}
+  nextcloud:
+    enable: {{ .Values.apps.nextcloud.enabled }}
+    selectors:
+      namespace: {{ .Values.apps.nextcloud.namespace | quote }}
+  openXChange:
+    enable: {{ .Values.apps.oxAppSuite.enabled }}
+    selectors:
+      namespace: {{ .Values.apps.oxAppSuite.namespace | quote }}
+  xwiki:
+    enable: {{ .Values.apps.xwiki.enabled }}
+    selectors:
+      namespace: {{ .Values.apps.xwiki.namespace | quote }}
+  nubus:
+    enable: {{ .Values.apps.nubus.enabled }}
+    selectors:
+      namespace: {{ .Values.apps.nubus.namespace | quote }}
+  openProject:
+    enable: {{ .Values.apps.openproject.enabled }}
+    selectors:
+      namespace: {{ .Values.apps.openproject.namespace | quote }}
+  jitsi:
+    enable: {{ .Values.apps.jitsi.enabled }}
+    selectors:
+      namespace: {{ .Values.apps.jitsi.namespace | quote }}
+  collabora:
+    enable: {{ .Values.apps.collabora.enabled }}
+    selectors:
+      namespace: {{ .Values.apps.collabora.namespace | quote }}
 

helmfile/apps/opendesk-services/values-opendesk-dashboards.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 additionalAnnotations:
   {{ .Values.monitoring.grafana.dashboards.annotations | toYaml | nindent 2 }}
@@ -8,5 +10,45 @@ additionalLabels:
   {{ .Values.monitoring.grafana.dashboards.labels | toYaml | nindent 2 }}
 
 config:
-  {{ .Values.apps | toYaml | nindent 2 }}
+  apps:
+    collabora:
+      enable: {{ .Values.apps.collabora.enabled }}
+      selectors:
+        namespace: {{ .Values.apps.collabora.namespace | quote }}
+    matrixElement:
+      enable: {{ .Values.apps.element.enabled }}
+      selectors:
+        namespace: {{ .Values.apps.element.namespace | quote }}
+    diagrams:
+      enable: {{ .Values.apps.cryptpad.enabled }}
+      selectors:
+        namespace: {{ .Values.apps.cryptpad.namespace | quote }}
+    nextcloud:
+      enable: {{ .Values.apps.nextcloud.enabled }}
+      selectors:
+        namespace: {{ .Values.apps.nextcloud.namespace | quote }}
+    openxchange:
+      enable: {{ .Values.apps.oxAppSuite.enabled }}
+      selectors:
+        namespace: {{ .Values.apps.oxAppSuite.namespace | quote }}
+    xwiki:
+      enable: {{ .Values.apps.xwiki.enabled }}
+      selectors:
+        namespace: {{ .Values.apps.xwiki.namespace | quote }}
+    nubus:
+      enable: {{ .Values.apps.nubus.enabled }}
+      selectors:
+        namespace: {{ .Values.apps.nubus.namespace | quote }}
+    openproject:
+      enable: {{ .Values.apps.openproject.enabled }}
+      selectors:
+        namespace: {{ .Values.apps.openproject.namespace | quote }}
+    jitsi:
+      enable: {{ .Values.apps.jitsi.enabled }}
+      selectors:
+        namespace: {{ .Values.apps.jitsi.namespace | quote }}
+    collabora:
+      enable: {{ .Values.apps.collabora.enabled }}
+      selectors:
+        namespace: {{ .Values.apps.collabora.namespace | quote }}
 ...

helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 global:
   domain: {{ .Values.global.domain | quote }}

helmfile/apps/opendesk-services/values-otterize.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 global:
   domain: {{ .Values.global.domain | quote }}

helmfile/apps/openproject/values.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 global:
   imagePullSecrets:
@@ -82,7 +84,7 @@ environment:
   OPENPROJECT_SMTP__AUTHENTICATION: "cram_md5"
   OPENPROJECT_SMTP__ENABLE__STARTTLS__AUTO: "true"
   OPENPROJECT_SMTP__OPENSSL__VERIFY__MODE: "none"
-  OPENPROJECT_MAIL__FROM: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}"
+  OPENPROJECT_MAIL__FROM: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}"
   OPENPROJECT_HOME__URL: {{ printf "https://%s.%s/" .Values.global.hosts.nubus .Values.global.domain | quote }}
   OPENPROJECT_OPENID__CONNECT_KEYCLOAK_ISSUER: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}"
   OPENPROJECT_OPENID__CONNECT_KEYCLOAK_POST__LOGOUT__REDIRECT__URI: "https://{{ .Values.global.hosts.openproject }}.{{ .Values.global.domain }}/"

helmfile/apps/services-external/values-cassandra.yaml.gotmpl

@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 containerSecurityContext:
   enabled: true
@@ -26,7 +28,7 @@ global:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 
 image:
-  registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.cassandra.registry | quote }}
+  registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.cassandra.registry | quote }}
   repository: {{ .Values.images.cassandra.repository | quote }}
   tag: {{ .Values.images.cassandra.tag | quote }}
   pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
@@ -62,7 +64,7 @@ livenessProbe:
 metrics:
   enabled: false
   image:
-    registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.cassandraExporter.registry | quote }}
+    registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.cassandraExporter.registry | quote }}
     repository: {{ .Values.images.cassandraExporter.repository | quote }}
     tag: {{ .Values.images.cassandraExporter.tag | quote }}
     pullPolicy: {{ .Values.global.imagePullPolicy | quote }}

helmfile/apps/services-external/values-clamav-distributed.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 clamd:
   commonAnnotations:

helmfile/apps/services-external/values-clamav-simple.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 commonAnnotations:
   {{ .Values.annotations.servicesExternalClamavSimple.common | toYaml | nindent 2 }}

helmfile/apps/services-external/values-dkimpy.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 additionalAnnotations:
   {{ .Values.annotations.servicesExternalDkimpy.additional | toYaml | nindent 2 }}

helmfile/apps/services-external/values-mariadb.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 cleanup:
   deletePodsOnSuccess: {{ .Values.debug.cleanup.deletePodsOnSuccess }}

helmfile/apps/services-external/values-memcached.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 architecture: {{ if gt .Values.replicas.memcached 1 }}"high-availability"{{ else }}"standalone"{{ end }}
 
@@ -28,7 +30,7 @@ global:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 
 image:
-  registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.memcached.registry | quote }}
+  registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.memcached.registry | quote }}
   repository: {{ .Values.images.memcached.repository | quote }}
   tag: {{ .Values.images.memcached.tag | quote }}
   pullPolicy: {{ .Values.global.imagePullPolicy | quote }}

helmfile/apps/services-external/values-minio.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 apiIngress:
   enabled: {{ .Values.ingress.enabled }}
@@ -46,7 +48,7 @@ global:
     allowInsecureImages: true
 
 image:
-  registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.minio.registry | quote }}
+  registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.minio.registry | quote }}
   repository: {{ .Values.images.minio.repository | quote }}
   tag: {{ .Values.images.minio.tag | quote }}
   pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
@@ -54,7 +56,7 @@ image:
 volumePermissions:
   enabled: true
   image:
-    registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.minio.registry | quote }}
+    registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.minio.registry | quote }}
     repository: {{ .Values.images.bitnamiOSShell.repository | quote }}
     tag: {{ .Values.images.bitnamiOSShell.tag | quote }}
     pullPolicy: {{ .Values.global.imagePullPolicy | quote }}

helmfile/apps/services-external/values-postfix.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 certificate:
   secretName: {{ .Values.ingress.tls.secretName | quote }}
@@ -54,24 +56,19 @@ postfix:
   hostname: "postfix"
   inetProtocols: "ipv4"
   milterDefaultAction: "accept"
+  overrides:
+    - fileName: "sasl_passwd.map"
+      content:
+        - {{ printf "%s %s:%s" .Values.smtp.host .Values.smtp.username .Values.smtp.password | quote }}
   {{- if .Values.apps.dkimpy.enabled }}
   dkimpyHost: "opendesk-dkimpy-milter.{{ .Release.Namespace }}.svc.{{.Values.cluster.networking.domain }}:8892"
   {{- end }}
   rspamdHost: ""
-  {{- if .Values.smtp.host }}
-  relayHost:
-    enabled: true
-    host: {{ .Values.smtp.host }}
-    port: {{ .Values.smtp.port }}
-    authentication:
-      username:
-        value: {{ .Values.smtp.username }}
-      password:
-        value: {{ .Values.smtp.password }}
-  {{- end }}
+  relayHost: {{ if .Values.smtp.host }}{{ printf "[%s]:%d" .Values.smtp.host .Values.smtp.port | quote }}{{ else }}""{{ end }}
+
   # Warning: This setting allows unauthenticated mail relay from relayNets!
-  allowRelayNets: true
   relayNets: {{ join " " .Values.cluster.networking.cidr | quote }}
+  allowRelayNets: true
 
   minTLSVersion: "TLSv1.3"
   smtpdTLSMandatoryCiphers: "high"

helmfile/apps/services-external/values-postgresql.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 cleanup:
   deletePodsOnSuccess: {{ .Values.debug.cleanup.deletePodsOnSuccess }}

helmfile/apps/services-external/values-redis.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 architecture: "standalone"
 
@@ -16,7 +18,7 @@ global:
   storageClass: {{ coalesce .Values.persistence.storages.redis.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
 
 image:
-  registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.redis.registry | quote }}
+  registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.redis.registry | quote }}
   repository: {{ .Values.images.redis.repository | quote }}
   tag: {{ .Values.images.redis.tag | quote }}
   pullPolicy: {{ .Values.global.imagePullPolicy | quote }}

helmfile/apps/xwiki/values.yaml.gotmpl

@@ -1,16 +1,24 @@
-# SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 commonAnnotations:
   {{ .Values.annotations.xwiki.common | toYaml | nindent 2 }}
 
 image:
-  name: "{{ .Values.images.xwiki.registry }}/{{ .Values.images.xwiki.repository }}"
-  tag: {{ .Values.images.xwiki.tag | quote }}
+  {{- if eq .Values.databases.xwiki.type "mariadb" }}
+  name: "{{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.xwikiMariadb.registry }}/{{ .Values.images.xwikiMariadb.repository }}"
+  tag: {{ .Values.images.xwikiMariadb.tag | quote }}
+  {{- else if eq .Values.databases.xwiki.type "postgresql" }}
+  name: "{{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.xwikiPostgres.registry }}/{{ .Values.images.xwikiPostgres.repository }}"
+  tag: {{ .Values.images.xwikiPostgres.tag | quote }}
+  {{- else }}
+  {{- fail "Unsupported value for .Values.databases.xwiki.type, supported values are 'mariadb' or 'postgresql'" }}
+  {{- end }}
   pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-imagePullSecrets:
-  {{ .Values.global.imagePullSecrets | toYaml | nindent 2 }}
+imagePullSecrets: {{ .Values.global.imagePullSecrets }}
 
 javaOpts:
   {{- if and (eq (env "OPENDESK_ENTERPRISE") "true") .Values.enterpriseKeys.xwiki.opendeskEnterpriseLicense .Values.enterpriseKeys.xwiki.proApplicationslicense }}
@@ -165,7 +173,7 @@ properties:
   # therefore on XWiki restart an LDAP sync is triggered to load the dynamic mapping.
   "property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.ldap_group_mapping": "xwiki:XWiki.XWikiAdminGroup=cn=managed-by-attribute-KnowledgemanagementAdmin,cn=groups,{{ .Values.ldap.baseDn }}"
   ## SMTP settings
-  "property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.from": "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}"
+  "property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.from": "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}"
   "property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.host": {{ printf "%s.%s.svc.%s" "postfix" (.Values.apps.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
   "property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.port": 587
   "property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.properties": "mail.smtp.starttls.enable=true"

helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl

@@ -6,12 +6,12 @@ charts:
     registry: "registry.opencode.de"
     repository: "zendis/opendesk-enterprise/components/product-development/charts/opendesk-dovecot-pro"
     name: "dovecot"
-    version: "3.1.7"
+    version: "3.1.1"
     verify: true
   oxAppSuite:
     registry: "registry.opencode.de"
     repository: "zendis/opendesk-enterprise/components/supplier/open-xchange/charts-mirror"
     name: "appsuite-public-sector-pro-chart"
-    version: "1.19.197"
+    version: "1.18.273"
     verify: false
 ...

helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl

@@ -5,8 +5,7 @@ images:
   collabora:
     registry: "registry.opencode.de"
     repository: "zendis/opendesk-enterprise/components/supplier/collabora/images/collabora-online-for-opendesk"
-    tag: "25.04.3.4.1@sha256:929ce210bb1ff46275af64e94ce02ab0a0470572eba8251ad35b8b4296c3a171"
-
+    tag: "25.04.2.3.1@sha256:b6dbe27d7242488dfdb400219abbc6c97fb83df029975e1127f52abc8444475e"
   dovecot:
     registry: "registry.opencode.de"
     repository: "zendis/opendesk-enterprise/components/supplier/open-xchange/images-mirror/dovecot-pro"
@@ -14,9 +13,9 @@ images:
   nextcloud:
     registry: "registry.opencode.de"
     repository: "zendis/opendesk-enterprise/components/supplier/nextcloud/images/opendesk-nextcloud"
-    tag: "31.0.6@sha256:cf893f2a7e1613a8c7641651c8a459f321c8bbbd234071b89f5638163ada00ef"
+    tag: "30.0.10@sha256:a63374dd44d3c6a8873da31fe0554b97fb29993a4cf18b9dd6a304b577f2f2b8"
   openxchangeCoreMW:
     registry: "registry.opencode.de"
     repository: "zendis/opendesk-enterprise/components/supplier/open-xchange/images-mirror/middleware-public-sector-pro"
-    tag: "8.39.70@sha256:94b6e9325dfa4c91587b761946151987dd49000727ab81d10a41fdc7c17ae2cb"
+    tag: "8.38.73@sha256:2ddd6ce6e33a77aadc6043ad01026afbea09d28f7b0c469ab6fd412fb4ca8792"
 ...

helmfile/environments/default/_helper.yaml.gotmpl

@@ -1,12 +1,5 @@
 # SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
 # SPDX-License-Identifier: Apache-2.0
-
-#
-# DISCLAIMER:
-#
-# The values in this file are exposed because they are used in multiple components and it does make sense to define
-# them centrally, but we do not support changing these values, please leave them as they are.
-#
 ---
 ldap:
   host: "ums-ldap-server"

helmfile/environments/default/annotations.yaml.gotmpl

@@ -117,31 +117,21 @@ annotations:
   nextcloudNextcloudMgmt:
     additional: ~
     pod: ~
-    service: ~
     serviceAccount: ~
-  nextcloudNotifyPush:
-    additional: ~
-    ingress: ~
-    pod: ~
-    service: ~
-    serviceMetrics: ~
-    serviceAccount: ~
-  notesBackend:
-    createUserJob: ~
-    ingress: ~
+  notes:
     ingressAdmin: ~
+    ingressCollaborationWS: ~
+    ingressCollaborationAPI: ~
+    ingressMedia: ~
+    serviceMedia: ~
+  notesBackend:
     migrateJob: ~
     pod: ~
     service: ~
   notesFrontend:
-    ingress: ~
-    ingressMedia: ~
     pod: ~
     service: ~
-    serviceMedia: ~
   notesYProvider:
-    ingressCollaborationAPI: ~
-    ingressCollaborationWS: ~
     pod: ~
     service: ~
   nubus:

helmfile/environments/default/charts.yaml.gotmpl

@@ -24,7 +24,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-certificates"
     name: "opendesk-certificates"
-    version: "3.1.2"
+    version: "3.1.1"
     verify: true
   clamav:
     # providerCategory: "Platform"
@@ -56,7 +56,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/collabora/charts-mirror"
     name: "collabora-online"
-    version: "1.1.45"
+    version: "1.1.41"
     verify: true
   collaboraController:
     # Enterprise Component
@@ -84,6 +84,8 @@ charts:
     # providerResponsible: "openDesk"
     # upstreamRegistry: "https://registry.opencode.de"
     # upstreamRepository: "bmi/opendesk/components/platform-development/charts/opendesk-dkimpy-milter/opendesk-dkimpy-milter"
+    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
+    # upstreamMirrorStartFrom: ["1", "0", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-dkimpy-milter"
     name: "opendesk-dkimpy-milter"
@@ -97,7 +99,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-dovecot"
     name: "dovecot"
-    version: "3.1.5"
+    version: "3.1.1"
     verify: true
   element:
     # providerCategory: "Platform"
@@ -139,7 +141,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
     name: "intercom-service"
-    version: "2.19.0"
+    version: "2.12.0"
     verify: true
   jitsi:
     # providerCategory: "Platform"
@@ -249,7 +251,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
     name: "opendesk-nextcloud"
-    version: "4.4.0"
+    version: "4.1.0"
     verify: true
   nextcloudManagement:
     # providerCategory: "Platform"
@@ -259,17 +261,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
     name: "opendesk-nextcloud-management"
-    version: "4.4.0"
-    verify: true
-  nextcloudNotifyPush:
-    # providerCategory: "Platform"
-    # providerResponsible: "openDesk"
-    # upstreamRegistry: "https://registry.opencode.de"
-    # packageName=bmi/opendesk/components/platform-development/charts/opendesk-nextcloud/opendesk-nextcloud-notifypush
-    registry: "registry.opencode.de"
-    repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
-    name: "opendesk-nextcloud-notifypush"
-    version: "4.4.0"
+    version: "4.1.0"
     verify: true
   nginx:
     # providerCategory: "Community"
@@ -292,14 +284,14 @@ charts:
     version: "1.0.1"
     verify: true
   notes:
-    # providerCategory: "Platform"
+    # providerCategory: "Supplier"
     # providerResponsible: "openDesk"
-    # upstreamRegistry: "https://registry.opencode.de"
-    # packageName=bmi/opendesk/components/platform-development/charts/opendesk-impress
+    # upstreamRegistry: "https://gitlab.opencode.de"
+    # packageName=bmi/opendesk/components/supplier/dinum/charts/notes
     registry: "registry.opencode.de"
-    repository: "bmi/opendesk/components/platform-development/charts/opendesk-impress"
+    repository: "bmi/opendesk/components/supplier/dinum/charts/notes"
     name: "impress"
-    version: "1.0.1"
+    version: "2.0.0"
     verify: true
   nubus:
     # providerCategory: "Supplier"
@@ -311,7 +303,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
     name: "nubus"
-    version: "1.12.0"
+    version: "1.11.1"
     verify: true
   opendeskAlerts:
     # providerCategory: "Platform"
@@ -321,7 +313,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-alerts"
     name: "opendesk-alerts"
-    version: "1.1.2"
+    version: "1.1.1"
     verify: true
   opendeskDashboards:
     # providerCategory: "Platform"
@@ -331,7 +323,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-dashboards"
     name: "opendesk-dashboards"
-    version: "1.1.2"
+    version: "1.1.1"
     verify: true
   opendeskKeycloakBootstrap:
     # providerCategory: "Platform"
@@ -395,7 +387,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/open-xchange/charts-mirror"
     name: "appsuite-public-sector"
-    version: "2.21.167"
+    version: "2.20.247"
     verify: false
   oxAppSuiteBootstrap:
     # providerCategory: "Platform"
@@ -405,7 +397,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-open-xchange-bootstrap"
     name: "opendesk-open-xchange-bootstrap"
-    version: "4.0.1"
+    version: "3.0.1"
     verify: true
   oxConnector:
     # providerCategory: "Supplier"
@@ -417,7 +409,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
     name: "ox-connector"
-    version: "0.27.2"
+    version: "0.19.0"
     verify: true
   postfix:
     # providerCategory: "Platform"
@@ -427,7 +419,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-postfix"
     name: "postfix"
-    version: "5.0.0"
+    version: "4.0.0"
     verify: true
   postgresql:
     # providerCategory: "Platform"

helmfile/environments/default/customization.yaml.gotmpl

@@ -46,9 +46,8 @@ customization:
     # migrations-pre
     migrationsPre: {}
     # nextcloud
-    opendeskNextcloud: {}
     opendeskNextcloudManagement: {}
-    opendeskNextcloudNotifyPush: {}
+    opendeskNextcloud: {}
     # notes
     notes: {}
     # nubus

helmfile/environments/default/external_secrets.yaml.gotmpl

@@ -0,0 +1,21 @@
+{{/*
+SPDX-FileCopyrightText: 2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
+---
+externalSecrets:
+  nextcloud:
+    adminPassword:
+      name: ~
+      key: ~
+    adminUsername:
+      name: ~
+      key: ~
+  openproject:
+    apiAdminPassword:
+      name: ~
+      key: ~
+    apiAdminUsername:
+      name: ~
+      key: ~
+...

helmfile/environments/default/functional.yaml.gotmpl

@@ -100,7 +100,7 @@ functional:
 
   filestore:
     quota:
-      # Set the default quota for all users in gigabyte
+      # Set the default quota for all users in GB
       default: 1
     # Options related to file sharing.
     # Changing these options might require a restart of the `opendesk-nextcloud-php` Pod(s).
@@ -152,11 +152,6 @@ functional:
       # - https://<.Values.global.hosts.openxchangeDav>.<.Values.global.domain>/carddav/[folderId]"
       # Can be switched off using the below feature toggle.
       enabled: true
-    quota:
-      # Set the default mail storage quota for users in gigabyte.
-      # Just provide the plain number without quoting. It will allow a quota grace of 10% and +20% in trash storage.
-      # If you need different rules you can use customizing on Dovecot's `quotaRules` and `quotaGrace` templating.
-      default: 1
 
   migration:
     oxAppSuite:
@@ -173,20 +168,6 @@ functional:
     linkLegalNotice: "https://opendesk.eu/impressum"
     # Link to the privacy statement shown in the portal menu, set to "~" if you want to remove the link
     linkPrivacyStatement: "https://zendis.de/datenschutzerklaerung"
-    # Link to documentation, shown in the right lower corner of the portal, set to "~" if you want to remove the link
-    linkDocumentation: "https://docs.opendesk.eu/"
-    # Link to support, shown in the right lower corner of the portal, set to "~" if you want to remove the link
-    linkSupport: "https://opendesk.eu/support"
-    # Link to feedback, shown in the right lower corner of the portal, set to "~" if you want to remove the link
-    linkFeedback: "https://opendesk.eu/feedback"
-    # Newsfeed related settings
-    newsfeed:
-      # Newsfeed is enabled by default, when XWiki is also deployed, you can forcefully disable the newsfeed
-      enabled: true
-    # Welcome message related settings
-    welcomeMessage:
-      # Welcome message is enabled by default and can be switched off below.
-      enabled: true
 
   weboffice:
     # Set the file format to be used by default when creating new documents from the portal or the Nextcloud app.

helmfile/environments/default/global.generated.yaml.gotmpl

@@ -3,5 +3,5 @@
 ---
 global:
   systemInformation:
-    releaseVersion: "v1.7.0"
+    releaseVersion: "v1.6.0"
 ...

helmfile/environments/default/global.yaml.gotmpl

@@ -1,6 +1,8 @@
-# SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
-# SPDX-License-Identifier: Apache-2.0
+{{/*
+SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
 ---
 ## The global properties are used to configure multiple charts at once.
 #
@@ -33,8 +35,6 @@ global:
   # Beware: Changing hostnames on an existing deployment will break links the users may already make use of.
   #         Also some links are used directly in the portal and do not get updated after the initial
   #         deployment.
-  # Attention: When adding hosts here, please make sure to also add them in
-  #            /helmfile/apps/opendesk-services/values-certificates.yaml.gotmpl
   #
   hosts:
     adminBot: "adminbot"
@@ -63,7 +63,7 @@ global:
     whiteboard: "whiteboard"
     xwiki: "wiki"
 
-  ## Define a list containing names of the secrets to use when fetching images from private registries.
+  ## Credentials to fetch images from private registry
   ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
   #
   imagePullSecrets: []

helmfile/environments/default/images.yaml.gotmpl

@@ -10,31 +10,25 @@ images:
     # providerResponsible: "openDesk"
     # upstreamRegistry: "https://registry-1.docker.io"
     # upstreamRepository: "bitnami/os-shell"
-    # upstreamMirrorTagFilterRegEx: '^(\d+)-debian-(\d+)-r(\d+)$'
-    # upstreamMirrorStartFrom: ["12", "12", "44"]
-    registry: "registry.opencode.de"
-    repository: "bmi/opendesk/components/community/images-mirror/os-shell"
-    tag: "12-debian-12-r44@sha256:e0eab38c4e2e2ebfc9043bc9bc482109ec5cca3123154c1af8e040ea23c5ce98"
+    registry: "registry-1.docker.io"
+    repository: "bitnami/os-shell"
+    tag: "12-debian-12-r44@sha256:6388c7c27a09472906e2f2094410c9ffdadf23b4b242293ce023d0314ec10920"
   cassandra:
     # providerCategory: "Community"
     # providerResponsible: "openDesk"
     # upstreamRegistry: "https://registry-1.docker.io"
     # upstreamRepository: "bitnami/cassandra"
-    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)-debian-(\d+)-r(\d+)$'
-    # upstreamMirrorStartFrom: ["5", "0", "4", "12", "4"]
-    registry: "registry.opencode.de"
-    repository: "bmi/opendesk/components/community/images-mirror/cassandra"
-    tag: "5.0.4-debian-12-r4@sha256:93be59e318070e5c1d515c2b5840e9e07babfbac845b2c9bcc1cdf8efda6bb18"
+    registry: "registry-1.docker.io"
+    repository: "bitnami/cassandra"
+    tag: "5.0.4-debian-12-r4@sha256:9d909ebe10802dae2fb99ef7c8e9e0dbc496c8d30366e2f7abbe0713b945fa7d"
   cassandraExporter:
     # providerCategory: "Community"
     # providerResponsible: "openDesk"
     # upstreamRegistry: "https://registry-1.docker.io"
     # upstreamRepository: "bitnami/cassandra-exporter"
-    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)-debian-(\d+)-r(\d+)$'
-    # upstreamMirrorStartFrom: ["2", "3", "8", "12", "46"]
-    registry: "registry.opencode.de"
-    repository: "bmi/opendesk/components/community/images-mirror/cassandra-exporter"
-    tag: "2.3.8-debian-12-r46@sha256:3b460a6287f24ef96626439825c9e3fa822784d802209f38c7541d8289eb51d8"
+    registry: "registry-1.docker.io"
+    repository: "bitnami/cassandra-exporter"
+    tag: "2.3.8-debian-12-r46@sha256:e44c65f08d85153041f68bcf180f948341d74018eef8b56e8869ed87fdfd34f0"
   clamd:
     # providerCategory: "Community"
     # providerResponsible: "openDesk"
@@ -50,7 +44,7 @@ images:
     # upstreamRepository: "bmi/opendesk/components/supplier/collabora/images/collabora-online-for-opendesk"
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/collabora/images/collabora-online-for-opendesk"
-    tag: "25.04.3.2.1@sha256:e2940b19d855bf6e557c445aaf5b2b7db978af9aeae7e6400bfcc99411dd8bb9"
+    tag: "25.04.2.2.1@sha256:03ec7f7740c5030eeb4f642c41fa0b9989d7a0dab81435a86b5c82479d0f78e2"
   collaboraController:
     # Enterprise Component
     # providerCategory: "Supplier"
@@ -160,7 +154,7 @@ images:
     # upstreamMirrorStartFrom: ["2", "1", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/intercom-service"
-    tag: "2.19.0@sha256:ebb4e721f4daebf5a206359978b327e85f2d51b9bf145576778ca3b5983920f8"
+    tag: "2.12.0@sha256:380476d849fb353dc167ba52a6b0f6235b3fa7561c082e65c37e2242cedb0df1"
   jibri:
     # providerCategory: "Supplier"
     # providerResponsible: "Nordeck"
@@ -216,10 +210,8 @@ images:
     # providerResponsible: "openDesk"
     # upstreamRegistry: "https://registry-1.docker.io"
     # upstreamRepository: "bitnami/kubectl"
-    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
-    # upstreamMirrorStartFrom: ["1", "32", "0"]
-    registry: "registry.opencode.de"
-    repository: "bmi/opendesk/components/community/images-mirror/kubectl"
+    registry: "registry-1.docker.io"
+    repository: "bitnami/kubectl"
     tag: "1.32.0@sha256:48c81b7aaf4fabf2733a0b888960f6982181fbcd2c3f8dfcebc4a1a065631162"
   jvb:
     # providerCategory: "Supplier"
@@ -248,7 +240,7 @@ images:
     # upstreamMirrorStartFrom: ["1", "4", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/nordeck/images-mirror/matrix-neoboard-widget"
-    tag: "2.2.1@sha256:db404ba5b8e76cbd1166529dc2156d84506f1c2d341a1798d25a074e531b9d3d"
+    tag: "2.1.0@sha256:3a386d5a7d1b0582372909e8f3714fc82304fbfb0c078807476d867f726d30f5"
   matrixNeoChoiceWidget:
     # providerCategory: "Supplier"
     # providerResponsible: "Nordeck"
@@ -258,7 +250,7 @@ images:
     # upstreamMirrorStartFrom: ["1", "4", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/nordeck/images-mirror/matrix-poll-widget"
-    tag: "1.5.2@sha256:8d0cce2b4f71787cab6cd1b6e6ff52205224a5d01ba384b3ebfbf05bc3228930"
+    tag: "1.5.1@sha256:00d28898e2b08d00dc7f4ed986d496779b95f0b87347b6059b76d291eb44a7eb"
   matrixNeoDateFixBot:
     # providerCategory: "Supplier"
     # providerResponsible: "Nordeck"
@@ -268,7 +260,7 @@ images:
     # upstreamMirrorStartFrom: ["2", "7", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/nordeck/images-mirror/matrix-meetings-bot"
-    tag: "2.8.3@sha256:5bc9b8d67b4ecb38b618e84d54e759ba57c0533706300154a60423dfcf86f7e1"
+    tag: "2.8.2@sha256:1266f4af93cd82554e037125a7f6d753742bcde3dd90ecbeed8f6f5f64689c96"
   matrixNeoDateFixWidget:
     # providerCategory: "Supplier"
     # providerResponsible: "Nordeck"
@@ -278,7 +270,7 @@ images:
     # upstreamMirrorStartFrom: ["1", "6", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/nordeck/images-mirror/matrix-meetings-widget"
-    tag: "1.7.1@sha256:c03917f78ba197b2f93a59eb3d6596447de1e2bf5836194afa121fae8ea18593"
+    tag: "1.7.0@sha256:a3547f064dff6b469bb3ed931acd4edba9654699e1af59a9180987bbbfd8104b"
   matrixUserVerificationService:
     # providerCategory: "Supplier"
     # providerResponsible: "Element"
@@ -294,11 +286,9 @@ images:
     # providerResponsible: "openDesk"
     # upstreamRegistry: "https://registry-1.docker.io"
     # upstreamRepository: "bitnami/memcached"
-    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)-debian-(\d+)-r(\d+)$'
-    # upstreamMirrorStartFrom: ["1", "6", "38", "12", "3"]
-    registry: "registry.opencode.de"
-    repository: "bmi/opendesk/components/community/images-mirror/memcached"
-    tag: "1.6.38-debian-12-r3@sha256:ea35c7d38b5e080a900991220323e31539b2877069d8aa4dc6814fe384e3c0da"
+    registry: "registry-1.docker.io"
+    repository: "bitnami/memcached"
+    tag: "1.6.38-debian-12-r3@sha256:3e548fba727578be9d996262471f5f3e07726d625702d26743a5e0f34684cb21"
   migrations:
     # providerCategory: "Platform"
     # providerResponsible: "openDesk"
@@ -320,11 +310,9 @@ images:
     # providerResponsible: "openDesk"
     # upstreamRegistry: "https://registry-1.docker.io"
     # upstreamRepository: "bitnami/minio"
-    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)-debian-(\d+)-r(\d+)$'
-    # upstreamMirrorStartFrom: ["2025", "4", "22", "12", "1"]
-    registry: "registry.opencode.de"
-    repository: "bmi/opendesk/components/community/images-mirror/minio"
-    tag: "2025.4.22-debian-12-r1@sha256:b5c26fa4a2cc2abffe096a54d9e7fd3976d72e38bd2186338b1a06d66c63e651"
+    registry: "registry-1.docker.io"
+    repository: "bitnami/minio"
+    tag: "2025.4.22-debian-12-r1@sha256:d7cd0e172c4cc0870f4bdc3142018e2a37be9acf04d68f386600daad427e0cab"
   nextcloud:
     # providerCategory: "Platform"
     # providerResponsible: "openDesk"
@@ -332,7 +320,7 @@ images:
     # upstreamRepository: "bmi/opendesk/components/platform-development/images/opendesk-nextcloud"
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/images/opendesk-nextcloud"
-    tag: "31.0.6@sha256:0fc39982b568383b531e7b5864c421725085bb70787a44cb30e401d6face8efa"
+    tag: "30.0.10@sha256:a022c6279072eb45d14cab29296860a15ad0d5801f50a56928334eb99bae50d0"
   nextcloudExporter:
     # providerCategory: "Platform"
     # providerResponsible: "openDesk"
@@ -382,7 +370,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "34", "2"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/blocklist-cleanup"
-    tag: "0.39.1@sha256:a08a36d0c0558a71f164ef24b3b8f897fa4b87217f9063ae493d4c66c7348c5c"
+    tag: "0.34.2@sha256:137dc06ef02ea4962f5bd55c093153eead2b9f2d204cfc26fd44bc77397b9461"
   nubusDataLoader:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -392,7 +380,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "41", "5"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/data-loader"
-    tag: "0.97.0@sha256:0c4a92f892d54ca3669b33391fb1fb6b45f6a9c43080beacd0d3fa061b0826ab"
+    tag: "0.95.0@sha256:57028c6a76d000a2085f7a429c704ac495be6e4e7ce0a5cc85e3bed25766ce32"
   nubusGuardianAuthorizationApi:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -442,7 +430,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.2.1@sha256:c338d5bba11185b1cca6d5e5e1b6fe28bedcd8f02af8b4b96e431bde617f5f72"
   nubusKeycloakBootstrap:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -452,7 +440,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "1", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/keycloak-bootstrap"
-    tag: "0.15.2@sha256:207cb4355cead96c8dbfc5c89f77e591c226ebbcac1079c08e6f0eeb8183acea"
+    tag: "0.12.1@sha256:4a36e3753bda7d6ccc6fc98f5e115bf96a4257c1a9458d075888256484cfdd4b"
   nubusKeycloakExtensionHandler:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -462,7 +450,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.11.0@sha256:aaba6527f37a7302cf54b0a689a1c11cb439bdc471e01d101726a05902714b9c"
   nubusKeycloakExtensionProxy:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -472,7 +460,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.15.3@sha256:087a8f242ac40f01bdc8326b220ec5b0034b64b3a3be6cf3968563c3d48eb056"
   nubusLdapNotifier:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -482,7 +470,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "8", "2"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/ldap-notifier"
-    tag: "0.46.0@sha256:2856ea8767e5fa93d0bfcb7211397e121e2792a731825381400dedbdd8ff6a7b"
+    tag: "0.43.0@sha256:dcd4e7f1008eb4c6c1ae809785bee0da9cba1347af09ddbc147b76c422f4f35c"
   nubusLdapServer:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -492,7 +480,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "8", "2"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/ldap-server"
-    tag: "0.46.0@sha256:5a1612c58f4edb2e42060ac2f927414574d5689c52cbd813f5b2eca0c7c5f75c"
+    tag: "0.43.0@sha256:67557ec3e3bd7ff4981666dddb5455672ee8767e12e3876ea79447627f9d9742"
   nubusLdapServerDhInitContainer:
     # providerCategory: 'Community'
     # providerResponsible: 'Univention'
@@ -510,7 +498,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "29", "1"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/ldap-server-elector"
-    tag: "0.46.0@sha256:688dd37bc472d752d8e4a727374ce13ffdd3fcd65a598f39a8cf54c56d3988e0"
+    tag: "0.40.0@sha256:abd273062824bf652b891b37ef3093771a8f686ef414cbe376c837293d115ac9"
   nubusLdapUpdateUniventionObjectIdentifier:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -520,7 +508,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.39.1@sha256:3c1ff735df4f4c133bdb3d6a833cc081c7a31e8efcb84c63ed046cd6840469e5"
+    tag: "0.34.2@sha256:137dc06ef02ea4962f5bd55c093153eead2b9f2d204cfc26fd44bc77397b9461"
   nubusNats:
     # providerCategory: 'Community'
     # providerResponsible: 'Univention'
@@ -554,7 +542,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "9", "4"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/notifications-api"
-    tag: "0.74.1@sha256:3613be84aa991fcd15f6cf47f32bc61345ec660c1a5bf9c3e3e843e8b803b9c4"
+    tag: "0.70.0@sha256:0120cca997eddcd6b9a5f0b9d6fb39ac2ffb118357380c28ab5352c16130a873"
   nubusOpendeskExtension:
     # providerCategory: "Platform"
     # providerResponsible: "openDesk"
@@ -562,7 +550,7 @@ images:
     # upstreamRepository: "bmi/opendesk/components/platform-development/images/opendesk-nubus"
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/images/opendesk-nubus"
-    tag: "1.14.9@sha256:a2c7a5e302ed5cc52445fd1b18b277de4a3d45b2a2940f1a3970447dc13eb16c"
+    tag: "1.14.4@sha256:cf0e22c1eef138a413a90a60c5405126dc769195dd4dd37229a27afaa82ef3b3"
   nubusOpendeskExtensionA2gMapper:
     # providerCategory: "Platform"
     # providerResponsible: "openDesk"
@@ -590,7 +578,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "10", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/ox-extension"
-    tag: "0.27.2@sha256:7bb54f5ae0e797172fb92bd7a8a479f179ebd51c1fb5af98fa7b6025f9ffaca4"
+    tag: "0.11.1@sha256:e57df5c02d0480ccf1d299964e3c676d92440d5e959b4f587945f08624da3ae9"
   nubusPortalConsumer:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -600,7 +588,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "27", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-consumer"
-    tag: "0.74.1@sha256:1d9b7e890ee46aa4a2a78ab2e7734ac4bf037f86631a43964d1d8fab17772987"
+    tag: "0.70.0@sha256:09eed9e5a7066f69b5d6085541ca91538ca9519d765ec7109d6934a6e67ab7cc"
   nubusPortalExtension:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -610,17 +598,15 @@ images:
     # upstreamMirrorStartFrom: ["0", "28", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-extension"
-    tag: "0.74.1@sha256:cb3c3e4188cfde1d2091790bed38495bf4aa05b54c88e76fd78923db25502c1a"
+    tag: "0.59.1@sha256:c9c7faa3cca2be2f45d073517a50e8a8cc89d46c978c2f3a6be3c13d0e6ae900"
   nubusPortalFrontend:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
     # upstreamRegistry: "https://artifacts.software-univention.de"
     # upstreamRepository: "nubus/images/portal-frontend"
-    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
-    # upstreamMirrorStartFrom: ["0", "67", "0"]
     registry: "registry.opencode.de"
-    repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-frontend"
-    tag: "0.74.1@sha256:c96209ceb0220b4f05472ba8273a96ed4e526ba5b37f82876aa21a030603cf95"
+    repository: "bmi/opendesk/components/platform-development/images/opendesk-nubus-portal-update"
+    tag: "1.10.14@sha256:fbdec057958fd7e728431cf96896b8453c2f5b390ce3d2f169a7766f49926b1b"
   nubusPortalServer:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -630,7 +616,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "9", "4"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-server"
-    tag: "0.74.1@sha256:1f143b81c7c72754784f9399999c2fcb0d34ac7ec0db6fdefb790a1c2ab4ec62"
+    tag: "0.70.0@sha256:1331d5b5861574195f6bd0dfc3c8e1d6a2650b518e206a2815b682d43ab75d0b"
   nubusProvisioningDispatcher:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -640,7 +626,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "14", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-dispatcher"
-    tag: "0.60.2@sha256:356f28afe6354b91a5473c8e3f3c647ae6aca0cf7de47f4e47f6e7acf7a5ab7c"
+    tag: "0.56.0@sha256:324866b7a80e17c5a1a6bbc02163a14e084eecc86df1ece5b3e10d3344bbe1ad"
   nubusProvisioningEventsAndConsumerApi:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -650,7 +636,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.2@sha256:3e4fd557abc8350a8d7725ade0103ade7dc28f1ea31cfc981e03e9ce51fa7244"
+    tag: "0.56.0@sha256:37d8ac54a9d06685e4536f6f349a51efc0f51a5a06d2503333918377cb7fed37"
   nubusProvisioningPrefill:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -660,7 +646,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "14", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-prefill"
-    tag: "0.60.2@sha256:23eec4905847ab050a83834f6d70419182601838da4687882c93100842ff349f"
+    tag: "0.56.0@sha256:76b6f556a8baec164ee060104d85b9641bd6f17342d40a53943eea03fd432343"
   nubusProvisioningUdmListener:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -670,7 +656,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "14", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-udm-listener"
-    tag: "0.60.2@sha256:38c2db4e270f67b2d97423ca727fc2a8030dce73a93bd2967d2682844d3bf480"
+    tag: "0.56.0@sha256:e89f2094f245b70ffa198942ae4310e5784b61099ac80f427659a28706b509f5"
   nubusProvisioningUdmTransformer:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -680,7 +666,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "14", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-udm-transformer"
-    tag: "0.60.2@sha256:df38dc8528f0eec1f44db45a8156697d0424bd008c65a1619de15b6ac586d1a0"
+    tag: "0.56.0@sha256:4bb855be7a1b9abb8c6ae07afd9c35acb6d7aaad80d36c1132e054fe1bdd0156"
   nubusSelfServiceConsumer:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -690,7 +676,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "3", "2"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/selfservice-invitation"
-    tag: "0.19.0@sha256:4215533c7c4497e02666cf04ee77ab866263ae6e595758e8b63018b257e972ad"
+    tag: "0.17.0@sha256:00e6124eecc1b763326023ecaf9702053e24b39b20f5efbcd35dfaad642d2cda"
   nubusUdmRestApi:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -700,7 +686,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "9", "3"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/udm-rest-api"
-    tag: "0.39.1@sha256:62324c259bdd8e6273aeaf93df44405ef5e42ca17281d19e2a0d86f4f44b742e"
+    tag: "0.37.1@sha256:a0508191a52ed9c388e0574cf6a97031fdfffcff95ab8ca3e4231c795d3a68df"
   nubusUmcGateway:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -710,7 +696,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "7", "3"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/umc-gateway"
-    tag: "0.49.0@sha256:a6b779fc7f214f045fe04783d7d137b1dca15dcfafa369508225ab7734bc0287"
+    tag: "0.47.1@sha256:71d1fb00a28a7cc83e1a8a675b8e9dc3ff67b1d7f366b2d60f9623fdb5f6e419"
   nubusUmcServer:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -720,7 +706,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "7", "3"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/umc-server"
-    tag: "0.49.0@sha256:94efec7b3559c27b54984d75f43d248139091255b4978ef7bf0219eb6f6d2e48"
+    tag: "0.47.1@sha256:8f451e7b50c6a32a8d4bad5959a103e34e3ae8d0bef2fe3df2dc8fbe7ae9c1b6"
   nubusUmcServerProxy:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -738,7 +724,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "9", "4"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/wait-for-dependency"
-    tag: "0.35.0@sha256:61dfaea28a2b150459138dfd6a554ce53850cee05ef2a72ab47bbe23f2a92d0d"
+    tag: "0.33.0@sha256:7e0e5e93422b2e99915d95d674ab37a8f9c79c0b8f1ebf69c2e7706bb718ae75"
   opendeskKeycloakBootstrap:
     # providerCategory: "Platform"
     # providerResponsible: "openDesk"
@@ -764,7 +750,7 @@ images:
     # upstreamMirrorStartFrom: ["13", "1", "1"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/openproject/images-mirror/open_desk"
-    tag: "16.2.1@sha256:4b0c0589ad21b727cf4a7c896f8f446607319ac3ff476855f7576b5eb1173cff"
+    tag: "16.1.1@sha256:2fe8a7d1cab42611b01f4ca20ce7179a0637477f2882364b4a1cfdebde9ecd6f"
   openprojectBootstrap:
     # providerCategory: "Platform"
     # providerResponsible: "openDesk"
@@ -798,7 +784,7 @@ images:
     # upstreamMirrorStartFrom: ["8", "6", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/core-guidedtours"
-    tag: "8.6.19@sha256:2c8abc8385090bac03c4540c176ec9c51cd73b0a5a477840d7250ead10701770"
+    tag: "8.6.17@sha256:27178fc42f2334385f1d206e4e7991d4953a102f114729d186b61c0d40babb4f"
   openxchangeCoreMW:
     # providerCategory: "Supplier"
     # providerResponsible: "Open-Xchange"
@@ -808,7 +794,7 @@ images:
     # upstreamMirrorStartFrom: ["8", "20", "51"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/middleware-public-sector"
-    tag: "8.39.71@sha256:eb5a1e124e8d98aeac2bd32dab8ec690aa71c8e49e5c57916452c471e1afd628"
+    tag: "8.38.73@sha256:610d4bab888e5749ff918a782ba1c33ed4aa8da9e13d5be4ad71ca2f698d4044"
   openxchangeCoreUI:
     # providerCategory: "Supplier"
     # providerResponsible: "Open-Xchange"
@@ -818,7 +804,7 @@ images:
     # upstreamMirrorStartFrom: ["8", "20", "1"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/core-ui"
-    tag: "8.39.1@sha256:d25119e36689231d09d747c32c14439d073318f6fd7d084761525579b636ee93"
+    tag: "8.38.1@sha256:77bf250df7ac465006576d5e1e0a8420ce6d0fce622b749c6da318793b88490c"
   openxchangeCoreUIMiddleware:
     # providerCategory: "Supplier"
     # providerResponsible: "Open-Xchange"
@@ -828,7 +814,7 @@ images:
     # upstreamMirrorStartFrom: ["2", "0", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/core-ui-middleware"
-    tag: "2.1.3@sha256:5a9259ef6cb155a8e5b94d567af00d8899934550565fbf109ab17200cf5df7f4"
+    tag: "2.1.2@sha256:36fe59a047fa466bef6fcdeed1ed8e4bbeaf7824c37c63e3bfe7262cd135cb9e"
   openxchangeCoreUserGuide:
     # providerCategory: "Supplier"
     # providerResponsible: "Open-Xchange"
@@ -838,7 +824,7 @@ images:
     # upstreamMirrorStartFrom: ["8", "20", "799279"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/core-user-guide"
-    tag: "8.39.1471602@sha256:4a02e72caca3e21c2919960167f28962de7e70161dad6f7916e8d3b8e104768e"
+    tag: "8.38.1408226@sha256:1a18c6c7b6a7a0f16376a9c298e65a13a4b482f6df1351582250a88571f1fa73"
   openxchangeDocumentConverter:
     # providerCategory: "Supplier"
     # providerResponsible: "Open-Xchange"
@@ -848,7 +834,7 @@ images:
     # upstreamMirrorStartFrom: ["8", "20", "50"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/documentconverter"
-    tag: "8.39.1842@sha256:a405aface2a9a187c66b2862bc724ee075ebc0209c931abd3478f3cafaf137f7"
+    tag: "8.38.1817@sha256:d7537574765e19e7c9e13fe936c1a4c69b39bda216abcd000dad9f93fbb62f7b"
   openxchangeGotenberg:
     # providerCategory: "Supplier"
     # providerResponsible: "Open-Xchange"
@@ -868,7 +854,7 @@ images:
     # upstreamMirrorStartFrom: ["4", "2", "2"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/guard-ui"
-    tag: "8.33.4@sha256:e73afec3d549943379fdb12dde1ab14d53c6fafac221e2512c6641ac71c65b3f"
+    tag: "8.33.2@sha256:920b5ac87128f30c176c0ae75c6bedd32d226a97c6c5a822235606c39992ee9a"
   openxchangeImageConverter:
     # providerCategory: "Supplier"
     # providerResponsible: "Open-Xchange"
@@ -878,7 +864,7 @@ images:
     # upstreamMirrorStartFrom: ["8", "20", "50"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/imageconverter"
-    tag: "8.39.2122@sha256:d025984017d9a70473a4217bd9b815df08cfa9941137e6f02c024917061313a6"
+    tag: "8.38.2105@sha256:9c79f29712c5a5479bc1a08e127c65415a50a63954b244c1d34a570f5f3ed1f6"
   openxchangeNextcloudIntegrationUI:
     # providerCategory: "Supplier"
     # providerResponsible: "Open-Xchange"
@@ -888,7 +874,7 @@ images:
     # upstreamMirrorStartFrom: ["1", "2", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/nextcloud-integration-ui"
-    tag: "1.4.2@sha256:b52b0d1735e545fb6ec1cb064aa229135b0503295e8ac672a06816a364a7a18e"
+    tag: "1.4.1@sha256:423d596b52ab32778d7227d98ccc719f98395a00d95ff0bcac826665b59e1937"
   openxchangePublicSectorUI:
     # providerCategory: "Supplier"
     # providerResponsible: "Open-Xchange"
@@ -908,7 +894,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "4", "2"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/ox-connector-standalone"
-    tag: "0.27.2@sha256:4753a1d4a01acb7c6946fc9c8596fd328afe0d3c0b3098adfe85cef89fb1b7d7"
+    tag: "0.19.0@sha256:447e3c3e0cdd8bf1f86004d2088c24fcf6141ff6fef78ade8dfe86f7f16ba40e"
   postfix:
     # providerCategory: "Platform"
     # providerResponsible: "openDesk"
@@ -948,11 +934,9 @@ images:
     # providerResponsible: "openDesk"
     # upstreamRegistry: "https://registry-1.docker.io"
     # upstreamRepository: "bitnami/redis"
-    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)-debian-(\d+)-r(\d+)$'
-    # upstreamMirrorStartFrom: ["7", "4", "3", "12", "0"]
-    registry: "registry.opencode.de"
-    repository: "bmi/opendesk/components/community/images-mirror/redis"
-    tag: "7.4.3-debian-12-r0@sha256:fbdf361bbb6a17be28913fb9e4a1cfe3244331d2cbf449ecfe7a1fbbab02efc4"
+    registry: "registry-1.docker.io"
+    repository: "bitnami/redis"
+    tag: "7.4.3-debian-12-r0@sha256:a25b5d07a14ec13730022c7cd9bab6308d55ccd86b74af7315553c17be884889"
   synapse:
     # providerCategory: "Supplier"
     # providerResponsible: "Element"
@@ -997,12 +981,24 @@ images:
     registry: "registry-1.docker.io"
     repository: "library/nginx"
     tag: "1.28.0-alpine3.21@sha256:aed99734248e851764f1f2146835ecad42b5f994081fa6631cc5d79240891ec9"
-  xwiki:
+  xwikiMariadb:
     # providerCategory: "Supplier"
     # providerResponsible: "XWiki"
     # upstreamRegistry: "https://git.xwikisas.com:5050"
-    # upstreamRepository: "xwikisas/swp/xwiki-solr"
-    registry: "git.xwikisas.com:5050"
-    repository: "xwikisas/swp/xwiki-solr"
-    tag: "1.0.0"
+    # upstreamRepository: "xwikisas/swp/xwiki"
+    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)-mariadb.+$'
+    # upstreamMirrorStartFrom: ["0", "12"]
+    registry: "registry.opencode.de"
+    repository: "bmi/opendesk/components/supplier/xwiki/images-mirror/xwiki"
+    tag: "0.25-mariadb-jetty-alpine@sha256:7175ef5e454b4eb0f6fd6a92a9503d8a680db3ca97b25c3a4eedac9c9bfbcdaf"
+  xwikiPostgres:
+    # providerCategory: "Supplier"
+    # providerResponsible: "XWiki"
+    # upstreamRegistry: "https://git.xwikisas.com:5050"
+    # upstreamRepository: "xwikisas/swp/xwiki"
+    # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)-postgres.+$'
+    # upstreamMirrorStartFrom: ["0", "23"]
+    registry: "registry.opencode.de"
+    repository: "bmi/opendesk/components/supplier/xwiki/images-mirror/xwiki"
+    tag: "0.25-postgres-jetty-alpine@sha256:1bfc57a65f8bc6b059d550791699b5afa33b91db8d4c75ca8f6f3d2299f7c335"
 ...