diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index f683b9ac6b..59a19279af 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021 Contributors to the Eclipse Foundation
+# Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,7 +35,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 21
 
     - name: Initialize CodeQL (${{ matrix.language }})
       uses: github/codeql-action/init@v3
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e9f8ea29f6..85867938af 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,7 +53,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 21
     - name: Build OpenMQ
       run: |
         ./mvnw \
diff --git a/.github/workflows/tck.yml b/.github/workflows/tck.yml
index 220dac7143..d54e87f24d 100644
--- a/.github/workflows/tck.yml
+++ b/.github/workflows/tck.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,7 +27,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 21
     - name: Maven Build
       run: |
         ./mvnw --show-version \
diff --git a/Jenkinsfile b/Jenkinsfile
index f6ff680047..0b9d7399aa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,7 +27,7 @@ pipeline {
         stage('build') {
           agent any
           tools {
-            jdk   'temurin-jdk17-latest'
+            jdk   'temurin-jdk21-latest'
           }
           steps {
             sh './mvnw -V -B -P staging -f mq              clean install -Dbuild.letter=j -Dbuild.number=${BRANCH_NAME}/${GIT_COMMIT}/${BUILD_NUMBER}'
@@ -288,7 +288,7 @@ pipeline {
     stage('Code Coverage') {
       agent any
       tools {
-        jdk   'temurin-jdk17-latest'
+        jdk   'temurin-jdk21-latest'
       }
       steps {
         sh './mvnw -V -B -P staging -f mq -P jacoco clean verify'
@@ -311,7 +311,7 @@ pipeline {
           stage('analysis') {
             agent any
             tools {
-              jdk   'temurin-jdk17-latest'
+              jdk   'temurin-jdk21-latest'
             }
             steps {
               script {
diff --git a/Jenkinsfile.sonar b/Jenkinsfile.sonar
index 94c67be0c8..a809c0196f 100644
--- a/Jenkinsfile.sonar
+++ b/Jenkinsfile.sonar
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021 Contributors to Eclipse Foundation. All rights reserved.
+ * Copyright (c) 2020, 2024 Contributors to Eclipse Foundation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,7 +18,7 @@ pipeline {
   agent any
 
   tools {
-    jdk   'temurin-jdk17-latest'
+    jdk   'temurin-jdk21-latest'
   }
 
   options {