diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 263f8bcfe74..daa82460e10 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -14,7 +14,8 @@ jobs:
     strategy:
       matrix: # 'macos-14' is arm64
         os: ['ubuntu-22.04', 'macos-14', 'windows-2022']
-        java: [ 17 ]
+        java: [ 21 ]
+        additional-maven-args: ['']
         include:
         - os: ubuntu-22.04
           java: 21
diff --git a/Jenkinsfile b/Jenkinsfile
index 6917f17e5db..71852127ee0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
   triggers {
     parameterizedCron(env.BRANCH_NAME == 'main' ? '''
       H H(0-1) * * * %TARGET_PLATFORM=r202203;JDK_VERSION=17
-      H H(3-4) * * * %TARGET_PLATFORM=latest;JDK_VERSION=17
+      H H(3-4) * * * %TARGET_PLATFORM=latest;JDK_VERSION=21
       ''' : '')
   }