diff --git a/docs/en/install-upgrade/breaking.asciidoc b/docs/en/install-upgrade/breaking.asciidoc
index 217938418..5ccaff813 100644
--- a/docs/en/install-upgrade/breaking.asciidoc
+++ b/docs/en/install-upgrade/breaking.asciidoc
@@ -53,91 +53,45 @@ include::{beats-repo-dir}/release-notes/breaking/breaking-8.0.asciidoc[tag=notab
 This list summarizes the most important breaking changes in {es} {version}. For
 the complete list, go to {ref}/breaking-changes.html[{es} breaking changes].
 
-include::{es-repo-dir}/migration/migrate_8_0.asciidoc[tag=notable-breaking-changes]
-
-==== Aggregations changes
-include::{es-repo-dir}/migration/migrate_8_0/aggregations.asciidoc[tag=notable-breaking-changes]
-
-==== Allocation changes
-include::{es-repo-dir}/migration/migrate_8_0/allocation.asciidoc[tag=notable-breaking-changes]
-
-==== Analysis changes
-include::{es-repo-dir}/migration/migrate_8_0/analysis.asciidoc[tag=notable-breaking-changes]
-
-==== Circuit breaker changes
-include::{es-repo-dir}/migration/migrate_8_0/breaker.asciidoc[tag=notable-breaking-changes]
-
-==== {ccr-cap} ({ccr-init}) changes
-include::{es-repo-dir}/migration/migrate_8_0/ccr.asciidoc[tag=notable-breaking-changes]
-
-==== Cluster changes
-include::{es-repo-dir}/migration/migrate_8_0/cluster.asciidoc[tag=notable-breaking-changes]
-
-==== Discovery changes
-include::{es-repo-dir}/migration/migrate_8_0/discovery.asciidoc[tag=notable-breaking-changes]
-
-==== EQL changes
-include::{es-repo-dir}/migration/migrate_8_0/eql.asciidoc[tag=notable-breaking-changes]
-
-==== HTTP changes
-include::{es-repo-dir}/migration/migrate_8_0/http.asciidoc[tag=notable-breaking-changes]
+==== Cluster and node setting changes
+// include::{es-repo-dir}/migration/migrate_8_0/cluster-node-setting-changes.asciidoc[tag=notable-breaking-changes]
 
-==== {ilm-cap} ({ilm-init}) changes
-include::{es-repo-dir}/migration/migrate_8_0/ilm.asciidoc[tag=notable-breaking-changes]
+==== Command line tool changes
+// include::{es-repo-dir}/migration/migrate_8_0/command-line-tool-changes.asciidoc[tag=notable-breaking-changes]
 
-==== Indices changes
-include::{es-repo-dir}/migration/migrate_8_0/indices.asciidoc[tag=notable-breaking-changes]
-
-==== Ingest pipeline changes
-include::{es-repo-dir}/migration/migrate_8_0/ingest.asciidoc[tag=notable-breaking-changes]
+==== Index setting changes
+// include::{es-repo-dir}/migration/migrate_8_0/index-setting-changes.asciidoc[tag=notable-breaking-changes]
 
 ==== Java API changes
-include::{es-repo-dir}/migration/migrate_8_0/java.asciidoc[tag=notable-breaking-changes]
+// include::{es-repo-dir}/migration/migrate_8_0/java-api-changes.asciidoc[tag=notable-breaking-changes]
 
-==== Mapping changes
-include::{es-repo-dir}/migration/migrate_8_0/mappings.asciidoc[tag=notable-breaking-changes]
+==== JVM option changes
+// include::{es-repo-dir}/migration/migrate_8_0/jvm-option-changes.asciidoc[tag=notable-breaking-changes]
 
-==== Network changes
-include::{es-repo-dir}/migration/migrate_8_0/network.asciidoc[tag=notable-breaking-changes]
+==== Logging changes
+// include::{es-repo-dir}/migration/migrate_8_0/logging-changes.asciidoc[tag=notable-breaking-changes]
 
-==== Node changes
-include::{es-repo-dir}/migration/migrate_8_0/node.asciidoc[tag=notable-breaking-changes]
+==== Mapping changes
+// include::{es-repo-dir}/migration/migrate_8_0/mapping-changes.asciidoc[tag=notable-breaking-changes]
 
 ==== Packaging changes
-include::{es-repo-dir}/migration/migrate_8_0/packaging.asciidoc[tag=notable-breaking-changes]
+// include::{es-repo-dir}/migration/migrate_8_0/packaging-changes.asciidoc[tag=notable-breaking-changes]
 
-==== Reindex changes
-include::{es-repo-dir}/migration/migrate_8_0/reindex.asciidoc[tag=notable-breaking-changes]
+==== Painless changes
+// include::{es-repo-dir}/migration/migrate_8_0/painless-changes.asciidoc[tag=notable-breaking-changes]
 
 ==== REST API changes
-include::{es-repo-dir}/migration/migrate_8_0/api.asciidoc[tag=notable-breaking-changes]
-
-==== Rollup changes
-include::{es-repo-dir}/migration/migrate_8_0/rollup.asciidoc[tag=notable-breaking-changes]
-
-==== Search changes
-include::{es-repo-dir}/migration/migrate_8_0/search.asciidoc[tag=notable-breaking-changes]
+// include::{es-repo-dir}/migration/migrate_8_0/rest-api-changes.asciidoc[tag=notable-breaking-changes]
 
-==== Security changes
-include::{es-repo-dir}/migration/migrate_8_0/security.asciidoc[tag=notable-breaking-changes]
-
-==== Settings changes
-include::{es-repo-dir}/migration/migrate_8_0/settings.asciidoc[tag=notable-breaking-changes]
-
-==== Snapshot and restore changes
-include::{es-repo-dir}/migration/migrate_8_0/snapshots.asciidoc[tag=notable-breaking-changes]
-
-==== Thread pool changes
-include::{es-repo-dir}/migration/migrate_8_0/threadpool.asciidoc[tag=notable-breaking-changes]
+==== System requirement changes
+// include::{es-repo-dir}/migration/migrate_8_0/system-req-changes.asciidoc[tag=notable-breaking-changes]
 
 ==== {transform-cap} changes
 include::{es-repo-dir}/migration/migrate_8_0/transform.asciidoc[tag=notable-breaking-changes]
 
-==== Transport changes
-include::{es-repo-dir}/migration/migrate_8_0/transport.asciidoc[tag=notable-breaking-changes]
-
-==== Watcher changes
-include::{es-repo-dir}/migration/migrate_8_0/watcher.asciidoc[tag=notable-breaking-changes]
+:leveloffset: -1
+include::{es-repo-dir}/migration/migrate_8_0.asciidoc[tag=notable-breaking-changes]
+:leveloffset: +1
 
 [[elasticsearch-hadoop-breaking-changes]]
 === {es} Hadoop breaking changes