diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 2ce78ec26dd..8a80a4ed2ed 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -1,14 +1,32 @@
-include::./changelogs/head.asciidoc[]
-include::./changelogs/8.12.asciidoc[]
-include::./changelogs/8.11.asciidoc[]
-include::./changelogs/8.10.asciidoc[]
-include::./changelogs/8.9.asciidoc[]
-include::./changelogs/8.8.asciidoc[]
-include::./changelogs/8.7.asciidoc[]
-include::./changelogs/8.6.asciidoc[]
-include::./changelogs/8.5.asciidoc[]
-include::./changelogs/8.4.asciidoc[]
-include::./changelogs/8.3.asciidoc[]
-include::./changelogs/8.2.asciidoc[]
-include::./changelogs/8.1.asciidoc[]
-include::./changelogs/8.0.asciidoc[]
+// tag::list[]
+* <<release-notes-8.12>>
+* <<release-notes-8.11>>
+* <<release-notes-8.10>>
+* <<release-notes-8.9>>
+* <<release-notes-8.8>>
+* <<release-notes-8.7>>
+* <<release-notes-8.6>>
+* <<release-notes-8.5>>
+* <<release-notes-8.4>>
+* <<release-notes-8.3>>
+* <<release-notes-8.2>>
+* <<release-notes-8.1>>
+* <<release-notes-8.0>>
+// end::list[]
+
+// tag::includes[]
+include::./head.asciidoc[]
+include::./8.12.asciidoc[]
+include::./8.11.asciidoc[]
+include::./8.10.asciidoc[]
+include::./8.9.asciidoc[]
+include::./8.8.asciidoc[]
+include::./8.7.asciidoc[]
+include::./8.6.asciidoc[]
+include::./8.5.asciidoc[]
+include::./8.4.asciidoc[]
+include::./8.3.asciidoc[]
+include::./8.2.asciidoc[]
+include::./8.1.asciidoc[]
+include::./8.0.asciidoc[]
+// end::includes[]