diff --git a/docusaurus.config.js b/docusaurus.config.js
index 0ef57fda0d6..b9b99214aaf 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -16,8 +16,8 @@ module.exports = {
   customFields: {
     canonicalUrlRoot: docsSiteUrl,
   },
-  onBrokenLinks: "throw",
-  onBrokenMarkdownLinks: "throw",
+  onBrokenLinks: "warn",
+  onBrokenMarkdownLinks: "warn",
   favicon: "img/favicon.ico",
   organizationName: "camunda", // Usually your GitHub org/user name.
   projectName: "camunda-docs", // Usually your repo name.
@@ -397,7 +397,11 @@ module.exports = {
           editUrl: "https://github.com/camunda/camunda-docs/edit/main/",
           beforeDefaultRemarkPlugins: [versionedLinks],
           // 👋 When cutting a new version, remove the banner for maintained versions by adding an entry. Remove the entry to versions >18 months old.
+          lastVersion: "8.5",
           versions: {
+            8.6: {
+              label: "8.6 (unreleased)",
+            },
             8.5: {
               banner: "none",
             },
diff --git a/src/theme/NavbarItem/DropdownNavbarItem.js b/src/theme/NavbarItem/DropdownNavbarItem.js
new file mode 100644
index 00000000000..8d2caca23fe
--- /dev/null
+++ b/src/theme/NavbarItem/DropdownNavbarItem.js
@@ -0,0 +1,25 @@
+import React from "react";
+import DropdownNavbarItem from "@theme-original/NavbarItem/DropdownNavbarItem";
+
+export default function DropdownNavbarItemWrapper({ label, items, ...props }) {
+  if (label === "Next") {
+    label = "8.7 (unreleased)";
+  }
+
+  items = items.map((item) => {
+    let { label } = item;
+    if (label === "Next") {
+      label = "8.7 (unreleased)";
+    }
+    return {
+      ...item,
+      label,
+    };
+  });
+
+  return (
+    <>
+      <DropdownNavbarItem {...props} items={items} label={label} />
+    </>
+  );
+}