diff --git a/source/installguide/hypervisor/kvm.rst b/source/installguide/hypervisor/kvm.rst
index f705004085..6f92dd61ae 100644
--- a/source/installguide/hypervisor/kvm.rst
+++ b/source/installguide/hypervisor/kvm.rst
@@ -158,9 +158,10 @@ KVM Instances.
 #. Repeat all of these steps on every hypervisor host.
 
 .. warning::
-   CloudStack |version| requires Java 17 JRE. Installing CloudStack agent will
-   automatically install Java 17, but it's good to explicitly confirm that the Java 17
-   is the selected/active one (in case you had a previous Java version already installed)
+   CloudStack |version| requires Java 17 or 21 JRE. Installing CloudStack agent will
+   automatically install Java 17 (or Java 21 where Java 17 is not available), but it's good
+   to explicitly confirm that Java 17 or 21 is the selected/active one (in case you had a
+   previous Java version already installed)
    with ``alternatives --config java``, after CloudStack agent is installed.
 
 .. note::
diff --git a/source/installguide/management-server/_prerequisite.rst b/source/installguide/management-server/_prerequisite.rst
index e932c2c603..484baaf5f9 100644
--- a/source/installguide/management-server/_prerequisite.rst
+++ b/source/installguide/management-server/_prerequisite.rst
@@ -103,7 +103,8 @@ node.
    will be installed.
 
 .. warning::
-   CloudStack |version| requires Java 17 JRE. Installing CloudStack packages will
-   automatically install Java 17, but it's good to explicitly confirm that the Java 17
-   is the selected/active one (in case you had a previous Java version already installed)
+   CloudStack |version| requires Java 17 or 21 JRE. Installing CloudStack packages will
+   automatically install Java 17 (or Java 21 where Java 17 is not available), but it's good
+   to explicitly confirm that Java 17 or 21 is the selected/active one (in case you had a
+   previous Java version already installed)
    with ``alternatives --config java`` after CloudStack packages are already installed.
diff --git a/source/quickinstallationguide/qig.rst b/source/quickinstallationguide/qig.rst
index 02e346a9a2..dcb7e2820c 100644
--- a/source/quickinstallationguide/qig.rst
+++ b/source/quickinstallationguide/qig.rst
@@ -375,7 +375,7 @@ following command:
 
    # dnf -y install cloudstack-management
 
-CloudStack |version| requires Java 17 JRE. Installing the management server
+CloudStack |version| requires Java 17 or 21 JRE. Installing the management server
 will automatically install Java 17, but it's good to explicitly confirm that Java 17
 is the selected/active one (in case you had a previous Java version already installed):
 
@@ -383,7 +383,7 @@ is the selected/active one (in case you had a previous Java version already inst
 
       $ alternatives --config java
       
-Make sure that Java 17 is selected.
+Make sure that Java 17 or 21 is selected.
 
 With the application itself installed we can now setup the database, we'll do 
 that with the following command and options:
diff --git a/source/releasenotes/compat.rst b/source/releasenotes/compat.rst
index f4a3e17bc0..cf220d2ce1 100644
--- a/source/releasenotes/compat.rst
+++ b/source/releasenotes/compat.rst
@@ -36,7 +36,7 @@ CloudStack Management Server.
 Software Requirements
 ~~~~~~~~~~~~~~~~~~~~~
 
--  Java JRE 17
+-  Java JRE 17 or 21
 -  MySQL 8.4 (or equivalent compatible DBMS)
 
 Supported Hypervisor Versions
diff --git a/source/upgrading/upgrade/_java_version.rst b/source/upgrading/upgrade/_java_version.rst
index 860f619e2e..0067cb0b7b 100644
--- a/source/upgrading/upgrade/_java_version.rst
+++ b/source/upgrading/upgrade/_java_version.rst
@@ -18,9 +18,9 @@
 Java Version Requirement
 ------------------------
 
-CloudStack |version| requires installation of Java 17 JRE for management server
+CloudStack |version| requires installation of Java 17 or 21 JRE for management server
 and the KVM agent. On installing or upgrading cloudstack-management and/or
-cloudstack-agent packages, please configure Java 17 as the default java
+cloudstack-agent packages, please configure Java 17 or 21 as the default java
 version using:
 
    .. parsed-literal::
diff --git a/source/upgrading/upgrade/upgrade-4.22.rst b/source/upgrading/upgrade/upgrade-4.22.rst
index 333fa2aaca..3c08dddf64 100644
--- a/source/upgrading/upgrade/upgrade-4.22.rst
+++ b/source/upgrading/upgrade/upgrade-4.22.rst
@@ -37,7 +37,7 @@ Overview of Upgrade Steps:
 
 #. Check any customisations and integrations
 #. Upload the |sysvm64-version| System VM template if not already using it.
-#. Confirm Java 17 is the default Java version
+#. Confirm Java 17 or 21 is the default Java version
 #. Stop all running management servers
 #. Backup CloudStack database (MySQL)
 #. Upgrade 1st CloudStack management server