diff --git a/.azure-pipelines/build-docker-sonic-vs-template.yml b/.azure-pipelines/build-docker-sonic-vs-template.yml
index 1581ed5ded4d..0a69e3ecab7b 100644
--- a/.azure-pipelines/build-docker-sonic-vs-template.yml
+++ b/.azure-pipelines/build-docker-sonic-vs-template.yml
@@ -18,24 +18,32 @@ jobs:
   - task: DownloadPipelineArtifact@2
     inputs:
       artifact: wheels
-    displayName: "Download sonic swss artifact"
+    displayName: "Download sonic utilities artifact"
 
   - task: DownloadPipelineArtifact@2
     inputs:
       source: specific
       project: build
-      pipeline: 1
-      artifact: sonic-buildimage.vs
+      pipeline: 15
+      artifact: ${{ parameters.artifact_name }}
       runVersion: 'latestFromBranch'
       runBranch: 'refs/heads/master'
-    displayName: "Download sonic buildimage"
+    displayName: "Download docker-sonic-vs artifact"
 
   - script: |
       set -ex
 
       echo $(Build.DefinitionName).$(Build.BuildNumber)
 
-      docker load < ../target/docker-sonic-vs.gz
+      docker load < ../docker-sonic-vs.gz
+
+      docker images "docker-sonic-vs"
+
+      image_id=$(docker images "docker-sonic-vs:Azure.sonic-swss*" -q)
+
+      docker tag ${image_id} docker-sonic-vs:latest
+
+      docker images "docker-sonic-vs"
 
       mkdir -p .azure-pipelines/docker-sonic-vs/wheels
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 79d7c7326aef..28151cbbc258 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -43,14 +43,29 @@ stages:
         sudo dpkg -i libnl-route-3-200_*.deb
         sudo dpkg -i libnl-nf-3-200_*.deb
         sudo dpkg -i libhiredis0.14_*.deb
-        sudo dpkg -i libswsscommon_1.0.0_amd64.deb
-        sudo dpkg -i python3-swsscommon_1.0.0_amd64.deb
         sudo dpkg -i libyang_1.0.73_amd64.deb
         sudo dpkg -i libyang-cpp_1.0.73_amd64.deb
         sudo dpkg -i python3-yang_1.0.73_amd64.deb
       workingDirectory: $(Pipeline.Workspace)/target/debs/buster/
       displayName: 'Install Debian dependencies'
 
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        source: specific
+        project: build
+        pipeline: 9
+        artifact: sonic-swss-common
+        runVersion: 'latestFromBranch'
+        runBranch: 'refs/heads/master'
+      displayName: "Download sonic swss common deb packages"
+
+    - script: |
+        set -xe
+        sudo dpkg -i libswsscommon_1.0.0_amd64.deb
+        sudo dpkg -i python3-swsscommon_1.0.0_amd64.deb
+      workingDirectory: $(Pipeline.Workspace)/
+      displayName: 'Install swss-common dependencies'
+
     - script: |
         set -xe
         sudo pip3 install swsssdk-2.0.1-py3-none-any.whl