diff --git a/docs/migrations.md b/docs/migrations.md
index 162b3531..866d5d67 100644
--- a/docs/migrations.md
+++ b/docs/migrations.md
@@ -8,130 +8,6 @@ SPDX-License-Identifier: Apache-2.0
 <!-- TOC -->
 * [Disclaimer](#disclaimer)
 * [Automated migrations - Overview and mandatory upgrade path](#automated-migrations---overview-and-mandatory-upgrade-path)
-* [Manual checks/actions](#manual-checksactions)
-  * [v1.6.0+](#v160)
-    * [Pre-upgrade to v1.6.0+](#pre-upgrade-to-v160)
-      * [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)
-    * [Post-upgrade to v1.6.0+](#post-upgrade-to-v160)
-      * [OX App Suite fix-up: Using S3 as storage for non mail attachments (post-upgrade)](#ox-app-suite-fix-up-using-s3-as-storage-for-non-mail-attachments-post-upgrade)
-  * [v1.4.0+](#v140)
-    * [Pre-upgrade to v1.4.0+](#pre-upgrade-to-v140)
-      * [Helmfile new feature: `functional.authentication.ssoFederation`](#helmfile-new-feature-functionalauthenticationssofederation)
-      * [Helmfile cleanup: `global.additionalMailDomains` as list](#helmfile-cleanup-globaladditionalmaildomains-as-list)
-  * [v1.2.0+](#v120)
-    * [Pre-upgrade to v1.2.0+](#pre-upgrade-to-v120)
-      * [Helmfile cleanup: Do not configure OX provisioning when no OX installed](#helmfile-cleanup-do-not-configure-ox-provisioning-when-no-ox-installed)
-      * [Helmfile new default: PostgreSQL for XWiki and Nextcloud](#helmfile-new-default-postgresql-for-xwiki-and-nextcloud)
-  * [v1.1.2+](#v112)
-    * [Pre-upgrade to v1.1.2+](#pre-upgrade-to-v112)
-      * [Helmfile feature update: App settings wrapped in `apps.` element](#helmfile-feature-update-app-settings-wrapped-in-apps-element)
-  * [v1.1.1+](#v111)
-    * [Pre-upgrade to v1.1.1](#pre-upgrade-to-v111)
-      * [Helmfile feature update: Component specific `storageClassName`](#helmfile-feature-update-component-specific-storageclassname)
-      * [Helmfile new secret: `secrets.nubus.masterpassword`](#helmfile-new-secret-secretsnubusmasterpassword)
-  * [v1.1.0+](#v110)
-    * [Pre-upgrade to v1.1.0](#pre-upgrade-to-v110)
-      * [Helmfile cleanup: Restructured `/helmfile/files/theme` folder](#helmfile-cleanup-restructured-helmfilefilestheme-folder)
-      * [Helmfile cleanup: Consistent use of `*.yaml.gotmpl`](#helmfile-cleanup-consistent-use-of-yamlgotmpl)
-      * [Helmfile cleanup: Prefixing certain app directories with `opendesk-`](#helmfile-cleanup-prefixing-certain-app-directories-with-opendesk-)
-      * [Helmfile cleanup: Splitting external services and openDesk services](#helmfile-cleanup-splitting-external-services-and-opendesk-services)
-      * [Helmfile cleanup: Streamlining `openxchange` and `oxAppSuite` attribute names](#helmfile-cleanup-streamlining-openxchange-and-oxappsuite-attribute-names)
-      * [Helmfile feature update: Dicts to define `customization.release`](#helmfile-feature-update-dicts-to-define-customizationrelease)
-      * [openDesk defaults (new): Enforce login](#opendesk-defaults-new-enforce-login)
-      * [openDesk defaults (changed): Jitsi room history enabled](#opendesk-defaults-changed-jitsi-room-history-enabled)
-      * [External requirements: Redis 7.4](#external-requirements-redis-74)
-    * [Post-upgrade to v1.1.0+](#post-upgrade-to-v110)
-      * [XWiki fix-ups](#xwiki-fix-ups)
-  * [v1.1.0](#v110-1)
-    * [Pre-upgrade to v1.1.0](#pre-upgrade-to-v110-1)
-      * [Configuration Cleanup: Removal of unnecessary OX-Profiles in Nubus](#configuration-cleanup-removal-of-unnecessary-ox-profiles-in-nubus)
-      * [Configuration Cleanup: Updated `global.imagePullSecrets`](#configuration-cleanup-updated-globalimagepullsecrets)
-      * [Changed openDesk defaults: Matrix presence status disabled](#changed-opendesk-defaults-matrix-presence-status-disabled)
-      * [Changed openDesk defaults: Matrix ID](#changed-opendesk-defaults-matrix-id)
-      * [Changed openDesk defaults: File-share configurability](#changed-opendesk-defaults-file-share-configurability)
-      * [Changed openDesk defaults: Updated default subdomains in `global.hosts`](#changed-opendesk-defaults-updated-default-subdomains-in-globalhosts)
-      * [Changed openDesk defaults: Dedicated group for access to the UDM REST API](#changed-opendesk-defaults-dedicated-group-for-access-to-the-udm-rest-api)
-    * [Post-upgrade to v1.0.0+](#post-upgrade-to-v100)
-      * [Configuration Improvement: Separate user permission for using Video Conference component](#configuration-improvement-separate-user-permission-for-using-video-conference-component)
-      * [Optional Cleanup](#optional-cleanup)
-* [Automated migrations - Details](#automated-migrations---details)
-  * [v1.6.0+ (automated)](#v160-automated)
-    * [v1.6.0+ migrations-post](#v160-migrations-post)
-  * [v1.2.0+ (automated)](#v120-automated)
-    * [v1.2.0+ migrations-pre](#v120-migrations-pre)
-    * [v1.2.0+ migrations-post](#v120-migrations-post)
-  * [v1.1.0+ (automated)](#v110-automated)
-  * [v1.0.0+ (automated)](#v100-automated)
-  * [Related components and artifacts](#related-components-and-artifacts)
-  * [Development](#development)
->>>>>>> 66e78530 (fix(Nubus): Update migrations for Nubus 1.10.x)
-* [Disclaimer](#disclaimer)
-* [Automated migrations - Overview and mandatory upgrade path](#automated-migrations---overview-and-mandatory-upgrade-path)
-* [Manual checks/actions](#manual-checksactions)
-  * [v1.6.0+](#v160)
-    * [Pre-upgrade to v1.6.0+](#pre-upgrade-to-v160)
-      * [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)
-    * [Post-upgrade to v1.6.0+](#post-upgrade-to-v160)
-      * [OX App Suite fix-up: Using S3 as storage for non mail attachments (post-upgrade)](#ox-app-suite-fix-up-using-s3-as-storage-for-non-mail-attachments-post-upgrade)
-  * [v1.4.0+](#v140)
-    * [Pre-upgrade to v1.4.0+](#pre-upgrade-to-v140)
-      * [Helmfile new feature: `functional.authentication.ssoFederation`](#helmfile-new-feature-functionalauthenticationssofederation)
-      * [Helmfile cleanup: `global.additionalMailDomains` as list](#helmfile-cleanup-globaladditionalmaildomains-as-list)
-  * [v1.2.0+](#v120)
-    * [Pre-upgrade to v1.2.0+](#pre-upgrade-to-v120)
-      * [Helmfile cleanup: Do not configure OX provisioning when no OX installed](#helmfile-cleanup-do-not-configure-ox-provisioning-when-no-ox-installed)
-      * [Helmfile new default: PostgreSQL for XWiki and Nextcloud](#helmfile-new-default-postgresql-for-xwiki-and-nextcloud)
-  * [v1.1.2+](#v112)
-    * [Pre-upgrade to v1.1.2+](#pre-upgrade-to-v112)
-      * [Helmfile feature update: App settings wrapped in `apps.` element](#helmfile-feature-update-app-settings-wrapped-in-apps-element)
-  * [v1.1.1+](#v111)
-    * [Pre-upgrade to v1.1.1](#pre-upgrade-to-v111)
-      * [Helmfile feature update: Component specific `storageClassName`](#helmfile-feature-update-component-specific-storageclassname)
-      * [Helmfile new secret: `secrets.nubus.masterpassword`](#helmfile-new-secret-secretsnubusmasterpassword)
-  * [v1.1.0+](#v110)
-    * [Pre-upgrade to v1.1.0](#pre-upgrade-to-v110)
-      * [Helmfile cleanup: Restructured `/helmfile/files/theme` folder](#helmfile-cleanup-restructured-helmfilefilestheme-folder)
-      * [Helmfile cleanup: Consistent use of `*.yaml.gotmpl`](#helmfile-cleanup-consistent-use-of-yamlgotmpl)
-      * [Helmfile cleanup: Prefixing certain app directories with `opendesk-`](#helmfile-cleanup-prefixing-certain-app-directories-with-opendesk-)
-      * [Helmfile cleanup: Splitting external services and openDesk services](#helmfile-cleanup-splitting-external-services-and-opendesk-services)
-      * [Helmfile cleanup: Streamlining `openxchange` and `oxAppSuite` attribute names](#helmfile-cleanup-streamlining-openxchange-and-oxappsuite-attribute-names)
-      * [Helmfile feature update: Dicts to define `customization.release`](#helmfile-feature-update-dicts-to-define-customizationrelease)
-      * [openDesk defaults (new): Enforce login](#opendesk-defaults-new-enforce-login)
-      * [openDesk defaults (changed): Jitsi room history enabled](#opendesk-defaults-changed-jitsi-room-history-enabled)
-      * [External requirements: Redis 7.4](#external-requirements-redis-74)
-    * [Post-upgrade to v1.1.0+](#post-upgrade-to-v110)
-      * [XWiki fix-ups](#xwiki-fix-ups)
-  * [v1.1.0](#v110-1)
-    * [Pre-upgrade to v1.1.0](#pre-upgrade-to-v110-1)
-      * [Configuration Cleanup: Removal of unnecessary OX-Profiles in Nubus](#configuration-cleanup-removal-of-unnecessary-ox-profiles-in-nubus)
-      * [Configuration Cleanup: Updated `global.imagePullSecrets`](#configuration-cleanup-updated-globalimagepullsecrets)
-      * [Changed openDesk defaults: Matrix presence status disabled](#changed-opendesk-defaults-matrix-presence-status-disabled)
-      * [Changed openDesk defaults: Matrix ID](#changed-opendesk-defaults-matrix-id)
-      * [Changed openDesk defaults: File-share configurability](#changed-opendesk-defaults-file-share-configurability)
-      * [Changed openDesk defaults: Updated default subdomains in `global.hosts`](#changed-opendesk-defaults-updated-default-subdomains-in-globalhosts)
-      * [Changed openDesk defaults: Dedicated group for access to the UDM REST API](#changed-opendesk-defaults-dedicated-group-for-access-to-the-udm-rest-api)
-    * [Post-upgrade to v1.0.0+](#post-upgrade-to-v100)
-      * [Configuration Improvement: Separate user permission for using Video Conference component](#configuration-improvement-separate-user-permission-for-using-video-conference-component)
-      * [Optional Cleanup](#optional-cleanup)
-* [Automated migrations - Details](#automated-migrations---details)
-  * [v1.6.0+ (automated)](#v160-automated)
-    * [v1.6.0+ migrations-post](#v160-migrations-post)
-  * [v1.2.0+ (automated)](#v120-automated)
-    * [v1.2.0+ migrations-pre](#v120-migrations-pre)
-    * [v1.2.0+ migrations-post](#v120-migrations-post)
-  * [v1.1.0+ (automated)](#v110-automated)
-  * [v1.0.0+ (automated)](#v100-automated)
-  * [Related components and artifacts](#related-components-and-artifacts)
-  * [Development](#development)
->>>>>>> 58fde95a (feat(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)
-* [Disclaimer](#disclaimer)
-* [Automated migrations - Overview and mandatory upgrade path](#automated-migrations---overview-and-mandatory-upgrade-path)
 * [Manual checks/actions](#manual-checksactions)
   * [v1.6.0+](#v160)
     * [Pre-upgrade to v1.6.0+](#pre-upgrade-to-v160)
diff --git a/helmfile/environments/default/global.generated.yaml.gotmpl b/helmfile/environments/default/global.generated.yaml.gotmpl
index 1253e6c7..749e1ca6 100644
--- a/helmfile/environments/default/global.generated.yaml.gotmpl
+++ b/helmfile/environments/default/global.generated.yaml.gotmpl
@@ -3,5 +3,5 @@
 ---
 global:
   systemInformation:
-    releaseVersion: "v1.5.0"
+    releaseVersion: "v1.6.0"
 ...