diff --git a/jenkins/common/sonic-swss-common-build-pr/Jenkinsfile b/jenkins/common/sonic-swss-common-build-pr/Jenkinsfile
index 8f7b11f6eb..07e5f4c80a 100644
--- a/jenkins/common/sonic-swss-common-build-pr/Jenkinsfile
+++ b/jenkins/common/sonic-swss-common-build-pr/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-    agent { node { label 'sonic-slave' } }
+    agent { node { label 'sonic-slave-buster' } }
 
     stages {
         stage('Prepare') {
diff --git a/jenkins/common/sonic-swss-common-build/Jenkinsfile b/jenkins/common/sonic-swss-common-build/Jenkinsfile
index 7475b6f480..6b9dc43d85 100644
--- a/jenkins/common/sonic-swss-common-build/Jenkinsfile
+++ b/jenkins/common/sonic-swss-common-build/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-    agent { node { label 'sonic-slave' } }
+    agent { node { label 'sonic-slave-buster' } }
 
     options {
         buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '10'))
diff --git a/jenkins/vs/sonic-sairedis-build-pr/Jenkinsfile b/jenkins/vs/sonic-sairedis-build-pr/Jenkinsfile
index 36b1787cd6..484e5836bc 100644
--- a/jenkins/vs/sonic-sairedis-build-pr/Jenkinsfile
+++ b/jenkins/vs/sonic-sairedis-build-pr/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-    agent { node { label 'sonic-slave' } }
+    agent { node { label 'sonic-slave-buster' } }
 
     stages {
         stage('Prepare') {
diff --git a/jenkins/vs/sonic-sairedis-build/Jenkinsfile b/jenkins/vs/sonic-sairedis-build/Jenkinsfile
index 03747d6ca2..58eed79de7 100644
--- a/jenkins/vs/sonic-sairedis-build/Jenkinsfile
+++ b/jenkins/vs/sonic-sairedis-build/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-    agent { node { label 'sonic-slave' } }
+    agent { node { label 'sonic-slave-buster' } }
 
     environment {
         SONIC_TEAM_WEBHOOK = credentials('public-jenkins-builder')
diff --git a/scripts/common/sonic-swss-common-build/build.sh b/scripts/common/sonic-swss-common-build/build.sh
index ade5d25e10..60f515bc53 100755
--- a/scripts/common/sonic-swss-common-build/build.sh
+++ b/scripts/common/sonic-swss-common-build/build.sh
@@ -1,22 +1,23 @@
 #!/bin/bash -ex
 
-# Install SWIG
-sudo dpkg -i buildimage/target/debs/stretch/swig3.0_*.deb
+# Install swig
+sudo apt-get install -y swig
 
 # Install HIREDIS
-sudo dpkg -i buildimage/target/debs/stretch/libhiredis*.deb
+sudo apt-get install -y libhiredis0.14 libhiredis-dev
 
 # Install libnl3
-sudo dpkg -i buildimage/target/debs/stretch/libnl-3-200_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-3-dev_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-genl-3-200_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-genl-3-dev_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-route-3-200_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-route-3-dev_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-nf-3-200_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-nf-3-dev_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-cli-3-200_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-cli-3-dev_*.deb
+sudo apt-get install -y \
+         libnl-3-200 \
+         libnl-3-dev \
+         libnl-genl-3-200 \
+         libnl-genl-3-dev \
+         libnl-route-3-200 \
+         libnl-route-3-dev \
+         libnl-nf-3-200 \
+         libnl-nf-3-dev \
+         libnl-cli-3-200 \
+         libnl-cli-3-dev
 
 pushd sonic-swss-common
 
diff --git a/scripts/vs/sonic-sairedis-build/build.sh b/scripts/vs/sonic-sairedis-build/build.sh
index ac55793da5..3b65f58c87 100755
--- a/scripts/vs/sonic-sairedis-build/build.sh
+++ b/scripts/vs/sonic-sairedis-build/build.sh
@@ -1,19 +1,19 @@
 #!/bin/bash -ex
 
 # Install HIREDIS
-sudo dpkg -i buildimage/target/debs/stretch/libhiredis*.deb
+sudo dpkg -i buildimage/target/debs/buster/libhiredis*.deb
 
 # Install libnl3
-sudo dpkg -i buildimage/target/debs/stretch/libnl-3-200_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-3-dev_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-genl-3-200_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-genl-3-dev_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-route-3-200_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-route-3-dev_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-nf-3-200_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-nf-3-dev_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-cli-3-200_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-cli-3-dev_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-3-200_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-3-dev_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-genl-3-200_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-genl-3-dev_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-route-3-200_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-route-3-dev_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-nf-3-200_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-nf-3-dev_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-cli-3-200_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-cli-3-dev_*.deb
 
 # Install common library
 sudo dpkg -i common/libswsscommon_*.deb
diff --git a/scripts/vs/sonic-swss-build/build.sh b/scripts/vs/sonic-swss-build/build.sh
index ff1064e905..bcc0091636 100755
--- a/scripts/vs/sonic-swss-build/build.sh
+++ b/scripts/vs/sonic-swss-build/build.sh
@@ -3,8 +3,8 @@
 echo ${JOB_NAME##*/}.${BUILD_NUMBER}
 
 docker login -u $REGISTRY_USERNAME -p $REGISTRY_PASSWD sonicdev-microsoft.azurecr.io:443
-docker pull sonicdev-microsoft.azurecr.io:443/sonic-slave-stretch:latest
-docker run --rm=true --privileged -v $(pwd):/sonic -w /sonic -i sonicdev-microsoft.azurecr.io:443/sonic-slave-stretch:latest ./scripts/vs/sonic-swss-build/build_in_docker.sh
+docker pull sonicdev-microsoft.azurecr.io:443/sonic-slave-buster-johnar:latest
+docker run --rm=true --privileged -v $(pwd):/sonic -w /sonic -i sonicdev-microsoft.azurecr.io:443/sonic-slave-buster-johnar:latest ./scripts/vs/sonic-swss-build/build_in_docker.sh
 
 mkdir -p scripts/vs/sonic-swss-build/debs
 cp *.deb scripts/vs/sonic-swss-build/debs
diff --git a/scripts/vs/sonic-swss-build/build_in_docker.sh b/scripts/vs/sonic-swss-build/build_in_docker.sh
index f9d6465b28..d75b24194e 100755
--- a/scripts/vs/sonic-swss-build/build_in_docker.sh
+++ b/scripts/vs/sonic-swss-build/build_in_docker.sh
@@ -1,26 +1,26 @@
 #!/bin/bash -ex
 
 # Install HIREDIS
-sudo dpkg -i buildimage/target/debs/stretch/libhiredis*.deb
+sudo dpkg -i buildimage/target/debs/buster/libhiredis*.deb
 
 # Install libnl3
-sudo dpkg -i buildimage/target/debs/stretch/libnl-3-200_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-3-dev_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-genl-3-200_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-genl-3-dev_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-route-3-200_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-route-3-dev_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-nf-3-200_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-nf-3-dev_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-cli-3-200_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libnl-cli-3-dev_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-3-200_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-3-dev_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-genl-3-200_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-genl-3-dev_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-route-3-200_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-route-3-dev_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-nf-3-200_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-nf-3-dev_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-cli-3-200_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libnl-cli-3-dev_*.deb
 
 # Install libteam
 sudo apt-get install -y libdbus-1-3
-sudo dpkg -i buildimage/target/debs/stretch/libteam5_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libteamdctl0_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libteam-utils_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/libteam-dev_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libteam5_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libteamdctl0_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libteam-utils_*.deb
+sudo dpkg -i buildimage/target/debs/buster/libteam-dev_*.deb
 
 # Install SAIVS
 sudo dpkg -i sairedis/libsaivs_*.deb