diff --git a/docker/ci/config/jdk-setup.sh b/docker/ci/config/jdk-setup.sh
index ae8754b661..8240846c96 100755
--- a/docker/ci/config/jdk-setup.sh
+++ b/docker/ci/config/jdk-setup.sh
@@ -58,7 +58,8 @@ for jdk in ${JDKS}; do
     ESUM=$(echo ${jdk} | cut -d '@' -f1)
     BINARY_URL=$(echo ${jdk} | cut -d '@' -f2)
     regex="temurin([0-9]+)[-]"
-    if [[ $jdk =~ $regex ]]; then
+    regex2="openjdk([0-9]+)[-]"
+    if [[ $jdk =~ $regex || $jdk =~ $regex2 ]]; then
         MAJOR=${BASH_REMATCH[1]}
         curl -LfsSo /tmp/openjdk-${MAJOR}.tar.gz ${BINARY_URL}
         echo "${ESUM} */tmp/openjdk-${MAJOR}.tar.gz" | sha256sum -c -
diff --git a/jenkins/manifests-update.jenkinsFile b/jenkins/manifests-update.jenkinsFile
index 755cdd242e..efdb5f4a50 100644
--- a/jenkins/manifests-update.jenkinsFile
+++ b/jenkins/manifests-update.jenkinsFile
@@ -21,7 +21,7 @@ pipeline {
             agent {
                 docker {
                     label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
-                    image 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3'
+                    image 'opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1'
                     args '-e JAVA_HOME=/opt/java/openjdk-11'
                     registryUrl 'https://public.ecr.aws/'
                     alwaysPull true
@@ -32,6 +32,8 @@ pipeline {
                     withCredentials([usernamePassword(credentialsId: 'jenkins-github-bot-token', passwordVariable: 'GITHUB_TOKEN', usernameVariable: 'GITHUB_USER')]) {
                         try {
                             sh """
+                                set +x
+                                source /etc/profile.d/java_home.sh
                                 git remote set-url origin https://opensearch-ci:${GITHUB_TOKEN}@github.com/opensearch-project/opensearch-build
                                 git config user.email "opensearch-infra@amazon.com"
                                 git config user.name "opensearch-ci"