diff --git a/.github/toolchains.xml b/.github/toolchains.xml
index eb86dcb189..4c60e46839 100644
--- a/.github/toolchains.xml
+++ b/.github/toolchains.xml
@@ -5,11 +5,11 @@
 	<toolchain>
 		<type>jdk</type>
 		<provides>
-			<id>JavaSE-19</id>
-			<version>19</version>
+			<id>JavaSE-21</id>
+			<version>21</version>
 		</provides>
 		<configuration>
-			<jdkHome>${env.JAVA_HOME_19_X64}</jdkHome>
+			<jdkHome>${env.JAVA_HOME_21_X64}</jdkHome>
 		</configuration>
 	</toolchain>
 	<toolchain>
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 27fda19dee..ee827b58c8 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -30,7 +30,7 @@ jobs:
         java-version: |
             8
             11
-            19
+            21
             17
         distribution: 'temurin'
     - name: Cache local Maven repository
diff --git a/.github/workflows/verify-platform.yml b/.github/workflows/verify-platform.yml
index 5fbd45f32a..5a8ee869ef 100644
--- a/.github/workflows/verify-platform.yml
+++ b/.github/workflows/verify-platform.yml
@@ -32,7 +32,7 @@ jobs:
         java-version: |
             8
             11
-            19
+            21
             17
         distribution: 'temurin'
     - name: Cache local Maven repository
diff --git a/.github/workflows/verify-platform2.yml b/.github/workflows/verify-platform2.yml
index 45dc14af6a..e144f479f9 100644
--- a/.github/workflows/verify-platform2.yml
+++ b/.github/workflows/verify-platform2.yml
@@ -32,7 +32,7 @@ jobs:
         java-version: |
             8
             11
-            19
+            21
             17
         distribution: 'temurin'
     - name: Cache local Maven repository