diff --git a/app/_data/docs_nav_kuma_2.1.x.yml b/app/_data/docs_nav_kuma_2.1.x.yml
index 187f3f365..1987cab62 100644
--- a/app/_data/docs_nav_kuma_2.1.x.yml
+++ b/app/_data/docs_nav_kuma_2.1.x.yml
@@ -27,7 +27,9 @@ items:
       - text: Enterprise
         url: /introduction/enterprise/
       - text: Release notes
-        url: /introduction/changelog/
+        url: /docs/changelog/
+        absolute_url: true
+        generate: false
   - title: Install
     group: true
     items:
diff --git a/app/_data/docs_nav_kuma_2.2.x.yml b/app/_data/docs_nav_kuma_2.2.x.yml
index 0fd92fb2f..0098a827d 100644
--- a/app/_data/docs_nav_kuma_2.2.x.yml
+++ b/app/_data/docs_nav_kuma_2.2.x.yml
@@ -24,7 +24,9 @@ items:
       - text: Kuma requirements
         url: /introduction/kuma-requirements/
       - text: Release notes
-        url: /introduction/changelog/
+        url: /docs/changelog/
+        absolute_url: true
+        generate: false
   - title: Kuma in Production
     group: true
     items:
diff --git a/app/_data/docs_nav_kuma_2.3.x.yml b/app/_data/docs_nav_kuma_2.3.x.yml
index f7252bf42..94830c9aa 100644
--- a/app/_data/docs_nav_kuma_2.3.x.yml
+++ b/app/_data/docs_nav_kuma_2.3.x.yml
@@ -22,7 +22,9 @@ items:
       - text: Kuma requirements
         url: /introduction/kuma-requirements/
       - text: Release notes
-        url: /introduction/changelog/
+        url: /docs/changelog/
+        absolute_url: true
+        generate: false
   - title: Kuma in Production
     group: true
     items:
diff --git a/app/_data/docs_nav_kuma_dev.yml b/app/_data/docs_nav_kuma_dev.yml
index c7d04cdcb..40ee8db21 100644
--- a/app/_data/docs_nav_kuma_dev.yml
+++ b/app/_data/docs_nav_kuma_dev.yml
@@ -22,7 +22,9 @@ items:
       - text: Kuma requirements
         url: /introduction/kuma-requirements/
       - text: Release notes
-        url: /introduction/changelog/
+        url: /docs/changelog/
+        absolute_url: true
+        generate: true
   - title: Kuma in Production
     group: true
     items:
diff --git a/app/_includes/version_alert.html b/app/_includes/version_alert.html
index e00862be6..2c277a5a7 100644
--- a/app/_includes/version_alert.html
+++ b/app/_includes/version_alert.html
@@ -4,7 +4,7 @@
 {% assign latest_version_path = "docs/" | append: latest_version | append: '/' | append: page_path | append: '.md' %}
 {% assign latest_page = site.pages | find: 'path', latest_version_path %}
 
-{% if current_version != site.data.latest_version.release %}
+{% if current_version && current_version != site.data.latest_version.release %}
   <div>
     <div class="version-alert">
       <div class="warning custom-block">
diff --git a/app/_plugins/generators/navigation_links.rb b/app/_plugins/generators/navigation_links.rb
index 94880673f..1200d75e7 100644
--- a/app/_plugins/generators/navigation_links.rb
+++ b/app/_plugins/generators/navigation_links.rb
@@ -8,6 +8,7 @@ def generate(site)
       site.pages.each_with_index do |page, index|
         next unless page.relative_path.start_with? 'docs'
         next if page.path == 'docs/index.md'
+        next unless page.data.key? 'nav_items'
         # remove docs/<version>/ prefix and `.md` and the end
         page_url = page.path.gsub(/docs\/[^\/]+\//, '/').gsub('.md', '/')
 
diff --git a/app/_plugins/generators/versions.rb b/app/_plugins/generators/versions.rb
index ecdea7819..2a64d0886 100644
--- a/app/_plugins/generators/versions.rb
+++ b/app/_plugins/generators/versions.rb
@@ -13,6 +13,8 @@ def generate(site)
       site.pages.each do |page|
         next unless page.url.start_with?('/docs/')
         version_data = version_from_page_url(page.url, site.data['versions'])
+        page.data['nav_items'] = {}
+        next unless version_data
         page.data['doc'] = true
         page.data['has_version'] = true
         page.data['version'] = version_data['release']
diff --git a/app/_src/introduction/changelog.md b/app/docs/changelog.md
similarity index 77%
rename from app/_src/introduction/changelog.md
rename to app/docs/changelog.md
index 253851f68..caaa4f9f6 100644
--- a/app/_src/introduction/changelog.md
+++ b/app/docs/changelog.md
@@ -1,5 +1,6 @@
 ---
 title: Release notes
+no_version: true
 ---
 
 {% embed raw/CHANGELOG.md %}