diff --git a/jenkins/broadcom/buildimage-brcm-all-pr/Jenkinsfile b/jenkins/broadcom/buildimage-brcm-all-pr/Jenkinsfile
index f9a756f446..741b7acac6 100644
--- a/jenkins/broadcom/buildimage-brcm-all-pr/Jenkinsfile
+++ b/jenkins/broadcom/buildimage-brcm-all-pr/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-    agent { node { label 'jenkins-workers' } }
+    agent { node { label 'jenkins-build-workers' } }
 
     options {
         buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '60'))
diff --git a/jenkins/broadcom/buildimage-brcm-all-released-pr/Jenkinsfile b/jenkins/broadcom/buildimage-brcm-all-released-pr/Jenkinsfile
index d09706dde8..8e4cd06cca 100644
--- a/jenkins/broadcom/buildimage-brcm-all-released-pr/Jenkinsfile
+++ b/jenkins/broadcom/buildimage-brcm-all-released-pr/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-    agent { node { label 'jenkins-workers' } }
+    agent { node { label 'jenkins-build-workers' } }
 
     options {
         buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '60'))
diff --git a/jenkins/generic/buildimage-baseimage-pr/Jenkinsfile b/jenkins/generic/buildimage-baseimage-pr/Jenkinsfile
index 3f485559a4..168456bd06 100644
--- a/jenkins/generic/buildimage-baseimage-pr/Jenkinsfile
+++ b/jenkins/generic/buildimage-baseimage-pr/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-    agent { node { label 'jenkins-workers' } }
+    agent { node { label 'jenkins-build-workers' } }
 
     options {
         buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '60'))
diff --git a/jenkins/mellanox/buildimage-mlnx-all-pr/Jenkinsfile b/jenkins/mellanox/buildimage-mlnx-all-pr/Jenkinsfile
index cb12bc8d73..0d1ce8a217 100644
--- a/jenkins/mellanox/buildimage-mlnx-all-pr/Jenkinsfile
+++ b/jenkins/mellanox/buildimage-mlnx-all-pr/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-    agent { node { label 'jenkins-workers' } }
+    agent { node { label 'jenkins-build-workers' } }
 
     options {
         buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '60'))
diff --git a/jenkins/mellanox/buildimage-mlnx-all-released-pr/Jenkinsfile b/jenkins/mellanox/buildimage-mlnx-all-released-pr/Jenkinsfile
index 81eea06902..0564762508 100644
--- a/jenkins/mellanox/buildimage-mlnx-all-released-pr/Jenkinsfile
+++ b/jenkins/mellanox/buildimage-mlnx-all-released-pr/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-    agent { node { label 'jenkins-workers' } }
+    agent { node { label 'jenkins-build-workers' } }
 
     options {
         buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '60'))
diff --git a/jenkins/vs/buildimage-vs-image-201904/Jenkinsfile b/jenkins/vs/buildimage-vs-image-201904/Jenkinsfile
index c50ff3de67..0050eb26c8 100644
--- a/jenkins/vs/buildimage-vs-image-201904/Jenkinsfile
+++ b/jenkins/vs/buildimage-vs-image-201904/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-    agent { node { label 'jenkins-kvm-workers' } }
+    agent { node { label 'jenkins-build-workers' } }
 
     options {
         buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '30'))
diff --git a/jenkins/vs/buildimage-vs-image-201911/Jenkinsfile b/jenkins/vs/buildimage-vs-image-201911/Jenkinsfile
index 8c136332a8..8c98f76297 100644
--- a/jenkins/vs/buildimage-vs-image-201911/Jenkinsfile
+++ b/jenkins/vs/buildimage-vs-image-201911/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-    agent { node { label 'jenkins-kvm-workers' } }
+    agent { node { label 'jenkins-build-workers' } }
 
     options {
         buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '30'))
diff --git a/jenkins/vs/buildimage-vs-image-released-pr/Jenkinsfile b/jenkins/vs/buildimage-vs-image-released-pr/Jenkinsfile
index cde1204a9c..4dbdb19466 100644
--- a/jenkins/vs/buildimage-vs-image-released-pr/Jenkinsfile
+++ b/jenkins/vs/buildimage-vs-image-released-pr/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-    agent { node { label 'jenkins-kvm-workers' } }
+    agent { node { label 'jenkins-build-workers' } }
 
     options {
         buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '60'))