diff --git a/wiki/geyser/common-issues.md b/wiki/geyser/common-issues.md
index 2bed343..7469302 100644
--- a/wiki/geyser/common-issues.md
+++ b/wiki/geyser/common-issues.md
@@ -35,9 +35,9 @@ See [here](/wiki/geyser/fixing-unable-to-connect-to-world/) for fixing "Unable t
### `java.net.BindException: Address already in use: bind` on startup. {#javanetbindexception-address-already-in-use-bind-on-startup}
This means something (likely another instance of Geyser) is running on the port you have specified in the config. Please make sure you close all applications running on this port. If you don't recall opening anything, usually restarting your computer fixes this.
-### [...]` has been compiled by a more recent version of the Java Runtime (class file version 60.0)` {#-has-been-compiled-by-a-more-recent-version-of-the-java-runtime-class-file-version-600}
+### [...]` has been compiled by a more recent version of the Java Runtime (class file version 65.0)` {#-has-been-compiled-by-a-more-recent-version-of-the-java-runtime}
-See this link for updating to Java 17: https://docs.papermc.io/misc/java-install.
+See this link for updating to Java 21: https://docs.papermc.io/misc/java-install.
### Hosting provider will not immediately open up UDP. {#hosting-provider-will-not-immediately-open-up-udp}
diff --git a/wiki/geyser/creating-a-startup-script.md b/wiki/geyser/creating-a-startup-script.md
index 1871174..330c5ab 100644
--- a/wiki/geyser/creating-a-startup-script.md
+++ b/wiki/geyser/creating-a-startup-script.md
@@ -7,7 +7,7 @@ description: Learn how to create a startup script for Geyser-Standalone.
:::caution
-In order for this to work, you MUST have Java 17 (or higher) installed!
+In order for this to work, you MUST have Java 21 (or higher) installed!
:::
diff --git a/wiki/geyser/setup/self/standalone.mdx b/wiki/geyser/setup/self/standalone.mdx
index 77b1945..9cfc90e 100644
--- a/wiki/geyser/setup/self/standalone.mdx
+++ b/wiki/geyser/setup/self/standalone.mdx
@@ -5,7 +5,7 @@ hide_title: true
---
:::info
-You need to have Java 17 or higher installed to run Geyser. To run Geyser Standalone on Android, see the bottom of this page.
+You need to have Java 21 or higher installed to run Geyser. To run Geyser Standalone on Android, see the bottom of this page.
:::
:::caution
@@ -87,7 +87,7 @@ Applications such as Termux on Android are capable of running Geyser, but this l
##### Termux (Android) \{#termux-android}
1. Download and install [Termux](https://termux.com/)
-2. Run `pkg install openjdk-17`
+2. Run `pkg install openjdk-21`
3. Run `wget https://download.geysermc.org/v2/projects/geyser/versions/latest/builds/latest/downloads/standalone`
4. Run `java -jar Geyser-Standalone.jar`
diff --git a/wiki/geyser/supported-versions.md b/wiki/geyser/supported-versions.md
index 8ba93e6..9cc1567 100644
--- a/wiki/geyser/supported-versions.md
+++ b/wiki/geyser/supported-versions.md
@@ -21,12 +21,12 @@ Geyser emulates a client, so a Java server must acce
This is possible thanks to [ViaVersion](https://viaversion.com/), which allows Java edition players with newer versions to join servers
that run older versions of the game.
-### Using Geyser-Spigot on a Spigot/Paper server running on 1.16.5 or above
-You can use Geyser-Spigot on servers that run on 1.16.5 or above. Do note that Geyser requires Java 17 to run! You will also need to run at least Java 17 or later to use Geyser. See [here](https://docs.papermc.io/misc/java-install) for more info on updating Java. Paper versions not supporting Java 17 can add `-DPaper.IgnoreJavaVersion=true` flag to the Java startup arguments to allow Paper to run on Java 17.
+### Using Geyser-Spigot on a Spigot/Paper server running on 1.20.5 or above
+You can use Geyser-Spigot on servers that run on 1.20.5 or above. You will also need to run at least Java 21 or later to use Geyser. See [here](https://docs.papermc.io/misc/java-install) for more info on updating Java. Paper versions not supporting Java 21 can add `-DPaper.IgnoreJavaVersion=true` flag to the Java startup arguments to allow Paper to run on Java 21.
In order for Bedrock players to chat (1.19.3+) or join (1.19.1/1.19.2), you need to disable chat signing. More information about that can be read on the [chat signing page](/wiki/geyser/secure-chat).
-### Using Geyser-Spigot on a Spigot/Paper server running on a version below 1.16.5
+### Using Geyser-Spigot on a Spigot/Paper server running on a version below 1.20.5
This is unfortunately not possible. You'll need to use a proxy such as Velocity or BungeeCord, or set up Geyser-Standalone separately with the [ViaVersion](https://github.com/ViaVersion/ViaVersion) plugin. Another alternative would be to install [ViaProxy](https://github.com/ViaVersion/ViaProxy), which is a standalone ViaVersion proxy that
translates between different Minecraft: Java edition versions, and to install Geyser-ViaProxy on it.
@@ -36,4 +36,4 @@ Geyser with older versions would be to install [ViaProxy](https://github.com/Via
translates between different Minecraft: Java edition versions, and to install Geyser-ViaProxy on it. This will also work with Floodgate auth.
### Using Geyser-Velocity or Geyser-BungeeCord on a proxy
-Make sure you update your proxy software to the latest available version, and, if the backend servers are not on , also install the [ViaVersion](https://github.com/ViaVersion/ViaVersion) plugin on the backend servers. Velocity/BungeeCord support most Minecraft versions, so you can update them regardless of the backend server versions.
\ No newline at end of file
+Make sure you update your proxy software to the latest available version, and, if the backend servers are not on , also install the [ViaVersion](https://github.com/ViaVersion/ViaVersion) plugin on the backend servers. Velocity/BungeeCord support most Minecraft versions, so you can update them regardless of the backend server versions.