diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 74b9d7b69..541e56203 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,7 +39,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'maven'
       - name: Cache Maven Wrapper
         uses: actions/cache@v4
diff --git a/.github/workflows/keycloak-chaos-benchmark.yml b/.github/workflows/keycloak-chaos-benchmark.yml
index f282c11a5..3a5f76b37 100644
--- a/.github/workflows/keycloak-chaos-benchmark.yml
+++ b/.github/workflows/keycloak-chaos-benchmark.yml
@@ -76,7 +76,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'maven'
 
       - name: Cache Maven Wrapper
diff --git a/.github/workflows/keycloak-create-deployment.yml b/.github/workflows/keycloak-create-deployment.yml
index 0ef378c71..067964b09 100644
--- a/.github/workflows/keycloak-create-deployment.yml
+++ b/.github/workflows/keycloak-create-deployment.yml
@@ -70,7 +70,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'maven'
 
       - if: ${{ env.AURORA_CLUSTER != '' }}
diff --git a/.github/workflows/keycloak-scalability-benchmark.yml b/.github/workflows/keycloak-scalability-benchmark.yml
index dce34fced..328e50860 100644
--- a/.github/workflows/keycloak-scalability-benchmark.yml
+++ b/.github/workflows/keycloak-scalability-benchmark.yml
@@ -73,7 +73,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'maven'
 
       - name: Cache Maven Wrapper
diff --git a/.github/workflows/provision-minikube.yml b/.github/workflows/provision-minikube.yml
index 1c524dad4..feab17b27 100644
--- a/.github/workflows/provision-minikube.yml
+++ b/.github/workflows/provision-minikube.yml
@@ -37,7 +37,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'maven'
       - uses: azure/setup-helm@v4
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fbce0e1b0..45f75f058 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'maven'
       - name: Cache Maven Wrapper
         uses: actions/cache@v4
diff --git a/.github/workflows/rosa-multi-az-cluster-create.yml b/.github/workflows/rosa-multi-az-cluster-create.yml
index 2fad061ea..2000d00ff 100644
--- a/.github/workflows/rosa-multi-az-cluster-create.yml
+++ b/.github/workflows/rosa-multi-az-cluster-create.yml
@@ -150,7 +150,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: maven
 
diff --git a/.github/workflows/rosa-multi-az-cluster-undeploy.yml b/.github/workflows/rosa-multi-az-cluster-undeploy.yml
index 61bf2e583..1feb0f604 100644
--- a/.github/workflows/rosa-multi-az-cluster-undeploy.yml
+++ b/.github/workflows/rosa-multi-az-cluster-undeploy.yml
@@ -59,7 +59,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: maven
 
diff --git a/.github/workflows/rosa-run-benchmark.yml b/.github/workflows/rosa-run-benchmark.yml
index dc57a23d7..7cfb7d4a1 100644
--- a/.github/workflows/rosa-run-benchmark.yml
+++ b/.github/workflows/rosa-run-benchmark.yml
@@ -48,7 +48,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'maven'
 
       - name: Cache Maven Wrapper
diff --git a/.github/workflows/rosa-run-crossdc-func-tests.yml b/.github/workflows/rosa-run-crossdc-func-tests.yml
index dd32c38d6..e48d496b5 100644
--- a/.github/workflows/rosa-run-crossdc-func-tests.yml
+++ b/.github/workflows/rosa-run-crossdc-func-tests.yml
@@ -54,7 +54,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'maven'
 
       - name: Cache Maven Wrapper
diff --git a/.github/workflows/rosa-scaling-benchmark.yml b/.github/workflows/rosa-scaling-benchmark.yml
index d5a04afc6..8c50e5787 100644
--- a/.github/workflows/rosa-scaling-benchmark.yml
+++ b/.github/workflows/rosa-scaling-benchmark.yml
@@ -114,7 +114,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'maven'
 
       - name: Cache Maven Wrapper
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index 1cf7d73fb..4b0b91bf0 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -30,7 +30,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'maven'
       - name: Cache Maven Wrapper
         uses: actions/cache@v4
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index b9840d7b7..7a30b50fa 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -8,11 +8,11 @@
 
     <properties>
         <scala.version>2.13.13</scala.version>
-        <gatling.version>3.10.4</gatling.version>
+        <gatling.version>3.10.5</gatling.version>
         <janino.version>3.1.7</janino.version>
         <scala-maven-plugin.version>4.8.1</scala-maven-plugin.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
diff --git a/pom.xml b/pom.xml
index 7e4944767..eb6916bd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,8 +154,7 @@
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <!-- Java 21 is not currently supported by Scala 2.12.x, so we enforce the previous LTS release Java 17 -->
-                  <version>[${maven.compiler.source},18)</version>
+                  <version>[${maven.compiler.source},22)</version>
                 </requireJavaVersion>
               </rules>
             </configuration>