diff --git a/docusaurus.config.ts b/docusaurus.config.ts
index d278ef3..7c7a28f 100644
--- a/docusaurus.config.ts
+++ b/docusaurus.config.ts
@@ -96,11 +96,11 @@ const config: Config = {
                     label: 'Wiki',
                     className: 'header-wiki-link',
                     position: 'left',
-                    to: 'wiki/geyser/setup',
+                    to: 'wiki/geyser/',
                     items: [
                         {
                             type: 'doc',
-                            docId: 'geyser/setup',
+                            docId: 'geyser/index',
                             label: 'Geyser',
                         },
                         {
diff --git a/wiki/geyser/setup/provider/modded-servers.mdx b/wiki/geyser/setup/provider/modded-servers.mdx
index 41dcb9f..3affe2f 100644
--- a/wiki/geyser/setup/provider/modded-servers.mdx
+++ b/wiki/geyser/setup/provider/modded-servers.mdx
@@ -7,7 +7,7 @@ import { Versions } from '@site/src/components/Versions'
 
 :::caution
 Geyser-Fabric and Geyser-NeoForge run **only** on a <Versions platform="java"/>.  
-To use Geyser with an older server version, you can use Geyser on a BungeeCord/Velocity proxy, Geyser-ViaProxy, or Geyser Standalone instead.
+See [this page](/wiki/geyser/supported-versions#using-geyser-fabric-or-geyser-neoforge-on-servers-that-do-not-run-) for more details.
 :::
 
 :::info
diff --git a/wiki/geyser/setup/provider/paper-spigot.mdx b/wiki/geyser/setup/provider/paper-spigot.mdx
index 330a381..b193005 100644
--- a/wiki/geyser/setup/provider/paper-spigot.mdx
+++ b/wiki/geyser/setup/provider/paper-spigot.mdx
@@ -8,7 +8,7 @@ import { Versions } from '@site/src/components/Versions'
 
 :::info
 If your server is not running <Versions platform="java"/>, you will need to install <a href="https://viaversion.com/">ViaVersion</a>.
-See also our <a href="/wiki/geyser/faq/#what-server-versions-does-geyser-support">FAQ article</a> on supported versions.
+See also [this page](/wiki/geyser/supported-versions/) on supported versions.
 :::
 
 1. Select your server hosting provider in the dropdown above.
diff --git a/wiki/geyser/setup/self/modded-servers.mdx b/wiki/geyser/setup/self/modded-servers.mdx
index c3c1366..62f2fbf 100644
--- a/wiki/geyser/setup/self/modded-servers.mdx
+++ b/wiki/geyser/setup/self/modded-servers.mdx
@@ -8,7 +8,7 @@ import { Versions } from '@site/src/components/Versions'
 
 :::caution
 Geyser-Fabric and Geyser-NeoForge run  **only** on a <Versions platform="java"/> Fabric server.   
-To use Geyser with an older server version, you can use Geyser on a BungeeCord/Velocity proxy, Geyser-ViaProxy or Geyser-Standalone instead.
+See [this page](/wiki/geyser/supported-versions#using-geyser-fabric-or-geyser-neoforge-on-servers-that-do-not-run-) for more details.
 :::
 
 :::info
diff --git a/wiki/geyser/setup/self/paper-spigot.mdx b/wiki/geyser/setup/self/paper-spigot.mdx
index d503d9b..bde4622 100644
--- a/wiki/geyser/setup/self/paper-spigot.mdx
+++ b/wiki/geyser/setup/self/paper-spigot.mdx
@@ -7,7 +7,7 @@ import { Versions } from '@site/src/components/Versions'
 
 :::info
 If your server is not running <Versions platform="java"/>, you will need to install <a href="https://viaversion.com/">ViaVersion</a>.
-See also our <a href="/wiki/geyser/faq/#what-server-versions-does-geyser-support">FAQ article</a> on supported versions.
+See also [this page](/wiki/geyser/supported-versions/) on supported versions.
 :::
 
 1. Download the plugin from [the download page](https://download.geysermc.org/v2/projects/geyser/versions/latest/builds/latest/downloads/spigot).