diff --git a/docs/CHANGELOG.asciidoc b/docs/CHANGELOG.asciidoc
index 5e475f68267cf..8f3eb9510ab4c 100644
--- a/docs/CHANGELOG.asciidoc
+++ b/docs/CHANGELOG.asciidoc
@@ -1,50 +1,49 @@
+[[es-release-notes]]
+= {es} Release Notes
+
+[partintro]
+--
 // Use these for links to issue and pulls. Note issues and pulls redirect one to
 // each other on Github, so don't worry too much on using the right prefix.
 // :issue: https://github.com/elastic/elasticsearch/issues/
 // :pull: https://github.com/elastic/elasticsearch/pull/
 
-= Elasticsearch Release Notes
-
-== Elasticsearch 7.0.0
-
-=== Breaking Changes
-
-<<write-thread-pool-fallback, Removed `thread_pool.bulk.*` settings and
-`es.thread_pool.write.use_bulk_as_display_name` system property>> ({pull}29609[#29609])
-
-<<remove-suggest-metric, Removed `suggest` metric on stats APIs>> ({pull}29635[#29635])
+This section summarizes the changes in each release.
 
-=== Breaking Java Changes
+* <<release-notes-6.4.0>>
 
-=== Deprecations
 
-=== New Features
+--
 
-=== Enhancements
-
-=== Bug Fixes
+[[release-notes-6.4.0]]
+== {es} 6.4.0
 
-Fail snapshot operations early when creating or deleting a snapshot on a repository that has been
-written to by an older Elasticsearch after writing to it with a newer Elasticsearch version. ({pull}30140[#30140])
+//[float]
+//[[breaking-6.4.0]]
+//=== Breaking Changes
 
-=== Regressions
+//[float]
+//=== Breaking Java Changes
 
-=== Known Issues
+//[float]
+//=== Deprecations
 
-== Elasticsearch version 6.4.0
-
-=== New Features
+//[float]
+//=== New Features
 
+[float]
 === Enhancements
 
 <<copy-source-settings-on-resize, Allow copying source settings on index resize operations>> ({pull}30255[#30255])
 
+[float]
 === Bug Fixes
 
 Do not ignore request analysis/similarity settings on index resize operations when the source index already contains such settings ({pull}30216[#30216])
 
-=== Regressions
-
-=== Known Issues
+//[float]
+//=== Regressions
 
+//[float]
+//=== Known Issues
 
diff --git a/docs/reference/index-shared4.asciidoc b/docs/reference/index-shared4.asciidoc
index 3d807dd98d39c..5e6ebc8a5a20c 100644
--- a/docs/reference/index-shared4.asciidoc
+++ b/docs/reference/index-shared4.asciidoc
@@ -5,4 +5,4 @@ include::testing.asciidoc[]
 
 include::glossary.asciidoc[]
 
-include::release-notes.asciidoc[]
+include::{docdir}/../CHANGELOG.asciidoc[]
\ No newline at end of file
diff --git a/x-pack/docs/en/release-notes/6.0.0-alpha1.asciidoc b/x-pack/docs/en/release-notes/6.0.0-alpha1.asciidoc
index fc06368b12a98..4bad1268c8716 100644
--- a/x-pack/docs/en/release-notes/6.0.0-alpha1.asciidoc
+++ b/x-pack/docs/en/release-notes/6.0.0-alpha1.asciidoc
@@ -34,6 +34,5 @@ Watcher::
 
 See also:
 
-* <<release-notes-6.0.0-alpha1,{es} 6.0.0-alpha1 Release Notes>>
 * {kibana-ref}/release-notes-xkb.html[{kib} {xpack} Release Notes]
 * {logstash-ref}/release-notes-xls.html[Logstash {xpack} Release Notes]
diff --git a/x-pack/docs/en/release-notes/6.0.0-alpha2.asciidoc b/x-pack/docs/en/release-notes/6.0.0-alpha2.asciidoc
index e3b011dead255..456b1cb9f4aaf 100644
--- a/x-pack/docs/en/release-notes/6.0.0-alpha2.asciidoc
+++ b/x-pack/docs/en/release-notes/6.0.0-alpha2.asciidoc
@@ -39,6 +39,5 @@ Metadata fails, the update is now retried.
 
 See also:
 
-* <<release-notes-6.0.0-alpha2,{es} 6.0.0-alpha2 Release Notes>>
 * {kibana-ref}/release-notes-xkb.html[{kib} {xpack} Release Notes]
 * {logstash-ref}/release-notes-xls.html[Logstash {xpack} Release Notes]
diff --git a/x-pack/docs/en/release-notes/6.0.0-beta1.asciidoc b/x-pack/docs/en/release-notes/6.0.0-beta1.asciidoc
index 0dbf145c3d5d0..f3f1c76c19f77 100644
--- a/x-pack/docs/en/release-notes/6.0.0-beta1.asciidoc
+++ b/x-pack/docs/en/release-notes/6.0.0-beta1.asciidoc
@@ -29,6 +29,5 @@ to `false` in your `elasticsearch.yml`. See
 
 See also:
 
-* <<release-notes-6.0.0-beta1,{es} 6.0.0-beta1 Release Notes>>
 * {kibana-ref}/release-notes-xkb.html[{kib} {xpack} Release Notes]
 * {logstash-ref}/release-notes-xls.html[Logstash {xpack} Release Notes]
diff --git a/x-pack/docs/en/release-notes/6.0.0-beta2.asciidoc b/x-pack/docs/en/release-notes/6.0.0-beta2.asciidoc
index 243b2c7349838..5f20a5f06956f 100644
--- a/x-pack/docs/en/release-notes/6.0.0-beta2.asciidoc
+++ b/x-pack/docs/en/release-notes/6.0.0-beta2.asciidoc
@@ -79,6 +79,5 @@ Watcher::
 
 See also:
 
-* <<release-notes-6.0.0-beta2,{es} 6.0.0-beta2 Release Notes>>
 * {kibana-ref}/release-notes-xkb.html[{kib} {xpack} Release Notes]
 * {logstash-ref}/release-notes-xls.html[Logstash {xpack} Release Notes]
diff --git a/x-pack/docs/en/release-notes/6.0.0-rc1.asciidoc b/x-pack/docs/en/release-notes/6.0.0-rc1.asciidoc
index 4d131e2c7871b..e08105a878a8b 100644
--- a/x-pack/docs/en/release-notes/6.0.0-rc1.asciidoc
+++ b/x-pack/docs/en/release-notes/6.0.0-rc1.asciidoc
@@ -72,6 +72,5 @@ Watcher::
 
 See also:
 
-* <<release-notes-6.0.0-rc1,{es} 6.0.0-rc1 Release Notes>>
 * {kibana-ref}/release-notes-xkb.html[{kib} {xpack} Release Notes]
 * {logstash-ref}/release-notes-xls.html[Logstash {xpack} Release Notes]
diff --git a/x-pack/docs/en/release-notes/6.0.0-rc2.asciidoc b/x-pack/docs/en/release-notes/6.0.0-rc2.asciidoc
index b034c8ba382a3..7c07362a5d451 100644
--- a/x-pack/docs/en/release-notes/6.0.0-rc2.asciidoc
+++ b/x-pack/docs/en/release-notes/6.0.0-rc2.asciidoc
@@ -69,6 +69,5 @@ to require multiple binds when authenticating in user search mode.
 
 See also:
 
-* <<release-notes-6.0.0-rc2,{es} 6.0.0-rc2 Release Notes>>
 * {kibana-ref}/release-notes-xkb.html[{kib} {xpack} Release Notes]
 * {logstash-ref}/release-notes-xls.html[Logstash {xpack} Release Notes]