diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 79ef2c3a1e..35332c7a40 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -116,8 +116,8 @@ jobs:
       - uses: jdx/mise-action@5ac50f778e26fac95da98d50503682459e86d566 # v3.2.0
         with:
           version: 2025.7.12
-      - name: Select Java 17
-        run: mise use java@17
+      - name: Select Java 21
+        run: mise use java@21
       - name: Configure Maven
         uses: SonarSource/ci-github-actions/config-maven@v1
         with:
diff --git a/mise.toml b/mise.toml
index c9152e9e51..4b3e4cec4c 100644
--- a/mise.toml
+++ b/mise.toml
@@ -1,3 +1,3 @@
 [tools]
-java = ["24", "17"]
+java = ["24", "21", "17"]
 maven = "3.9"
diff --git a/pom.xml b/pom.xml
index fe8d04ed93..d5530ab6c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
   <properties>
     <license.title>SonarQube Java</license.title>
 
-    <jdk.min.version>17</jdk.min.version>
+    <jdk.min.version>21</jdk.min.version>
 
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>