diff --git a/README.md b/README.md
index 232909b43..af7927450 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Some of the capabilities and benefits provided by Talos include:
 
 ## Documentation
 
-For instructions on deploying and managing Talos, see the [Documentation](https://www.talos.dev/docs/v0.4/).
+For instructions on deploying and managing Talos, see the [Documentation](https://www.talos.dev/docs/latest/).
 
 ## Community
 
diff --git a/docs/website/components/DocumentationDropdown.vue b/docs/website/components/DocumentationDropdown.vue
index 1fa5d5f77..ed14899f1 100644
--- a/docs/website/components/DocumentationDropdown.vue
+++ b/docs/website/components/DocumentationDropdown.vue
@@ -36,7 +36,7 @@ export default {
     return {
       options: [
         { version: 'v0.7', url: '/docs/v0.7', prerelease: true },
-        { version: 'v0.6', url: '/docs/v0.6', prerelease: false },
+        { version: 'v0.6', url: '/docs/v0.6', prerelease: false, latest: true },
         { version: 'v0.5', url: '/docs/v0.5', prerelease: false },
         { version: 'v0.4', url: '/docs/v0.4', prerelease: false }
       ],
@@ -50,6 +50,10 @@ export default {
         return `${option.version} (pre-release)`
       }
 
+      if (option.latest) {
+        return `${option.version} (pre-release)`
+      }
+
       return option.version
     }
   }
diff --git a/docs/website/components/Header.vue b/docs/website/components/Header.vue
index 640ce982d..fbe98af3c 100644
--- a/docs/website/components/Header.vue
+++ b/docs/website/components/Header.vue
@@ -7,7 +7,7 @@
       <div class="flex py-6 ml-auto">
         <ul class="header-menu">
           <li>
-            <a href="/docs/v0.6">
+            <a href="/docs/latest">
               <span class="font-semibold mr-1">Documentation</span>
             </a>
           </li>
diff --git a/docs/website/nuxt.config.js b/docs/website/nuxt.config.js
index f24bedb32..2281c4ff7 100644
--- a/docs/website/nuxt.config.js
+++ b/docs/website/nuxt.config.js
@@ -100,6 +100,18 @@ export default {
         }
 
         generatedRoutes.push(r)
+
+        if (version === 'v0.6') {
+          const latest = {
+            route: '/docs/latest/',
+            payload: {
+              sections: require(`${__dirname}/static/${version}.sections.${lang}.json`),
+              menu: require(`${__dirname}/static/${version}.menu.${lang}.json`)
+            }
+          }
+
+          generatedRoutes.push(latest)
+        }
       })
 
       callback(null, generatedRoutes)