diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1a4fe5c..1d39e36 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -8,6 +8,10 @@ trigger:
     include:
       - '*'
 
+parameters:
+- name: dist
+  default: bullseye
+
 variables:
   DIFF_COVER_CHECK_THRESHOLD: 80
   DIFF_COVER_ENABLE: 'true'
@@ -17,7 +21,7 @@ pool:
   vmImage: 'ubuntu-20.04'
 
 container:
-  image: sonicdev-microsoft.azurecr.io:443/sonic-slave-buster:latest
+  image: sonicdev-microsoft.azurecr.io:443/sonic-slave-${{ parameters.dist }}:master
 
 steps:
 - task: DownloadPipelineArtifact@2
@@ -29,8 +33,8 @@ steps:
     runVersion: 'latestFromBranch'
     runBranch: 'refs/heads/master'
     patterns: |
-      target/debs/buster/*.deb
-      target/python-wheels/buster/*.whl
+      target/debs/${{ parameters.dist }}/*.deb
+      target/python-wheels/${{ parameters.dist }}/*.whl
   displayName: "Download artifacts from latest sonic-buildimage build"
 
 - script: |
@@ -44,14 +48,14 @@ steps:
     sudo dpkg -i libyang_1.*.deb
     sudo dpkg -i libswsscommon_1.0.0_amd64.deb
     sudo dpkg -i python3-swsscommon_1.0.0_amd64.deb
-  workingDirectory: $(Pipeline.Workspace)/target/debs/buster/
+  workingDirectory: $(Pipeline.Workspace)/target/debs/${{ parameters.dist }}/
   displayName: 'Install Debian dependencies'
 
 - script: |
     set -xe
     sudo pip3 install swsssdk-2.0.1-py3-none-any.whl
     sudo pip3 install sonic_py_common-1.0-py3-none-any.whl
-  workingDirectory: $(Pipeline.Workspace)/target/python-wheels/buster/
+  workingDirectory: $(Pipeline.Workspace)/target/python-wheels/${{ parameters.dist }}/
   displayName: 'Install Python dependencies'
 
 - script: |