diff --git a/docs/reference/announcements-release-notes/870/870-announcements.md b/docs/reference/announcements-release-notes/870/870-announcements.md
index 09ebd926744..6714fd27e6f 100644
--- a/docs/reference/announcements-release-notes/870/870-announcements.md
+++ b/docs/reference/announcements-release-notes/870/870-announcements.md
@@ -4,13 +4,13 @@ title: "Announcements"
description: "Important changes and updates for the Camunda 8.7 release including deprecation & removal notices."
---
-import DeployDiagramImg from '../../img/deploy-diagram-modal.png';
+import DeployDiagramImg from '../img/deploy-diagram-modal.png';
Important changes and updates for the Camunda 8.7 release are summarized below.
-| Scheduled release date | Scheduled end of maintenance | Release notes | Blog |
-| :--------------------- | :--------------------------- | :----------------------------------------------------------------------------------- | :---------------------------------------------------------------------------------------------- |
-| 8 April 2025 | 13 October 2026 | [8.7 release notes](/reference/announcements-release-notes/870/870-release-notes.md) | [Announcing Camunda 8.7](https://camunda.com/blog/2024/11/camunda-8-7-releasing-february-2025/) |
+| Scheduled release date | Scheduled end of maintenance | Release notes | Blog |
+| :--------------------- | :--------------------------- | :--------------------------------------------------- | :---------------------------------------------------------------------------------------------- |
+| 8 April 2025 | 13 October 2026 | [8.7 release notes](/reference/release-notes/870.md) | [Announcing Camunda 8.7](https://camunda.com/blog/2024/11/camunda-8-7-releasing-february-2025/) |
-## API updates SaaSSelf-Managed
-
- [Web Modeler](#web-modeler)
- [Deploy diagram change Self-Managed {#web-modeler-deploy-diagram-change}](#deploy-diagram-change-self-managed-web-modeler-deploy-diagram-change)
- [Milestones renamed to versions {#web-modeler-milestones-renamed-to-versions}](#milestones-renamed-to-versions-web-modeler-milestones-renamed-to-versions)
@@ -29,89 +27,18 @@ Important changes and updates for the Camunda 8.7 release are summarized below.
### Deploy diagram change Self-Managed {#web-modeler-deploy-diagram-change}
-With this version, we ship a breaking change to how Web Modeler **Deploy diagram** modals work. Clusters must now be proactively [configured](/docs/self-managed/modeler/web-modeler/configuration/configuration.md#clusters) to be able to deploy from Web Modeler.
+With this version, we ship a breaking change to how Web Modeler **Deploy diagram** modals work. Clusters must now be proactively [configured](/self-managed/modeler/web-modeler/configuration/configuration.md#clusters) to be able to deploy from Web Modeler.
- In 8.6, you could still configure cluster details on the **Deploy diagram** modal when deploying.
-- In 8.7, you can no longer configure cluster details on the **Deploy diagram** modal. You must [configure the cluster](/docs/self-managed/modeler/web-modeler/configuration/configuration.md#clusters) to be able to deploy from this modal.
-- Note that you must also be assigned the `Zeebe` [Identity role](/docs/self-managed/identity/user-guide/roles/add-assign-role.md) to be able to deploy.
+- In 8.7, you can no longer configure cluster details on the **Deploy diagram** modal. You must [configure the cluster](/self-managed/modeler/web-modeler/configuration/configuration.md#clusters) to be able to deploy from this modal.
+- Note that you must also be assigned the `Zeebe` [Identity role](/self-managed/identity/user-guide/roles/add-assign-role.md) to be able to deploy.
### Milestones renamed to versions {#web-modeler-milestones-renamed-to-versions}
The term "milestones" has been renamed to ["versions"](/components/modeler/web-modeler/versions.md) in Web Modeler for clarity and consistency with other Camunda 8 components. The renaming is implemented across the Web Modeler user interface and the API.
-If you are using the recommended Camunda 8 deployment option (Helm charts), the upgrade path from version 8.6 to 8.7 will be straightforward by chaninging the values file to the new syntax. Updated Helm charts will be provided to support the upgrade to the new streamlined architecture.
-
-New migration guides will also be provided to support you when migrating from a previous Camunda version.
-
-:::caution
-Additional upgrade considerations are necessary for deployments that use custom scripts, such as Docker containers, manual installations, or custom-developed Kubernetes deployments. For these deployments, customers can either continue to deploy with their original 8.6 topology and upgrade each component independently, or adopt our Helm Chart approach for the upgrade, which allows for unifying the deployment into a single JAR or container executable.
-:::
-
-#### Separated Ingress removed
-
-With Camunda 8.7, the Helm chart only supports combined Ingress setup, where all Camunda components run on the same Ingress object and hostname. Customers running on a separate Ingress must migrate to the combined Ingress setup, see [Ingress setup](/self-managed/setup/guides/ingress-setup.md).
-
-The following Helm chart values have been removed:
-
-```yaml
-connectors.ingress
-console.ingress
-identity.ingress
-operate.ingress
-optimize.ingress
-tasklist.ingress
-webModeler.ingress
-zeebeGateway.ingress
-```
-
-### Manual installation
-
-For organizations that do not use cloud-native platforms such as Kubernetes or container services, we will publish a reference architecture that provides guidance on implementing Camunda production clusters on VM-based systems, using Amazon Web Services (AWS) EC2 as an example.
-
-The architecture will include details on optimal instance sizing, network configurations, and security best practices, to ensure robust performance and reliability.
-
-### Camunda Exporter
-
-A new Camunda Exporter brings the importer and archiving logic of web components (Tasklist and Operate) closer to the distributed platform (Zeebe). The index schema is also being harmonized.
-
-#### Harmonized index schema
-
-Camunda is harmonizing our index structure and usage.
-
-- This removes unnecessary duplications over multiple indices due to the previous architecture.
-- With this change, several Operate indices can and will be used by Tasklist.
-- New indices have been created to integrate Identity into the system.
-
-
-
-#### Camunda Exporter
-
-The exporter can consume Zeebe records (mostly events created by the engine), aggregate data, and store the related data into shared and harmonized indices.
-
-- Data is archived in the background, coupled to the exporter but without blocking the exporter's progress.
-- Indices can be located in either ElasticSearch (ES) or Opensearch (OS). Our web components (Tasklist and Operate) then use the new harmonized indices to show data to the user.
-
-The following diagram shows a simplified version of this work.
-
-
-
-- For example, Tasklist and Operate Importers are still required for old data to be imported, but the Camunda exporter writes all new data into ES/OS. After old indices are drained, importers can be turned off.
-- The archiver, which takes care of the archiving of completed process instances, will be moved into the Zeebe system as well, to reduce the installation complexity and provide a better scaling and replication factor (based on partitions).
-- This helps achieve a streamlined architecture, and improves platform performance and stability (especially regarding ES/OS).
-- A new separate component covers the migration, which will be part of the single application but can also deployed separately. It will adjust the previous Operate indices to make them more harmonized and usable by Tasklist.
-
-
-
-## Camunda Java client and Camunda Spring SDK Self-Managed
-
-With the Camunda 8.7 release, Camunda Java client and Camunda Spring SDK replace the Zeebe Java client and Zeebe Spring SDK. This allows you to use a single consolidated client to interact with Camunda clusters.
-
-# The `CamundaClient` replaces the `ZeebeClient`, offering the same functionality and adding new capabilities.
-
In [the API](/apis-tools/web-modeler-api/index.md), new endpoints starting with `/api/v1/versions` have been introduced, while the previous `/api/v1/milestones` endpoints are now deprecated.
Further details can be found in [Web Modeler's OpenAPI documentation](https://modeler.camunda.io/swagger-ui/index.html).
diff --git a/docs/reference/announcements-release-notes/announcements.md b/docs/reference/announcements-release-notes/announcements.md
deleted file mode 100644
index 37c6ed0dee1..00000000000
--- a/docs/reference/announcements-release-notes/announcements.md
+++ /dev/null
@@ -1,119 +0,0 @@
----
-id: announcements
-title: "Announcements"
-description: "Important announcements for upcoming and past Camunda 8 releases that customers should be aware of, including deprecation & removal notices."
----
-
-Important changes and updates for Camunda 8 releases that customers should be aware of, including deprecation & removal notices.
-
-## Camunda 8.7
-
-Camunda 8.7 is scheduled for release on 8 April 2025.
-
-
-
-
-**[8.7 Announcements](/reference/announcements-release-notes/870/870-announcements.md)**
-
-
-
-
-- [API updates](/reference/announcements-release-notes/870/870-announcements.md#api-updates-saasself-managed)
-- [Identity management updates](/reference/announcements-release-notes/870/870-announcements.md#identity-management-updates-saasself-managed)
-- [Installation and deployment updates](/reference/announcements-release-notes/870/870-announcements.md#installation-and-deployment-updates-self-managed)
-- [Camunda Java client and Camunda Spring SDK](/reference/announcements-release-notes/870/870-announcements.md#camunda-java-client-and-camunda-spring-sdk-self-managed)
-
-
-
-
-
-**[8.6 Announcements](/reference/announcements-release-notes/860/860-release-notes.md)**
-
-
-
-
-- [License key changes](/reference/announcements-release-notes/860/860-release-notes.md#license-key-changes)
-- [Zeebe Java client](/reference/announcements-release-notes/860/860-release-notes.md#zeebe-java-client)
-- [Deprecation: Zeebe Go client & CLI client (zbctl)](/reference/announcements-release-notes/860/860-release-notes.md#deprecation-zeebe-go-client--cli-client-zbctl)
-- [Camunda 8 SaaS - Required cluster update](/reference/announcements-release-notes/860/860-release-notes.md#camunda-8-saas---required-cluster-update)
-- [Support for Amazon OpenSearch for Optimize](/reference/announcements-release-notes/860/860-release-notes.md#support-for-amazon-opensearch-for-optimize)
-- [Supported environment changes](/reference/announcements-release-notes/860/860-release-notes.md#supported-environment-changes-openjdk-elasticsearch-amazon-opensearch)
-- [Connectors](/reference/announcements-release-notes/860/860-release-notes.md#connectors)
-- [Flow control enabled by default in SaaS](/reference/announcements-release-notes/860/860-release-notes.md#flow-control-enabled-by-default-in-saas)
-- [Camunda 8 Self-Managed](/reference/announcements-release-notes/860/860-release-notes.md#camunda-8-self-managed)
-- [Camunda Optimize artifact and Docker tag separation](/reference/announcements-release-notes/860/860-release-notes.md#camunda-optimize-artifact-and-docker-tag-separation)
-- [New base path for Operate and Tasklist web applications](/reference/announcements-release-notes/860/860-release-notes.md#new-base-path-for-operate-and-tasklist-web-applications)
-
-
-
-
-
-**[8.5 Announcements](/reference/announcements-release-notes/850/850-release-notes.md#camunda-85)**
-
-
-
-
-- [Updated SaaS URLs](/reference/announcements-release-notes/850/850-announcements.md#updated-saas-urls)
-- [Syntax changes in Helm chart](/reference/announcements-release-notes/850/850-announcements.md#syntax-changes-in-helm-chart)
-- [Support for Amazon OpenSearch](/reference/announcements-release-notes/850/850-announcements.md#support-for-amazon-opensearch)
-- [Known limitations](/reference/announcements-release-notes/850/850-announcements.md#known-limitations)
-- [Changes in supported environments](/reference/announcements-release-notes/850/850-announcements.md#changes-in-supported-environments)
-- [New generation naming scheme](/reference/announcements-release-notes/850/850-announcements.md#camunda-saas-new-generation-naming-scheme)
-- [Removal of Web Modeler's beta API](/reference/announcements-release-notes/850/850-announcements.md#removal-of-web-modelers-beta-api)
-- [Serialization of timestamp values in management API](/reference/announcements-release-notes/850/850-announcements.md#zeebe-850-breaks-serialization-of-timestamp-values-in-management-api-self-managed-only)
-
-
-
-
-
-**[8.4 Announcements](/reference/announcements-release-notes/850/850-release-notes.md#camunda-84)**
-
-
-
-
-- [Versioning changes in Helm chart](/reference/announcements-release-notes/850/850-announcements.md#versioning-changes-in-helm-chart)
-- [Dockerfile numeric ID](/reference/announcements-release-notes/850/850-announcements.md#dockerfile-numeric-id)
-- [Deprecated in 8.4](/reference/announcements-release-notes/850/850-announcements.md#deprecated-in-84)
-- [Versioning changes in Elasticsearch](/reference/announcements-release-notes/850/850-announcements.md#versioning-changes-in-elasticsearch)
-- [Support for Amazon OpenSearch](/reference/announcements-release-notes/850/850-announcements.md#support-for-amazon-opensearch-1)
-- [Known limitations](/reference/announcements-release-notes/850/850-announcements.md#known-limitations-1)
-
-
-
-
-
-**[8.3 Announcements](/reference/announcements-release-notes/850/850-release-notes.md#camunda-83)**
-
-
-
-
-- [Deprecated in 8.3](/reference/announcements-release-notes/850/850-announcements.md#deprecated-in-83)
-- [Versioning changes in Elasticsearch](/reference/announcements-release-notes/850/850-announcements.md#versioning-changes-in-elasticsearch-1)
-- [Versioning changes in Helm chart](/reference/announcements-release-notes/850/850-announcements.md#versioning-changes-in-helm-chart-1)
-
-
-
+
+
+**[8.7 Announcements](/reference/announcements-release-notes/870/870-announcements.md)**
+
+
+
+
+- [API updates](/reference/announcements-release-notes/870/870-announcements.md#api-updates-saasself-managed)
+- [Identity management updates](/reference/announcements-release-notes/870/870-announcements.md#identity-management-updates-saasself-managed)
+- [Installation and deployment updates](/reference/announcements-release-notes/870/870-announcements.md#installation-and-deployment-updates-self-managed)
+- [Camunda Java client and Camunda Spring SDK](/reference/announcements-release-notes/870/870-announcements.md#camunda-java-client-and-camunda-spring-sdk-self-managed)
+
+
+
+
+
+**[8.6 Announcements](/reference/announcements-release-notes/860/860-release-notes.md)**
+
+
+
+
+- [License key changes](/reference/announcements-release-notes/860/860-release-notes.md#license-key-changes)
+- [Zeebe Java client](/reference/announcements-release-notes/860/860-release-notes.md#zeebe-java-client)
+- [Deprecation: Zeebe Go client & CLI client (zbctl)](/reference/announcements-release-notes/860/860-release-notes.md#deprecation-zeebe-go-client--cli-client-zbctl)
+- [Camunda 8 SaaS - Required cluster update](/reference/announcements-release-notes/860/860-release-notes.md#camunda-8-saas---required-cluster-update)
+- [Support for Amazon OpenSearch for Optimize](/reference/announcements-release-notes/860/860-release-notes.md#support-for-amazon-opensearch-for-optimize)
+- [Supported environment changes](/reference/announcements-release-notes/860/860-release-notes.md#supported-environment-changes-openjdk-elasticsearch-amazon-opensearch)
+- [Connectors](/reference/announcements-release-notes/860/860-release-notes.md#connectors)
+- [Flow control enabled by default in SaaS](/reference/announcements-release-notes/860/860-release-notes.md#flow-control-enabled-by-default-in-saas)
+- [Camunda 8 Self-Managed](/reference/announcements-release-notes/860/860-release-notes.md#camunda-8-self-managed)
+- [Camunda Optimize artifact and Docker tag separation](/reference/announcements-release-notes/860/860-release-notes.md#camunda-optimize-artifact-and-docker-tag-separation)
+- [New base path for Operate and Tasklist web applications](/reference/announcements-release-notes/860/860-release-notes.md#new-base-path-for-operate-and-tasklist-web-applications)
+
+
+
+
+
+**[8.5 Announcements](/reference/announcements-release-notes/850/850-release-notes.md#camunda-85)**
+
+
+
+
+- [Updated SaaS URLs](/reference/announcements-release-notes/850/850-announcements.md#updated-saas-urls)
+- [Syntax changes in Helm chart](/reference/announcements-release-notes/850/850-announcements.md#syntax-changes-in-helm-chart)
+- [Support for Amazon OpenSearch](/reference/announcements-release-notes/850/850-announcements.md#support-for-amazon-opensearch)
+- [Known limitations](/reference/announcements-release-notes/850/850-announcements.md#known-limitations)
+- [Changes in supported environments](/reference/announcements-release-notes/850/850-announcements.md#changes-in-supported-environments)
+- [New generation naming scheme](/reference/announcements-release-notes/850/850-announcements.md#camunda-saas-new-generation-naming-scheme)
+- [Removal of Web Modeler's beta API](/reference/announcements-release-notes/850/850-announcements.md#removal-of-web-modelers-beta-api)
+- [Serialization of timestamp values in management API](/reference/announcements-release-notes/850/850-announcements.md#zeebe-850-breaks-serialization-of-timestamp-values-in-management-api-self-managed-only)
+
+
+
+
+
+**[8.4 Announcements](/reference/announcements-release-notes/850/850-release-notes.md#camunda-84)**
+
+
+
+
+- [Versioning changes in Helm chart](/reference/announcements-release-notes/850/850-announcements.md#versioning-changes-in-helm-chart)
+- [Dockerfile numeric ID](/reference/announcements-release-notes/850/850-announcements.md#dockerfile-numeric-id)
+- [Deprecated in 8.4](/reference/announcements-release-notes/850/850-announcements.md#deprecated-in-84)
+- [Versioning changes in Elasticsearch](/reference/announcements-release-notes/850/850-announcements.md#versioning-changes-in-elasticsearch)
+- [Support for Amazon OpenSearch](/reference/announcements-release-notes/850/850-announcements.md#support-for-amazon-opensearch-1)
+- [Known limitations](/reference/announcements-release-notes/850/850-announcements.md#known-limitations-1)
+
+
+
+
+
+**[8.3 Announcements](/reference/announcements-release-notes/850/850-release-notes.md#camunda-83)**
+
+
+
+
+- [Deprecated in 8.3](/reference/announcements-release-notes/850/850-announcements.md#deprecated-in-83)
+- [Versioning changes in Elasticsearch](/reference/announcements-release-notes/850/850-announcements.md#versioning-changes-in-elasticsearch-1)
+- [Versioning changes in Helm chart](/reference/announcements-release-notes/850/850-announcements.md#versioning-changes-in-helm-chart-1)
+
+
+
- [ Connectors ](https://github.com/camunda/connectors/releases/tag/8.6.0) | [Release blog](https://camunda.com/blog/2024/10/camunda-8-6-release/) |
+| [8.5](/reference/announcements-release-notes/850/850-release-notes.md) | 9 April 2024 | 14 October 2025 | - [ Camunda 8 core ](https://github.com/camunda/camunda/releases/tag/8.5.0)
- [ Connectors ](https://github.com/camunda/connectors/releases/tag/8.5.0) | [Release blog](https://camunda.com/blog/2024/04/camunda-8-5-release/) |
+| 8.4 | 9 January 2024 | 9 July 2025 | - [ Camunda Platform ](https://github.com/camunda/camunda-platform/releases/tag/8.4.0)
- [ Connectors ](https://github.com/camunda/connectors/releases/tag/8.4.0) | [Release blog](https://camunda.com/blog/2024/01/camunda-8-4-simplifying-installation-enhancing-user-experience/) |
+| 8.3 | 10 October 2023 | 9 April 2025 | - [ Camunda Platform ](https://github.com/camunda/camunda-platform/releases/tag/8.3.0)
- [ Connectors ](https://github.com/camunda/connectors/releases/tag/8.3.0) | [Release blog](https://camunda.com/blog/2023/10/camunda-8-3-scaling-automation-maximize-value/) |
+| 8.2 | 11 April 2023 | 8 October 2024 | - [ Camunda Platform ](https://github.com/camunda/camunda-platform/releases/tag/8.2.0)
- [ Connectors ](https://github.com/camunda/connectors/releases/tag/8.2.0) | [Release blog](https://camunda.com/blog/2023/04/camunda-platform-8-2-key-to-scaling-automation/) |
+
+:::note
+Camunda Cloud 1.3 is available in the site dropdown, but is unsupported. However, the corresponding Optimize version for Camunda Cloud 1.3, Optimize 3.7, remains supported at this time.
+:::
+
+### Changelogs
+
+Technical changelogs for Camunda 8 are available on GitHub:
+
+- [Camunda 8 Core](https://github.com/camunda/camunda/releases)
+- [Connectors](https://github.com/camunda/connectors/releases)
+- [Camunda Helm chart](https://github.com/camunda/camunda-platform-helm/releases)
+
+Most releases and changelogs are available through the [Camunda Platform repo](https://github.com/camunda/camunda-platform). The following component release notes are available as linked below:
+
+- [Desktop Modeler](https://github.com/camunda/camunda-modeler/releases)
+- [Connectors](https://github.com/camunda/connectors/releases)
+
+Some components have changelogs that are not publicly available, including the following:
+
+- Web Modeler
+- Console
+
+These are available in a blog format under the [release notes](https://camunda.com/blog/category/releases/) tag.
## Release policy
diff --git a/docs/reference/announcements-release-notes/release-notes.md b/docs/reference/announcements-release-notes/release-notes.md
deleted file mode 100644
index 8a45acb2122..00000000000
--- a/docs/reference/announcements-release-notes/release-notes.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-id: release-notes
-title: "Release notes"
-description: "Release notes for Camunda 8 and its components."
----
-
-Camunda 8 release notes include notable new and improved features, enhancements, and bug fixes. Release notes are separated by minor release pages and include alphas released during the development cycle.
-
-| Version | Release date | Scheduled end of maintenance | Changelogs | Release blog |
-| ---------------------------------------------------------------------- | --------------- | ---------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------- |
-| [8.7](/reference/announcements-release-notes/870/870-release-notes.md) | 8 April 2025 | 13 October 2026 | - | - |
-| [8.6](/reference/announcements-release-notes/860/860-release-notes.md) | 8 October 2024 | 14 April 2026 | - [ Camunda 8 core ](https://github.com/camunda/camunda/releases/tag/8.6.0)
- [ Connectors ](https://github.com/camunda/connectors/releases/tag/8.6.0) | [Release blog](https://camunda.com/blog/2024/10/camunda-8-6-release/) |
-| [8.5](/reference/announcements-release-notes/850/850-release-notes.md) | 9 April 2024 | 14 October 2025 | - [ Camunda 8 core ](https://github.com/camunda/camunda/releases/tag/8.5.0)
- [ Connectors ](https://github.com/camunda/connectors/releases/tag/8.5.0) | [Release blog](https://camunda.com/blog/2024/04/camunda-8-5-release/) |
-| 8.4 | 9 January 2024 | 9 July 2025 | - [ Camunda Platform ](https://github.com/camunda/camunda-platform/releases/tag/8.4.0)
- [ Connectors ](https://github.com/camunda/connectors/releases/tag/8.4.0) | [Release blog](https://camunda.com/blog/2024/01/camunda-8-4-simplifying-installation-enhancing-user-experience/) |
-| 8.3 | 10 October 2023 | 9 April 2025 | - [ Camunda Platform ](https://github.com/camunda/camunda-platform/releases/tag/8.3.0)
- [ Connectors ](https://github.com/camunda/connectors/releases/tag/8.3.0) | [Release blog](https://camunda.com/blog/2023/10/camunda-8-3-scaling-automation-maximize-value/) |
-| 8.2 | 11 April 2023 | 8 October 2024 | - [ Camunda Platform ](https://github.com/camunda/camunda-platform/releases/tag/8.2.0)
- [ Connectors ](https://github.com/camunda/connectors/releases/tag/8.2.0) | [Release blog](https://camunda.com/blog/2023/04/camunda-platform-8-2-key-to-scaling-automation/) |
-
-:::note
-Camunda Cloud 1.3 is available in the site dropdown, but is unsupported. However, the corresponding Optimize version for Camunda Cloud 1.3, Optimize 3.7, remains supported at this time.
-:::
-
-## Changelogs
-
-Technical changelogs for Camunda 8 are available on GitHub:
-
-- [Camunda 8 Core](https://github.com/camunda/camunda/releases)
-- [Connectors](https://github.com/camunda/connectors/releases)
-- [Camunda Helm chart](https://github.com/camunda/camunda-platform-helm/releases)
-
-Most releases and changelogs are available through the [Camunda Platform repo](https://github.com/camunda/camunda-platform). The following component release notes are available as linked below:
-
-- [Desktop Modeler](https://github.com/camunda/camunda-modeler/releases)
-- [Connectors](https://github.com/camunda/connectors/releases)
-
-Some components have changelogs that are not publicly available, including the following:
-
-- Web Modeler
-- Console
-
-These are available in a blog format under the [release notes](https://camunda.com/blog/category/releases/) tag.
diff --git a/docs/reference/announcements-release-notes/release-policy.md b/docs/reference/announcements-release-notes/release-policy.md
index a3f16b44c60..1a2b42150aa 100644
--- a/docs/reference/announcements-release-notes/release-policy.md
+++ b/docs/reference/announcements-release-notes/release-policy.md
@@ -7,7 +7,7 @@ description: "Learn more about Camunda releases, including alpha features and al
Camunda 8 follows the [Camunda release policy](https://camunda.com/release-policy/) with the following specific clarifications.
:::info
-You can find deprecation and support announcements on the [Announcements](/reference/announcements-release-notes/870/870-announcements.md) page.
+You can find deprecation and support announcements on the [Announcements](/reference/announcements-release-notes/overview.md#announcements) page.
:::
@@ -22,7 +22,7 @@ Refers to a feature or component released as an alpha version, in an early state
### Alpha release
-Refers to a release made available between minor versions that allows you to preview an upcoming minor version and the alpha features included (for example, `8.6.0-alpha1`, `8.6.0-alpha2`, and so on). Camunda strives to release this type of release on a monthly basis. To learn more about the alpha features included in each alpha release, see [release notes](/reference/announcements-release-notes/870/870-release-notes.md).
+Refers to a release made available between minor versions that allows you to preview an upcoming minor version and the alpha features included (for example, `8.6.0-alpha1`, `8.6.0-alpha2`, and so on). Camunda strives to release this type of release on a monthly basis. To learn more about the alpha features included in each alpha release, see [release notes](/reference/announcements-release-notes/overview.md#release-notes).
:::note
@@ -116,7 +116,7 @@ In our managed service, Camunda reserves the right to force update or restart a
When a new Camunda 8 version is released, Camunda 8 Self-Managed enterprise customers are notified via email.
:::info
-Non-enterprise customers can stay up to date via [release blogs](https://camunda.com/blog/category/releases/), [announcements](/reference/announcements-release-notes/870/870-announcements.md), or releases on [GitHub](https://github.com/camunda) and [Docker Hub](https://hub.docker.com/u/camunda).
+Non-enterprise customers can stay up to date via [release blogs](https://camunda.com/blog/category/releases/), [announcements](/reference/announcements-release-notes/overview.md#announcements), or releases on [GitHub](https://github.com/camunda) and [Docker Hub](https://hub.docker.com/u/camunda).
:::
### Helm chart