diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index d2aaa9dc3f7..bb6c57cc597 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -590,9 +590,9 @@ pipeline {
         // TODO (HBASE-23870): replace this with invocation of the release tool
         stage ('packaging and integration') {
           tools {
-            maven 'Maven (latest)'
+            maven 'maven_latest'
             // this needs to be set to the jdk that ought to be used to build releases on the branch the Jenkinsfile is stored in.
-            jdk "JDK 1.8 (latest)"
+            jdk "jdk_1.8_latest"
           }
           environment {
             BASEDIR = "${env.WORKSPACE}/component"
diff --git a/dev-support/adhoc_run_tests/Jenkinsfile b/dev-support/adhoc_run_tests/Jenkinsfile
index e06fdba325a..476795d50ca 100644
--- a/dev-support/adhoc_run_tests/Jenkinsfile
+++ b/dev-support/adhoc_run_tests/Jenkinsfile
@@ -51,10 +51,10 @@ pipeline {
   stages {
     stage ('run tests') {
       tools {
-        maven 'Maven (latest)'
+        maven 'maven_latest'
         // this needs to be set to the jdk that ought to be used to build releases on the branch
         // the Jenkinsfile is stored in.
-        jdk "JDK 1.8 (latest)"
+        jdk "jdk_1.8_latest"
       }
       steps {
         sh """#!/bin/bash -e
diff --git a/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile b/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
index b92347f8afa..0ba200ba07f 100644
--- a/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
+++ b/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
@@ -34,8 +34,8 @@ pipeline {
   }
   tools {
     // this should match what the yetus nightly job for the branch will use
-    maven 'Maven (latest)'
-    jdk "JDK 1.8 (latest)"
+    maven 'maven_latest'
+    jdk "jdk_1.8_latest"
   }
   stages {
     stage ('run flaky tests') {