diff --git a/jenkins/check-for-build.jenkinsfile b/jenkins/check-for-build.jenkinsfile
index 9285199a7c..87d4bdda74 100644
--- a/jenkins/check-for-build.jenkinsfile
+++ b/jenkins/check-for-build.jenkinsfile
@@ -19,7 +19,7 @@ pipeline {
     }
     agent none
     environment {
-        AGENT_X64 = 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+        AGENT_X64 = 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
     }
     triggers {
         parameterizedCron '''
diff --git a/jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile b/jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile
index 8a46477865..c2b6468360 100644
--- a/jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile
+++ b/jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile
@@ -34,7 +34,7 @@ pipeline {
         stage('Promote Archives') {
             agent {
                 docker {
-                    label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+                    label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
                     image 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3'
                     args '-e JAVA_HOME=/opt/java/openjdk-11'
                     registryUrl 'https://public.ecr.aws/'
@@ -87,7 +87,7 @@ pipeline {
         stage('Promote Docker') {
             agent {
                 docker {
-                    label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+                    label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
                     image 'docker/library/alpine:3'
                     registryUrl 'https://public.ecr.aws/'
                     alwaysPull true
@@ -180,7 +180,7 @@ pipeline {
         stage('Promote Maven') {
             agent {
                 docker {
-                    label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+                    label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
                     image 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3'
                     args '-e JAVA_HOME=/opt/java/openjdk-11'
                     registryUrl 'https://public.ecr.aws/'
diff --git a/jenkins/docker/docker-scan.jenkinsfile b/jenkins/docker/docker-scan.jenkinsfile
index e368d4f6b0..db30f4175e 100644
--- a/jenkins/docker/docker-scan.jenkinsfile
+++ b/jenkins/docker/docker-scan.jenkinsfile
@@ -28,7 +28,7 @@ pipeline {
         stage("Image Scan (Trivy)") {
             agent {
                 docker {
-                    label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+                    label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
                     image 'opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1'
                     args '-u root -v /var/run/docker.sock:/var/run/docker.sock'
                     registryUrl 'https://public.ecr.aws/'
diff --git a/jenkins/integ-test-notification.jenkinsfile b/jenkins/integ-test-notification.jenkinsfile
index 450f52aa68..d1082ff677 100644
--- a/jenkins/integ-test-notification.jenkinsfile
+++ b/jenkins/integ-test-notification.jenkinsfile
@@ -14,7 +14,7 @@ lib = library(identifier: 'jenkins@7.0.0', retriever: modernSCM([
 
 
 pipeline {
-    agent { label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host' }
+    agent { label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host' }
     options {
         timeout(time: 1, unit: 'HOURS')
         buildDiscarder(logRotator(daysToKeepStr: '90'))
diff --git a/jenkins/legacy/TestRunNonSecurityPerfTestScript.groovy.legacy b/jenkins/legacy/TestRunNonSecurityPerfTestScript.groovy.legacy
index db4a123965..1b81dcf060 100644
--- a/jenkins/legacy/TestRunNonSecurityPerfTestScript.groovy.legacy
+++ b/jenkins/legacy/TestRunNonSecurityPerfTestScript.groovy.legacy
@@ -51,7 +51,7 @@ class TestRunNonSecurityPerfTestScript extends BuildPipelineTest {
         helper.registerAllowedMethod('parameterizedCron', [String], null)
         helper.registerAllowedMethod("cfnDescribe", [Map])
         helper.registerAllowedMethod("cfnDelete", [Map])
-        binding.setVariable('AGENT_LABEL', 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host')
+        binding.setVariable('AGENT_LABEL', 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host')
         binding.setVariable('AGENT_IMAGE', 'opensearchstaging/ci-runner:ci-runner-centos7-v1')
         binding.setVariable('ARCHITECTURE', 'x64')
         binding.setVariable('ARTIFACT_BUCKET_NAME', 'test_bucket')
diff --git a/jenkins/legacy/rpm-validation.jenkinsfile b/jenkins/legacy/rpm-validation.jenkinsfile
index 6f4d35db70..998b282713 100644
--- a/jenkins/legacy/rpm-validation.jenkinsfile
+++ b/jenkins/legacy/rpm-validation.jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
             )
             string(
                 name: 'AGENT_LABEL',
-                description: 'The agent label where the tests should be executed, e.g. Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host or Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host',
+                description: 'The agent label where the tests should be executed, e.g. Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host or Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host',
                 trim: true
             )
 
diff --git a/jenkins/manifests-update.jenkinsFile b/jenkins/manifests-update.jenkinsFile
index efdb5f4a50..654b6318a2 100644
--- a/jenkins/manifests-update.jenkinsFile
+++ b/jenkins/manifests-update.jenkinsFile
@@ -20,7 +20,7 @@ pipeline {
         stage('Update Manifests') {
             agent {
                 docker {
-                    label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+                    label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
                     image 'opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1'
                     args '-e JAVA_HOME=/opt/java/openjdk-11'
                     registryUrl 'https://public.ecr.aws/'
diff --git a/jenkins/opensearch-dashboards/bwc-test.jenkinsfile b/jenkins/opensearch-dashboards/bwc-test.jenkinsfile
index 1cd8890034..318e88f1b3 100644
--- a/jenkins/opensearch-dashboards/bwc-test.jenkinsfile
+++ b/jenkins/opensearch-dashboards/bwc-test.jenkinsfile
@@ -35,7 +35,7 @@ pipeline {
         )
         string(
             name: 'AGENT_LABEL',
-            description: 'The agent label where the tests should be executed, e.g. Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host.',
+            description: 'The agent label where the tests should be executed, e.g. Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host.',
             trim: true
         )
     }
@@ -70,7 +70,7 @@ pipeline {
         stage('detect docker image + args') {
             agent {
                 docker {
-                    label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+                    label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
                     image 'opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028'
                     registryUrl 'https://public.ecr.aws/'
                     alwaysPull true
diff --git a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile
index d968c92383..12ec81aec7 100644
--- a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile
+++ b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile
@@ -18,8 +18,8 @@ pipeline {
     }
     agent none
     environment {
-        AGENT_LINUX_X64 = 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
-        AGENT_LINUX_ARM64 = 'Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host'
+        AGENT_LINUX_X64 = 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
+        AGENT_LINUX_ARM64 = 'Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host'
         AGENT_WINDOWS_X64 = 'Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Host'
         IMAGE_LINUX_RPM = 'opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1' // required for rpm to create digest sha256 correctly with rpm 4.12+, still define here for 1.x version as 2.x+ moved to rockylinux8, later almalinux8, already
         IMAGE_LINUX_DEB = 'opensearchstaging/ci-runner:ci-runner-ubuntu2004-opensearch-build-v2' // required for deb to create pkg using debmake/debuild/debhelper
diff --git a/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile b/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile
index 3d386f3664..5200d7d6b1 100644
--- a/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile
+++ b/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile
@@ -15,7 +15,7 @@ lib = library(identifier: 'jenkins@1.0.4', retriever: modernSCM([
 pipeline {
     agent {
         docker {
-            label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+            label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
             image 'opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211130'
             registryUrl 'https://public.ecr.aws/'
             alwaysPull true
diff --git a/jenkins/opensearch-maven-release/publish-to-maven.jenkinsfile b/jenkins/opensearch-maven-release/publish-to-maven.jenkinsfile
index 7ca7ab0d5d..56392be78b 100644
--- a/jenkins/opensearch-maven-release/publish-to-maven.jenkinsfile
+++ b/jenkins/opensearch-maven-release/publish-to-maven.jenkinsfile
@@ -15,7 +15,7 @@ lib = library(identifier: 'jenkins@1.5.0', retriever: modernSCM([
 pipeline {
     agent {
         docker {
-            label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+            label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
             image 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3'
             registryUrl 'https://public.ecr.aws/'
             alwaysPull true
diff --git a/jenkins/opensearch/bwc-test.jenkinsfile b/jenkins/opensearch/bwc-test.jenkinsfile
index 32d0550d91..8d16d4c06b 100644
--- a/jenkins/opensearch/bwc-test.jenkinsfile
+++ b/jenkins/opensearch/bwc-test.jenkinsfile
@@ -35,7 +35,7 @@ pipeline {
         )
         string(
             name: 'AGENT_LABEL',
-            description: 'The agent label where the tests should be executed, e.g. Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host.',
+            description: 'The agent label where the tests should be executed, e.g. Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host.',
             trim: true
         )
     }
@@ -70,7 +70,7 @@ pipeline {
         stage('detect docker image + args') {
             agent {
                 docker {
-                    label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+                    label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
                     image 'opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028'
                     registryUrl 'https://public.ecr.aws/'
                     alwaysPull true
diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile
index 20b5a9096b..03d75c0471 100644
--- a/jenkins/opensearch/distribution-build.jenkinsfile
+++ b/jenkins/opensearch/distribution-build.jenkinsfile
@@ -18,8 +18,8 @@ pipeline {
     }
     agent none
     environment {
-        AGENT_LINUX_X64 = 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
-        AGENT_LINUX_ARM64 = 'Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host'
+        AGENT_LINUX_X64 = 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
+        AGENT_LINUX_ARM64 = 'Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host'
         AGENT_WINDOWS_X64 = 'Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Host'
         IMAGE_LINUX_RPM = 'opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1' // required for rpm to create digest sha256 correctly with rpm 4.12+, still define here for 1.x version as 2.x+ moved to rockylinux8, later almalinux8, already
         IMAGE_LINUX_DEB = 'opensearchstaging/ci-runner:ci-runner-ubuntu2004-opensearch-build-v2' // required for deb to create pkg using debmake/debuild/debhelper
@@ -156,7 +156,7 @@ pipeline {
                 stage('Trigger-min-snapshot-build') {
                     agent {
                         docker {
-                            label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+                            label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
                             image 'docker/library/alpine:3'
                             registryUrl 'https://public.ecr.aws/'
                             alwaysPull true
diff --git a/jenkins/opensearch/maven-publish-1.3.x.jenkinsfile b/jenkins/opensearch/maven-publish-1.3.x.jenkinsfile
index 9d1029dda0..df00af3d24 100644
--- a/jenkins/opensearch/maven-publish-1.3.x.jenkinsfile
+++ b/jenkins/opensearch/maven-publish-1.3.x.jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
     }
     agent none
     environment {
-        AGENT_X64 = 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+        AGENT_X64 = 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
     }
     triggers {
         parameterizedCron '''
diff --git a/jenkins/opensearch/publish-min-snapshots.jenkinsfile b/jenkins/opensearch/publish-min-snapshots.jenkinsfile
index 8b6d96568c..07339f927f 100644
--- a/jenkins/opensearch/publish-min-snapshots.jenkinsfile
+++ b/jenkins/opensearch/publish-min-snapshots.jenkinsfile
@@ -18,8 +18,8 @@ pipeline {
     }
     agent none
     environment {
-        AGENT_LINUX_X64 = 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
-        AGENT_LINUX_ARM64 = 'Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host'
+        AGENT_LINUX_X64 = 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
+        AGENT_LINUX_ARM64 = 'Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host'
         AGENT_MACOS_X64 = 'Jenkins-Agent-MacOS13-X64-Mac1Metal-Multi-Host'
         AGENT_MACOS_ARM64 = 'Jenkins-Agent-MacOS13-ARM64-Mac2M2proMetal-Multi-Host'
         AGENT_WINDOWS_X64 = 'Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Host'
diff --git a/jenkins/promotion/promote-artifacts.jenkinsfile b/jenkins/promotion/promote-artifacts.jenkinsfile
index a3f456e284..37a7a1f6a5 100644
--- a/jenkins/promotion/promote-artifacts.jenkinsfile
+++ b/jenkins/promotion/promote-artifacts.jenkinsfile
@@ -55,7 +55,7 @@ pipeline {
         stage('promote artifacts') {
             agent {
                 docker {
-                    label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+                    label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
                     image 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3'
                     registryUrl 'https://public.ecr.aws/'
                     alwaysPull true
diff --git a/jenkins/promotion/promote-docker-ecr.jenkinsfile b/jenkins/promotion/promote-docker-ecr.jenkinsfile
index f1743384bd..42a4f9d5ec 100644
--- a/jenkins/promotion/promote-docker-ecr.jenkinsfile
+++ b/jenkins/promotion/promote-docker-ecr.jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
     }
     agent {
         docker {
-            label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+            label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
             image 'opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1'
             registryUrl 'https://public.ecr.aws/'
             args '-u root -v /var/run/docker.sock:/var/run/docker.sock'
diff --git a/jenkins/promotion/promote-repos.jenkinsfile b/jenkins/promotion/promote-repos.jenkinsfile
index ccf3c0ff60..9c3d34e05b 100644
--- a/jenkins/promotion/promote-repos.jenkinsfile
+++ b/jenkins/promotion/promote-repos.jenkinsfile
@@ -50,7 +50,7 @@ pipeline {
         stage('promote repo') {
             agent {
                 docker {
-                    label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+                    label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
                     image docker_images["${DISTRIBUTION_REPO_TYPE}"]
                     registryUrl 'https://public.ecr.aws/'
                     alwaysPull true
diff --git a/jenkins/release-workflows/release-branch.jenkinsfile b/jenkins/release-workflows/release-branch.jenkinsfile
index 1c926cafd5..06aea4f183 100644
--- a/jenkins/release-workflows/release-branch.jenkinsfile
+++ b/jenkins/release-workflows/release-branch.jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
     }
     agent {
         docker {
-            label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+            label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
             image 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3'
             registryUrl 'https://public.ecr.aws/'
             alwaysPull true
diff --git a/jenkins/release-workflows/release-manifest-commit-lock.jenkinsfile b/jenkins/release-workflows/release-manifest-commit-lock.jenkinsfile
index 82285da0f0..7ec387d16d 100644
--- a/jenkins/release-workflows/release-manifest-commit-lock.jenkinsfile
+++ b/jenkins/release-workflows/release-manifest-commit-lock.jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
     }
     agent {
         docker {
-            label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+            label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
             image 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3'
             registryUrl 'https://public.ecr.aws/'
             alwaysPull true
diff --git a/jenkins/release-workflows/release-notes-check.jenkinsfile b/jenkins/release-workflows/release-notes-check.jenkinsfile
index 36f85caf21..1568c50f50 100644
--- a/jenkins/release-workflows/release-notes-check.jenkinsfile
+++ b/jenkins/release-workflows/release-notes-check.jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
     }
     agent {
         docker {
-            label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+            label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
             image 'opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1'
             registryUrl 'https://public.ecr.aws/'
             alwaysPull true
diff --git a/jenkins/release-workflows/release-promotion.jenkinsfile b/jenkins/release-workflows/release-promotion.jenkinsfile
index 33e112267c..e6e0ebbbb3 100644
--- a/jenkins/release-workflows/release-promotion.jenkinsfile
+++ b/jenkins/release-workflows/release-promotion.jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
     }
     agent none
     environment {
-        AGENT_LINUX_X64 = 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+        AGENT_LINUX_X64 = 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
     }
     parameters {
         string(
diff --git a/jenkins/release-workflows/release-tag.jenkinsfile b/jenkins/release-workflows/release-tag.jenkinsfile
index 215403d19f..e6b8464dbc 100644
--- a/jenkins/release-workflows/release-tag.jenkinsfile
+++ b/jenkins/release-workflows/release-tag.jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
     }
     agent {
         docker {
-            label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+            label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
             image 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3'
             registryUrl 'https://public.ecr.aws/'
             alwaysPull true
diff --git a/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile b/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile
index 8979ef8f35..24eb985e73 100644
--- a/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile
+++ b/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile
@@ -15,7 +15,7 @@ lib = library(identifier: 'jenkins@1.0.4', retriever: modernSCM([
 pipeline {
     agent {
         docker {
-            label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+            label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
             image 'opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1'
             registryUrl 'https://public.ecr.aws/'
             alwaysPull true
diff --git a/jenkins/validate-artifacts/validate-artifacts.jenkinsfile b/jenkins/validate-artifacts/validate-artifacts.jenkinsfile
index 95b78f26de..8fbbd6fb97 100644
--- a/jenkins/validate-artifacts/validate-artifacts.jenkinsfile
+++ b/jenkins/validate-artifacts/validate-artifacts.jenkinsfile
@@ -35,8 +35,8 @@ def agent_nodes_docker = [
 
 def agent_nodes = [
     "windows_x64": "Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Host",
-    "linux_x64": "Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host",
-    "linux_arm64": "Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host",
+    "linux_x64": "Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host",
+    "linux_arm64": "Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host",
 ]
 
 pipeline {
diff --git a/jenkins/vulnerability-scan/whitesource-scan.jenkinsfile b/jenkins/vulnerability-scan/whitesource-scan.jenkinsfile
index fcc2f14efe..fb6b49be7d 100644
--- a/jenkins/vulnerability-scan/whitesource-scan.jenkinsfile
+++ b/jenkins/vulnerability-scan/whitesource-scan.jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
         stage('Run the scan') {
             agent {
                 docker {
-                    label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
+                    label 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host'
                     image 'opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028'
                     args '-e LANG=en_US.UTF-8'
                     registryUrl 'https://public.ecr.aws/'
diff --git a/tests/jenkins/jenkinsjob-regression-files/maven-sign-release/maven-sign-release.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/maven-sign-release/maven-sign-release.jenkinsfile.txt
index 1d89b4a7fc..07b295760c 100644
--- a/tests/jenkins/jenkinsjob-regression-files/maven-sign-release/maven-sign-release.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/maven-sign-release/maven-sign-release.jenkinsfile.txt
@@ -3,7 +3,7 @@
       maven-sign-release.library({identifier=jenkins@1.0.4, retriever=null})
       maven-sign-release.pipeline(groovy.lang.Closure)
          maven-sign-release.credentials(jenkins-artifact-bucket-name)
-         maven-sign-release.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211130, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         maven-sign-release.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211130, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          maven-sign-release.stage(sign, groovy.lang.Closure)
             maven-sign-release.script(groovy.lang.Closure)
                maven-sign-release.echo(Downloading from S3.)
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/bwc-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/bwc-test.jenkinsfile.txt
index 627a4a6829..0cdcfd0e9f 100644
--- a/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/bwc-test.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/bwc-test.jenkinsfile.txt
@@ -11,7 +11,7 @@
             bwc-test.script(groovy.lang.Closure)
                bwc-test.fileExists(manifests/tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml)
          bwc-test.stage(detect docker image + args, groovy.lang.Closure)
-            bwc-test.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+            bwc-test.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
             bwc-test.script(groovy.lang.Closure)
                bwc-test.detectTestDockerAgent()
                   detectTestDockerAgent.legacySCM(groovy.lang.Closure)
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch-maven-release/publish-to-maven.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch-maven-release/publish-to-maven.jenkinsfile.txt
index 34f5411396..ad755dbb57 100644
--- a/tests/jenkins/jenkinsjob-regression-files/opensearch-maven-release/publish-to-maven.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/opensearch-maven-release/publish-to-maven.jenkinsfile.txt
@@ -3,7 +3,7 @@
       publish-to-maven.library({identifier=jenkins@1.5.0, retriever=null})
       publish-to-maven.pipeline(groovy.lang.Closure)
          publish-to-maven.credentials(jenkins-artifact-bucket-name)
-         publish-to-maven.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         publish-to-maven.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          publish-to-maven.stage(sign-stage-and-release, groovy.lang.Closure)
             publish-to-maven.script(groovy.lang.Closure)
                publish-to-maven.echo(Downloading from S3.)
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/bwc-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/bwc-test.jenkinsfile.txt
index 731d1e1c26..efce0fa64c 100644
--- a/tests/jenkins/jenkinsjob-regression-files/opensearch/bwc-test.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/bwc-test.jenkinsfile.txt
@@ -11,7 +11,7 @@
             bwc-test.script(groovy.lang.Closure)
                bwc-test.fileExists(manifests/tests/jenkins/data/opensearch-1.3.0-test.yml)
          bwc-test.stage(detect docker image + args, groovy.lang.Closure)
-            bwc-test.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+            bwc-test.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
             bwc-test.script(groovy.lang.Closure)
                bwc-test.detectTestDockerAgent()
                   detectTestDockerAgent.legacySCM(groovy.lang.Closure)
diff --git a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDocker.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDocker.jenkinsfile.txt
index db1d1c1f0b..6ee333f1c0 100644
--- a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDocker.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDocker.jenkinsfile.txt
@@ -3,7 +3,7 @@
       promote-docker-ecr.library({identifier=jenkins@1.0.4, retriever=null})
       promote-docker-ecr.pipeline(groovy.lang.Closure)
          promote-docker-ecr.timeout({time=1, unit=HOURS})
-         promote-docker-ecr.echo(Executing on agent [docker:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         promote-docker-ecr.echo(Executing on agent [docker:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          promote-docker-ecr.stage(Parameters Check, groovy.lang.Closure)
             promote-docker-ecr.script(groovy.lang.Closure)
          promote-docker-ecr.stage(image-promote-to-prod, groovy.lang.Closure)
diff --git a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerECRLatestMajor.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerECRLatestMajor.jenkinsfile.txt
index a577a12493..26d64be8e2 100644
--- a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerECRLatestMajor.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerECRLatestMajor.jenkinsfile.txt
@@ -3,7 +3,7 @@
       promote-docker-ecr.library({identifier=jenkins@1.0.4, retriever=null})
       promote-docker-ecr.pipeline(groovy.lang.Closure)
          promote-docker-ecr.timeout({time=1, unit=HOURS})
-         promote-docker-ecr.echo(Executing on agent [docker:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         promote-docker-ecr.echo(Executing on agent [docker:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          promote-docker-ecr.stage(Parameters Check, groovy.lang.Closure)
             promote-docker-ecr.script(groovy.lang.Closure)
          promote-docker-ecr.stage(image-promote-to-prod, groovy.lang.Closure)
diff --git a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerLatest.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerLatest.jenkinsfile.txt
index 9a76755bc3..a88ad56116 100644
--- a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerLatest.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerLatest.jenkinsfile.txt
@@ -3,7 +3,7 @@
       promote-docker-ecr.library({identifier=jenkins@1.0.4, retriever=null})
       promote-docker-ecr.pipeline(groovy.lang.Closure)
          promote-docker-ecr.timeout({time=1, unit=HOURS})
-         promote-docker-ecr.echo(Executing on agent [docker:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         promote-docker-ecr.echo(Executing on agent [docker:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          promote-docker-ecr.stage(Parameters Check, groovy.lang.Closure)
             promote-docker-ecr.script(groovy.lang.Closure)
          promote-docker-ecr.stage(image-promote-to-prod, groovy.lang.Closure)
diff --git a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerLatestMajor.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerLatestMajor.jenkinsfile.txt
index 2b5179f416..4b572ce5d9 100644
--- a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerLatestMajor.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerLatestMajor.jenkinsfile.txt
@@ -3,7 +3,7 @@
       promote-docker-ecr.library({identifier=jenkins@1.0.4, retriever=null})
       promote-docker-ecr.pipeline(groovy.lang.Closure)
          promote-docker-ecr.timeout({time=1, unit=HOURS})
-         promote-docker-ecr.echo(Executing on agent [docker:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         promote-docker-ecr.echo(Executing on agent [docker:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          promote-docker-ecr.stage(Parameters Check, groovy.lang.Closure)
             promote-docker-ecr.script(groovy.lang.Closure)
          promote-docker-ecr.stage(image-promote-to-prod, groovy.lang.Closure)
diff --git a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerMajor.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerMajor.jenkinsfile.txt
index 21a920edf7..246972754b 100644
--- a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerMajor.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerMajor.jenkinsfile.txt
@@ -3,7 +3,7 @@
       promote-docker-ecr.library({identifier=jenkins@1.0.4, retriever=null})
       promote-docker-ecr.pipeline(groovy.lang.Closure)
          promote-docker-ecr.timeout({time=1, unit=HOURS})
-         promote-docker-ecr.echo(Executing on agent [docker:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         promote-docker-ecr.echo(Executing on agent [docker:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          promote-docker-ecr.stage(Parameters Check, groovy.lang.Closure)
             promote-docker-ecr.script(groovy.lang.Closure)
          promote-docker-ecr.stage(image-promote-to-prod, groovy.lang.Closure)
diff --git a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToECRLatestMajor.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToECRLatestMajor.jenkinsfile.txt
index a85d4b4f38..a0d67c7d5e 100644
--- a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToECRLatestMajor.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToECRLatestMajor.jenkinsfile.txt
@@ -3,7 +3,7 @@
       promote-docker-ecr.library({identifier=jenkins@1.0.4, retriever=null})
       promote-docker-ecr.pipeline(groovy.lang.Closure)
          promote-docker-ecr.timeout({time=1, unit=HOURS})
-         promote-docker-ecr.echo(Executing on agent [docker:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         promote-docker-ecr.echo(Executing on agent [docker:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          promote-docker-ecr.stage(Parameters Check, groovy.lang.Closure)
             promote-docker-ecr.script(groovy.lang.Closure)
          promote-docker-ecr.stage(image-promote-to-prod, groovy.lang.Closure)
diff --git a/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-branch-buildmanifest.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-branch-buildmanifest.jenkinsfile.txt
index 032e64042c..3384dd91a7 100644
--- a/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-branch-buildmanifest.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-branch-buildmanifest.jenkinsfile.txt
@@ -3,7 +3,7 @@
       release-branch.library({identifier=jenkins@6.3.3, retriever=null})
       release-branch.pipeline(groovy.lang.Closure)
          release-branch.timeout({time=1, unit=HOURS})
-         release-branch.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         release-branch.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          release-branch.stage(Create Release Branch, groovy.lang.Closure)
             release-branch.script(groovy.lang.Closure)
                release-branch.usernamePassword({credentialsId=jenkins-github-bot-token, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
diff --git a/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-branch-inputmanifest.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-branch-inputmanifest.jenkinsfile.txt
index 8ce05b9bdd..7f581b1e33 100644
--- a/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-branch-inputmanifest.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-branch-inputmanifest.jenkinsfile.txt
@@ -3,7 +3,7 @@
       release-branch.library({identifier=jenkins@6.3.3, retriever=null})
       release-branch.pipeline(groovy.lang.Closure)
          release-branch.timeout({time=1, unit=HOURS})
-         release-branch.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         release-branch.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          release-branch.stage(Create Release Branch, groovy.lang.Closure)
             release-branch.script(groovy.lang.Closure)
                release-branch.usernamePassword({credentialsId=jenkins-github-bot-token, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
diff --git a/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-notes-check.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-notes-check.jenkinsfile.txt
index b2a7e9a12e..ce225eb94f 100644
--- a/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-notes-check.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-notes-check.jenkinsfile.txt
@@ -3,7 +3,7 @@
       release-notes-check.library({identifier=jenkins@1.0.4, retriever=null})
       release-notes-check.pipeline(groovy.lang.Closure)
          release-notes-check.timeout({time=2, unit=HOURS})
-         release-notes-check.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         release-notes-check.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          release-notes-check.stage(Parameters Check, groovy.lang.Closure)
             release-notes-check.script(groovy.lang.Closure)
          release-notes-check.stage(Check release notes, groovy.lang.Closure)
diff --git a/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-notes-compile.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-notes-compile.jenkinsfile.txt
index 583a80a247..1fed909562 100644
--- a/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-notes-compile.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-notes-compile.jenkinsfile.txt
@@ -3,7 +3,7 @@
       release-notes-check.library({identifier=jenkins@1.0.4, retriever=null})
       release-notes-check.pipeline(groovy.lang.Closure)
          release-notes-check.timeout({time=2, unit=HOURS})
-         release-notes-check.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         release-notes-check.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          release-notes-check.stage(Parameters Check, groovy.lang.Closure)
             release-notes-check.script(groovy.lang.Closure)
          release-notes-check.echo(Skipping stage Check release notes)
diff --git a/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-tag.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-tag.jenkinsfile.txt
index 980e3d986a..a06f958106 100644
--- a/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-tag.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/release-workflows/release-tag.jenkinsfile.txt
@@ -3,7 +3,7 @@
       release-tag.library({identifier=jenkins@1.0.4, retriever=null})
       release-tag.pipeline(groovy.lang.Closure)
          release-tag.timeout({time=2, unit=HOURS})
-         release-tag.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         release-tag.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          release-tag.stage(Create Release Tag for OpenSearch components, groovy.lang.Closure)
             release-tag.script(groovy.lang.Closure)
                release-tag.sh(curl -SLO https://artifacts.opensearch.org/releases/bundle/opensearch/2.16.0/opensearch-2.16.0-linux-x64.tar.gz && tar -xf opensearch-2.16.0-linux-x64.tar.gz opensearch-2.16.0/manifest.yml)
diff --git a/tests/jenkins/jenkinsjob-regression-files/release-workflows/testManifestCommitLock_createPullRequest.txt b/tests/jenkins/jenkinsjob-regression-files/release-workflows/testManifestCommitLock_createPullRequest.txt
index df8b24e850..610e22910a 100644
--- a/tests/jenkins/jenkinsjob-regression-files/release-workflows/testManifestCommitLock_createPullRequest.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/release-workflows/testManifestCommitLock_createPullRequest.txt
@@ -3,7 +3,7 @@
       release-manifest-commit-lock.library({identifier=jenkins@6.4.0, retriever=null})
       release-manifest-commit-lock.pipeline(groovy.lang.Closure)
          release-manifest-commit-lock.timeout({time=2, unit=HOURS})
-         release-manifest-commit-lock.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         release-manifest-commit-lock.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          release-manifest-commit-lock.stage(Parameters Check, groovy.lang.Closure)
             release-manifest-commit-lock.script(groovy.lang.Closure)
          release-manifest-commit-lock.stage(MATCH_BUILD_MANIFEST, groovy.lang.Closure)
diff --git a/tests/jenkins/jenkinsjob-regression-files/release-workflows/testManifestCommitLock_matchBuildManifest.txt b/tests/jenkins/jenkinsjob-regression-files/release-workflows/testManifestCommitLock_matchBuildManifest.txt
index df8b24e850..610e22910a 100644
--- a/tests/jenkins/jenkinsjob-regression-files/release-workflows/testManifestCommitLock_matchBuildManifest.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/release-workflows/testManifestCommitLock_matchBuildManifest.txt
@@ -3,7 +3,7 @@
       release-manifest-commit-lock.library({identifier=jenkins@6.4.0, retriever=null})
       release-manifest-commit-lock.pipeline(groovy.lang.Closure)
          release-manifest-commit-lock.timeout({time=2, unit=HOURS})
-         release-manifest-commit-lock.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         release-manifest-commit-lock.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          release-manifest-commit-lock.stage(Parameters Check, groovy.lang.Closure)
             release-manifest-commit-lock.script(groovy.lang.Closure)
          release-manifest-commit-lock.stage(MATCH_BUILD_MANIFEST, groovy.lang.Closure)
diff --git a/tests/jenkins/jenkinsjob-regression-files/release-workflows/testManifestCommitLock_updateToRecentCommits.txt b/tests/jenkins/jenkinsjob-regression-files/release-workflows/testManifestCommitLock_updateToRecentCommits.txt
index 1f195c5666..44fe666bbd 100644
--- a/tests/jenkins/jenkinsjob-regression-files/release-workflows/testManifestCommitLock_updateToRecentCommits.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/release-workflows/testManifestCommitLock_updateToRecentCommits.txt
@@ -3,7 +3,7 @@
       release-manifest-commit-lock.library({identifier=jenkins@6.4.0, retriever=null})
       release-manifest-commit-lock.pipeline(groovy.lang.Closure)
          release-manifest-commit-lock.timeout({time=2, unit=HOURS})
-         release-manifest-commit-lock.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         release-manifest-commit-lock.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          release-manifest-commit-lock.stage(Parameters Check, groovy.lang.Closure)
             release-manifest-commit-lock.script(groovy.lang.Closure)
          release-manifest-commit-lock.echo(Skipping stage MATCH_BUILD_MANIFEST)
diff --git a/tests/jenkins/jenkinsjob-regression-files/release-workflows/testManifestCommitLock_updateToTags.txt b/tests/jenkins/jenkinsjob-regression-files/release-workflows/testManifestCommitLock_updateToTags.txt
index aa48eaa305..f8ba99a1ee 100644
--- a/tests/jenkins/jenkinsjob-regression-files/release-workflows/testManifestCommitLock_updateToTags.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/release-workflows/testManifestCommitLock_updateToTags.txt
@@ -3,7 +3,7 @@
       release-manifest-commit-lock.library({identifier=jenkins@6.4.0, retriever=null})
       release-manifest-commit-lock.pipeline(groovy.lang.Closure)
          release-manifest-commit-lock.timeout({time=2, unit=HOURS})
-         release-manifest-commit-lock.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         release-manifest-commit-lock.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          release-manifest-commit-lock.stage(Parameters Check, groovy.lang.Closure)
             release-manifest-commit-lock.script(groovy.lang.Closure)
          release-manifest-commit-lock.echo(Skipping stage MATCH_BUILD_MANIFEST)
diff --git a/tests/jenkins/jenkinsjob-regression-files/release-workflows/testMatchBuildManifest.txt b/tests/jenkins/jenkinsjob-regression-files/release-workflows/testMatchBuildManifest.txt
index 5e038ccfa2..525eec05c7 100644
--- a/tests/jenkins/jenkinsjob-regression-files/release-workflows/testMatchBuildManifest.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/release-workflows/testMatchBuildManifest.txt
@@ -3,7 +3,7 @@
       release-manifest-commit-lock.library({identifier=jenkins@6.4.0, retriever=null})
       release-manifest-commit-lock.pipeline(groovy.lang.Closure)
          release-manifest-commit-lock.timeout({time=2, unit=HOURS})
-         release-manifest-commit-lock.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         release-manifest-commit-lock.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          release-manifest-commit-lock.stage(Parameters Check, groovy.lang.Closure)
             release-manifest-commit-lock.script(groovy.lang.Closure)
          release-manifest-commit-lock.stage(MATCH_BUILD_MANIFEST, groovy.lang.Closure)
diff --git a/tests/jenkins/jenkinsjob-regression-files/release-workflows/testUpdateToRecentCommit.txt b/tests/jenkins/jenkinsjob-regression-files/release-workflows/testUpdateToRecentCommit.txt
index 1f195c5666..44fe666bbd 100644
--- a/tests/jenkins/jenkinsjob-regression-files/release-workflows/testUpdateToRecentCommit.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/release-workflows/testUpdateToRecentCommit.txt
@@ -3,7 +3,7 @@
       release-manifest-commit-lock.library({identifier=jenkins@6.4.0, retriever=null})
       release-manifest-commit-lock.pipeline(groovy.lang.Closure)
          release-manifest-commit-lock.timeout({time=2, unit=HOURS})
-         release-manifest-commit-lock.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         release-manifest-commit-lock.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          release-manifest-commit-lock.stage(Parameters Check, groovy.lang.Closure)
             release-manifest-commit-lock.script(groovy.lang.Closure)
          release-manifest-commit-lock.echo(Skipping stage MATCH_BUILD_MANIFEST)
diff --git a/tests/jenkins/jenkinsjob-regression-files/release-workflows/testUpdateToRecentCommit_excludeFTRepo.txt b/tests/jenkins/jenkinsjob-regression-files/release-workflows/testUpdateToRecentCommit_excludeFTRepo.txt
index 0bdb5d999a..74ee2a53e1 100644
--- a/tests/jenkins/jenkinsjob-regression-files/release-workflows/testUpdateToRecentCommit_excludeFTRepo.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/release-workflows/testUpdateToRecentCommit_excludeFTRepo.txt
@@ -3,7 +3,7 @@
       release-manifest-commit-lock.library({identifier=jenkins@6.4.0, retriever=null})
       release-manifest-commit-lock.pipeline(groovy.lang.Closure)
          release-manifest-commit-lock.timeout({time=2, unit=HOURS})
-         release-manifest-commit-lock.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         release-manifest-commit-lock.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          release-manifest-commit-lock.stage(Parameters Check, groovy.lang.Closure)
             release-manifest-commit-lock.script(groovy.lang.Closure)
          release-manifest-commit-lock.echo(Skipping stage MATCH_BUILD_MANIFEST)
diff --git a/tests/jenkins/jenkinsjob-regression-files/sign-standalone-artifacts/sign-standalone-artifacts.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/sign-standalone-artifacts/sign-standalone-artifacts.jenkinsfile.txt
index dd0acdede4..3bbfc7a82d 100644
--- a/tests/jenkins/jenkinsjob-regression-files/sign-standalone-artifacts/sign-standalone-artifacts.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/sign-standalone-artifacts/sign-standalone-artifacts.jenkinsfile.txt
@@ -3,7 +3,7 @@
       sign-standalone-artifacts.library({identifier=jenkins@1.0.4, retriever=null})
       sign-standalone-artifacts.pipeline(groovy.lang.Closure)
          sign-standalone-artifacts.credentials(jenkins-artifact-bucket-name)
-         sign-standalone-artifacts.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+         sign-standalone-artifacts.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
          sign-standalone-artifacts.stage(sign, groovy.lang.Closure)
             sign-standalone-artifacts.script(groovy.lang.Closure)
                sign-standalone-artifacts.sh(mkdir /tmp/workspace/artifacts)
diff --git a/tests/jenkins/jenkinsjob-regression-files/validate-artifacts/validate-artifacts.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/validate-artifacts/validate-artifacts.jenkinsfile.txt
index d4a9037117..1423f2c790 100644
--- a/tests/jenkins/jenkinsjob-regression-files/validate-artifacts/validate-artifacts.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/validate-artifacts/validate-artifacts.jenkinsfile.txt
@@ -5,12 +5,12 @@
          validate-artifacts.timeout({time=1, unit=HOURS})
          validate-artifacts.echo(Executing on agent [label:none])
          validate-artifacts.stage(verify-parameters, groovy.lang.Closure)
-            validate-artifacts.echo(Executing on agent [label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host])
+            validate-artifacts.echo(Executing on agent [label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host])
             validate-artifacts.script(groovy.lang.Closure)
          validate-artifacts.postCleanup()
             postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
          validate-artifacts.stage(Validate, groovy.lang.Closure)
-            validate-artifacts.echo(Executing on agent [label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host])
+            validate-artifacts.echo(Executing on agent [label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host])
             validate-artifacts.script(groovy.lang.Closure)
                validate-artifacts.stash({includes=**, name=validate-artifacts-123})
                validate-artifacts.echo(Validating Distribution: docker-x64)
@@ -30,7 +30,7 @@
                         validate-artifacts.postCleanup()
                            postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
                   validate-artifacts.timeout({time=30}, groovy.lang.Closure)
-                     validate-artifacts.node(Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
+                     validate-artifacts.node(Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, groovy.lang.Closure)
                         validate-artifacts.unstash(validate-artifacts-123)
                         validate-artifacts.validateArtifacts({version=2.3.0, distribution=tar, arch=x64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false})
                            validateArtifacts.fileExists(/tmp/workspace/validation.sh)
@@ -39,7 +39,7 @@
                         validate-artifacts.postCleanup()
                            postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
                   validate-artifacts.timeout({time=30}, groovy.lang.Closure)
-                     validate-artifacts.node(Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
+                     validate-artifacts.node(Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, groovy.lang.Closure)
                         validate-artifacts.unstash(validate-artifacts-123)
                         validate-artifacts.validateArtifacts({version=2.3.0, distribution=rpm, arch=x64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false})
                            validateArtifacts.fileExists(/tmp/workspace/validation.sh)
@@ -48,7 +48,7 @@
                         validate-artifacts.postCleanup()
                            postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
                   validate-artifacts.timeout({time=30}, groovy.lang.Closure)
-                     validate-artifacts.node(Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
+                     validate-artifacts.node(Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, groovy.lang.Closure)
                         validate-artifacts.unstash(validate-artifacts-123)
                         validate-artifacts.validateArtifacts({version=2.3.0, distribution=yum, arch=x64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false})
                            validateArtifacts.fileExists(/tmp/workspace/validation.sh)
@@ -57,7 +57,7 @@
                         validate-artifacts.postCleanup()
                            postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
                   validate-artifacts.timeout({time=30}, groovy.lang.Closure)
-                     validate-artifacts.node(Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
+                     validate-artifacts.node(Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, groovy.lang.Closure)
                         validate-artifacts.unstash(validate-artifacts-123)
                         validate-artifacts.validateArtifacts({version=2.3.0, distribution=deb, arch=x64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false})
                            validateArtifacts.fileExists(/tmp/workspace/validation.sh)
@@ -92,7 +92,7 @@
                         validate-artifacts.postCleanup()
                            postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
                   validate-artifacts.timeout({time=30}, groovy.lang.Closure)
-                     validate-artifacts.node(Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host, groovy.lang.Closure)
+                     validate-artifacts.node(Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host, groovy.lang.Closure)
                         validate-artifacts.unstash(validate-artifacts-123)
                         validate-artifacts.validateArtifacts({version=2.3.0, distribution=tar, arch=arm64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false})
                            validateArtifacts.fileExists(/tmp/workspace/validation.sh)
@@ -101,7 +101,7 @@
                         validate-artifacts.postCleanup()
                            postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
                   validate-artifacts.timeout({time=30}, groovy.lang.Closure)
-                     validate-artifacts.node(Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host, groovy.lang.Closure)
+                     validate-artifacts.node(Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host, groovy.lang.Closure)
                         validate-artifacts.unstash(validate-artifacts-123)
                         validate-artifacts.validateArtifacts({version=2.3.0, distribution=rpm, arch=arm64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false})
                            validateArtifacts.fileExists(/tmp/workspace/validation.sh)
@@ -110,7 +110,7 @@
                         validate-artifacts.postCleanup()
                            postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
                   validate-artifacts.timeout({time=30}, groovy.lang.Closure)
-                     validate-artifacts.node(Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host, groovy.lang.Closure)
+                     validate-artifacts.node(Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host, groovy.lang.Closure)
                         validate-artifacts.unstash(validate-artifacts-123)
                         validate-artifacts.validateArtifacts({version=2.3.0, distribution=yum, arch=arm64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false})
                            validateArtifacts.fileExists(/tmp/workspace/validation.sh)
@@ -119,7 +119,7 @@
                         validate-artifacts.postCleanup()
                            postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
                   validate-artifacts.timeout({time=30}, groovy.lang.Closure)
-                     validate-artifacts.node(Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host, groovy.lang.Closure)
+                     validate-artifacts.node(Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host, groovy.lang.Closure)
                         validate-artifacts.unstash(validate-artifacts-123)
                         validate-artifacts.validateArtifacts({version=2.3.0, distribution=deb, arch=arm64, platform=linux, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false})
                            validateArtifacts.fileExists(/tmp/workspace/validation.sh)
diff --git a/tests/jenkins/jenkinsjob-regression-files/vulnerability-scan/whitesource-scan.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/vulnerability-scan/whitesource-scan.jenkinsfile.txt
index d29a0a21d6..34ed23534b 100644
--- a/tests/jenkins/jenkinsjob-regression-files/vulnerability-scan/whitesource-scan.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/vulnerability-scan/whitesource-scan.jenkinsfile.txt
@@ -4,7 +4,7 @@
          whitesource-scan.echo(Executing on agent [label:none])
          whitesource-scan.cron(H 3 * * *)
          whitesource-scan.stage(Run the scan, groovy.lang.Closure)
-            whitesource-scan.echo(Executing on agent [docker:[alwaysPull:true, args:-e LANG=en_US.UTF-8, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
+            whitesource-scan.echo(Executing on agent [docker:[alwaysPull:true, args:-e LANG=en_US.UTF-8, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host, image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
             whitesource-scan.script(groovy.lang.Closure)
                whitesource-scan.string({credentialsId=jenkins-whitesource-scan-apikey, variable=wss_apikey})
                whitesource-scan.withCredentials([wss_apikey], groovy.lang.Closure)