diff --git a/libbeat/docs/index.asciidoc b/libbeat/docs/index.asciidoc
index f182d625022..10bf384c7d2 100644
--- a/libbeat/docs/index.asciidoc
+++ b/libbeat/docs/index.asciidoc
@@ -31,8 +31,8 @@ include::./config-file-format.asciidoc[]
include::./upgrading.asciidoc[]
-include::./release-notes/breaking/breaking.asciidoc[]
-
include::./release.asciidoc[]
+include::./release-notes/breaking/breaking.asciidoc[]
+
include::{libbeat-dir}/contributing-to-beats.asciidoc[]
diff --git a/libbeat/docs/release-notes/breaking/breaking-7.17.asciidoc b/libbeat/docs/release-notes/breaking/breaking-7.17.asciidoc
index 20c0ed20905..d7d73508c6d 100644
--- a/libbeat/docs/release-notes/breaking/breaking-7.17.asciidoc
+++ b/libbeat/docs/release-notes/breaking/breaking-7.17.asciidoc
@@ -5,14 +5,7 @@
7.17
++++
-//NOTE: The notable-breaking-changes tagged regions are re-used in the
-//Installation and Upgrade Guide
-
-// tag::notable-breaking-changes[]
-
The Docker base image has changed from CentOS 7 to Ubuntu 20.04. This change
affects all {beats}.
-// end::notable-breaking-changes[]
-
{see-relnotes}
diff --git a/libbeat/docs/release-notes/breaking/breaking-8.0.asciidoc b/libbeat/docs/release-notes/breaking/breaking-8.0.asciidoc
index 858e7c55fee..7fe56f44053 100644
--- a/libbeat/docs/release-notes/breaking/breaking-8.0.asciidoc
+++ b/libbeat/docs/release-notes/breaking/breaking-8.0.asciidoc
@@ -9,11 +9,6 @@ See the <> for a complete list of breaking changes,
bug fixes, and enhancements, including changes to beta or experimental
functionality.
-//NOTE: The notable-breaking-changes tagged regions are re-used in the
-//Installation and Upgrade Guide
-
-//tag::notable-breaking-changes[]
-
[discrete]
==== {beats} logs are now ECS-compliant
@@ -92,7 +87,3 @@ However this caused problems for some users.
Starting in version 8.0.0, filesets are disabled by default. You must explicitly
enable the filesets you want {filebeat} to use.
-
-// end::notable-breaking-changes[]
-
-
diff --git a/libbeat/docs/release-notes/breaking/breaking-8.1.asciidoc b/libbeat/docs/release-notes/breaking/breaking-8.1.asciidoc
deleted file mode 100644
index 1286a36fb8d..00000000000
--- a/libbeat/docs/release-notes/breaking/breaking-8.1.asciidoc
+++ /dev/null
@@ -1,19 +0,0 @@
-[[breaking-changes-8.1]]
-
-=== Breaking changes in 8.1
-++++
-8.1
-++++
-
-See the <> for a complete list of breaking changes,
-bug fixes, and enhancements, including changes to beta or experimental
-functionality.
-
-//NOTE: The notable-breaking-changes tagged regions are re-used in the
-//Installation and Upgrade Guide
-
-//tag::notable-breaking-changes[]
-
-There are no important breaking changes in this release.
-
-// end::notable-breaking-changes[]
diff --git a/libbeat/docs/release-notes/breaking/breaking-8.2.asciidoc b/libbeat/docs/release-notes/breaking/breaking-8.2.asciidoc
deleted file mode 100644
index 26dd74239bd..00000000000
--- a/libbeat/docs/release-notes/breaking/breaking-8.2.asciidoc
+++ /dev/null
@@ -1,19 +0,0 @@
-[[breaking-changes-8.2]]
-
-=== Breaking changes in 8.2
-++++
-8.2
-++++
-
-See the <> for a complete list of breaking changes,
-bug fixes, and enhancements, including changes to beta or experimental
-functionality.
-
-//NOTE: The notable-breaking-changes tagged regions are re-used in the
-//Installation and Upgrade Guide
-
-//tag::notable-breaking-changes[]
-
-There are no breaking changes in this release.
-
-// end::notable-breaking-changes[]
diff --git a/libbeat/docs/release-notes/breaking/breaking.asciidoc b/libbeat/docs/release-notes/breaking/breaking.asciidoc
index 99cb596a0a3..b66dc6008c7 100644
--- a/libbeat/docs/release-notes/breaking/breaking.asciidoc
+++ b/libbeat/docs/release-notes/breaking/breaking.asciidoc
@@ -9,14 +9,10 @@ changes, but there are breaking changes between major versions (e.g. 7.x to
8.y). Migrating directly between non consecutive major versions (e.g. 6.x to
8.x) is not recommended.
-See the following topics for a description of breaking changes:
+See the following topics for a description of breaking changes between major versions:
-* <>
-* <>
* <>
-include::breaking-8.2.asciidoc[]
-
-include::breaking-8.1.asciidoc[]
+For breaking changes between minor versions, see the <>.
include::breaking-8.0.asciidoc[]
diff --git a/libbeat/docs/release-notes/redirects.asciidoc b/libbeat/docs/release-notes/redirects.asciidoc
index fd5c8316c64..cd6585651ce 100644
--- a/libbeat/docs/release-notes/redirects.asciidoc
+++ b/libbeat/docs/release-notes/redirects.asciidoc
@@ -3,3 +3,33 @@
This page has moved. Please see {observability-guide}/whats-new.html[What's new
in Observability {minor-version}].
+
+[role="exclude",id="breaking-changes-8.5"]
+== Breaking changes in 8.5
+
+This page no longer exists.
+There are no notable breaking changes for 8.5.
+
+[role="exclude",id="breaking-changes-8.4"]
+== Breaking changes in 8.4
+
+This page no longer exists.
+There are no notable breaking changes for 8.4.
+
+[role="exclude",id="breaking-changes-8.3"]
+== Breaking changes in 8.3
+
+This page no longer exists.
+There are no notable breaking changes for 8.3.
+
+[role="exclude",id="breaking-changes-8.2"]
+== Breaking changes in 8.2
+
+This page no longer exists.
+There are no notable breaking changes for 8.2.
+
+[role="exclude",id="breaking-changes-8.1"]
+== Breaking changes in 8.1
+
+This page no longer exists.
+There are no notable breaking changes for 8.1.