diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
index 60c2b01ebed6..c123a94cff81 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster
@@ -1,6 +1,5 @@
 applibs==1.mlnx.4.4.2522
 applibs-dev==1.mlnx.4.4.2522
-bfnplatform==1.0.0
 gir1.2-atk-1.0==2.30.0-2
 gir1.2-atspi-2.0==2.30.0-7
 gir1.2-freedesktop==1.58.3-2
@@ -8,7 +7,6 @@ gir1.2-gdkpixbuf-2.0==2.38.1+dfsg-1
 gir1.2-gtk-3.0==3.24.5-1
 gir1.2-harfbuzz-0.0==2.3.1-1
 gir1.2-pango-1.0==1.42.4-8~deb10u1
-iproute2==1.mlnx.4.4.2522
 iproute2-dev==1.mlnx.4.4.2522
 isc-dhcp-relay==4.4.1-2
 kernel-mft-dkms==4.16.0-105
@@ -91,6 +89,7 @@ python3-yang==1.0.73
 sonic-mgmt-common==1.0.0
 sonic-mgmt-common-codegen==1.0.0
 sonic-mgmt-framework==1.0-01
+swss==1.0.0
 sx-acl-helper==1.mlnx.4.4.2522
 sx-acl-helper-dev==1.mlnx.4.4.2522
 sx-complib==1.mlnx.4.4.2522
@@ -104,6 +103,7 @@ sx-scew-dev==1.mlnx.4.4.2522
 sxd-libs==1.mlnx.4.4.2522
 sxd-libs-dev==1.mlnx.4.4.2522
 syncd==1.0.0
+syncd-vs==1.0.0
 thrift-compiler==0.11.0-4
 wayland-protocols==1.17-1
 wjh-libs==1.mlnx.4.4.2522
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py2 b/files/build/versions/build/build-sonic-slave-buster/versions-py2
index 3c83200bef61..f0ec8d2011c5 100644
--- a/files/build/versions/build/build-sonic-slave-buster/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-buster/versions-py2
@@ -8,6 +8,7 @@ jsonschema==2.6.0
 lxml==4.6.3
 natsort==6.2.1
 netaddr==0.8.0
+pyang==2.4.0
 pyangbind==0.6.0
 redis==3.5.3
 SaiRedis==1.0
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch b/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
index df28b25a1ff2..59f60131f98c 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-deb-stretch
@@ -12,12 +12,18 @@ libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-200==3.5.0-1
 libnl-route-3-dev==3.5.0-1
+libsaimetadata==1.0.0
+libsaimetadata-dev==1.0.0
 libsainps==1.5.0
 libsairedis==1.0.0
 libsaithrift-dev==0.9.4
+libsaivs==1.0.0
+libsaivs-dev==1.0.0
 libswsscommon==1.0.0
 libswsscommon-dev==1.0.0
 libthrift-0.11.0==0.11.0-4
 libthrift-dev==0.11.0-4
 python-swsscommon==1.0.0
+python-thrift==0.11.0-4
+syncd==1.0.0
 thrift-compiler==0.11.0-4
\ No newline at end of file
diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-py2 b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
index e4755ea87a52..4211881987c2 100644
--- a/files/build/versions/build/build-sonic-slave-stretch/versions-py2
+++ b/files/build/versions/build/build-sonic-slave-stretch/versions-py2
@@ -1,3 +1,4 @@
 natsort==6.2.1
 redis==3.5.3
-SaiRedis==1.0
\ No newline at end of file
+SaiRedis==1.0
+thrift==0.11.0
\ No newline at end of file
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index ae829825ccdd..db39cba3353f 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -1,10 +1,18 @@
 apt==1.8.2.3
 apt-utils==1.8.2.3
 arping==2.19-6
+binutils==2.31.1-16
+binutils-common==2.31.1-16
+binutils-x86-64-linux-gnu==2.31.1-16
 bridge-utils==1.6-2
+build-essential==12.6
 bzip2==1.0.6-9.2~deb10u1
 ca-certificates==20200601~deb10u2
+cmake==3.13.4-1
+cmake-data==3.13.4-1
 conntrack==1:1.4.5-2
+cpp==4:8.3.0-1
+cpp-8==8.3.0-6
 cron==3.0pl1-134+deb10u1
 curl==7.64.0-4+deb10u2
 dmidecode==3.2-1
@@ -15,42 +23,66 @@ fontconfig-config==2.13.1-2
 fonts-dejavu-core==2.37-1
 freeipmi-common==1.6.3-1.1
 frr==7.5.1-sonic-0
+frr-dbgsym==7.5.1-sonic-0
 frr-snmp==7.5.1-sonic-0
+frr-snmp-dbgsym==7.5.1-sonic-0
+g++==4:8.3.0-1
+g++-8==8.3.0-6
+gcc==4:8.3.0-1
+gcc-8==8.3.0-6
+gdb==8.2.1-2+b3
+gdbserver==8.2.1-2+b3
 hsflowd==2.0.32-1
 i2c-tools==4.1-1
 ifupdown==0.8.35
 ipmitool==1.8.18-6
 iptables==1.8.2-4
 isc-dhcp-relay==4.4.1-2
+isc-dhcp-relay-dbgsym==4.4.1-2
 jq==1.5+dfsg-2+b1
 kmod==26-1
 less==487-0.1+b1
 libapt-inst2.0==1.8.2.3
+libarchive13==3.3.3-4+deb10u1
+libasan5==8.3.0-6
 libatomic1==8.3.0-6
+libbabeltrace1==1.5.6-2+deb10u1
+libbinutils==2.31.1-16
+libboost-atomic1.71.0==1.71.0-6~bpo10+1
 libbsd0==0.9.1-2+deb10u1
 libc-ares2==1.14.0-1
 libc-dev-bin==2.28-10
 libc-l10n==2.28-10
 libc6-dev==2.28-10
 libcairo2==1.16.0-4+deb10u1
+libcc1-0==8.3.0-6
 libcurl4==7.64.0-4+deb10u2
 libdaemon0==0.14-7
 libdatrie1==0.2.12-2
 libdbi1==0.9.0-5
 libdbus-1-3==1.12.20-0+deb10u1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u3
+libdouble-conversion1==3.1.0-3
+libdpkg-perl==1.19.7
+libdw1==0.176-1.1
+libedit2==3.1-20181209-1
 libestr0==0.1.10-2.1
 libevent-2.1-6==2.1.8-stable-4
 libexpat1==2.2.6-2+deb10u1
+libexpat1-dev==2.2.6-2+deb10u1
 libexplain51==1.4.D001-8
 libfastjson4==0.99.8-2
+libffi-dev==3.2.1-9
 libfontconfig1==2.13.1-2
 libfreeipmi17==1.6.3-1.1
 libfreetype6==2.9.1-3+deb10u2
 libfribidi0==1.0.5-3.1+deb10u1
+libgcc-8-dev==8.3.0-6
 libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
 libglib2.0-0==2.58.3-2+deb10u2
+libgomp1==8.3.0-6
+libgpm2==1.20.7-5
 libgraphite2-3==1.3.13-7
 libgssapi-krb5-2==1.17-3+deb10u1
 libharfbuzz0b==2.3.1-1
@@ -59,14 +91,18 @@ libi2c0==4.1-1
 libicu63==63.1-6+deb10u1
 libip4tc0==1.8.2-4
 libip6tc0==1.8.2-4
+libipt2==2.0-2
 libiptc0==1.8.2-4
 libirs-export161==1:9.11.5.P4+dfsg-5.1+deb10u3
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u3
 libisccfg-export163==1:9.11.5.P4+dfsg-5.1+deb10u3
+libisl19==0.20-2
+libitm1==8.3.0-6
 libjansson4==2.12-1
 libjemalloc2==5.1.0-3
 libjq1==1.5+dfsg-2+b1
 libjson-c3==0.12.1+ds-2+deb10u1
+libjsoncpp1==1.7.4-3
 libk5crypto3==1.17-3+deb10u1
 libkeyutils1==1.6-6
 libkmod2==26-1
@@ -75,9 +111,13 @@ libkrb5support0==1.17-3+deb10u1
 libldap-2.4-2==2.4.47+dfsg-3+deb10u6
 libldap-common==2.4.47+dfsg-3+deb10u6
 liblognorm5==2.0.5-1
+liblsan0==8.3.0-6
 liblua5.1-0==5.1.5-8.1+b2
 libmariadb3==1:10.3.27-0+deb10u1
+libmpc3==1.1.0-1
 libmpdec2==2.4.2-2
+libmpfr6==4.0.2-1
+libmpx2==8.3.0-6
 libncurses6==6.1+20181013-2+deb10u2
 libnet1==1.1.6+dfsg-3.1
 libnetfilter-conntrack3==1.0.7-1
@@ -96,6 +136,8 @@ libpangocairo-1.0-0==1.42.4-8~deb10u1
 libpangoft2-1.0-0==1.42.4-8~deb10u1
 libpcap0.8==1.8.1-6
 libpci3==1:3.5.2-1
+libpcre2-16-0==10.32-5
+libpcre2-8-0==10.32-5
 libperl5.28==5.28.1-6+deb10u1
 libpgm-5.2-0==5.2.122~dfsg-3
 libpixman-1-0==0.36.0-1
@@ -106,37 +148,58 @@ libprotobuf-dev==3.6.1.3-2
 libprotobuf-lite17==3.6.1.3-2
 libprotobuf17==3.6.1.3-2
 libpsl5==0.20.2-2
+libpython-dev==2.7.16-1
 libpython-stdlib==2.7.16-1
+libpython2-dev==2.7.16-1
 libpython2-stdlib==2.7.16-1
 libpython2.7==2.7.16-2+deb10u1
+libpython2.7-dev==2.7.16-2+deb10u1
 libpython2.7-minimal==2.7.16-2+deb10u1
 libpython2.7-stdlib==2.7.16-2+deb10u1
 libpython3-stdlib==3.7.3-1
 libpython3.7==3.7.3-2+deb10u3
 libpython3.7-minimal==3.7.3-2+deb10u3
 libpython3.7-stdlib==3.7.3-2+deb10u3
+libqt5core5a==5.11.3+dfsg1-1+deb10u4
+libqt5dbus5==5.11.3+dfsg1-1+deb10u4
+libqt5network5==5.11.3+dfsg1-1+deb10u4
+libquadmath0==8.3.0-6
 libreadline7==7.0-5
+librhash0==1.3.8-1
 librrd-dev==1.7.1-2
 librrd8==1.7.1-2
 librtmp1==2.4+20151223.gitfa8646d.1-2
 libsaibcm==4.3.3.5
 libsaimetadata==1.0.0
+libsaimetadata-dbg==1.0.0
 libsairedis==1.0.0
+libsairedis-dbg==1.0.0
 libsasl2-2==2.1.27+dfsg-1+deb10u1
 libsasl2-modules-db==2.1.27+dfsg-1+deb10u1
 libsensors-config==1:3.5.0-3
 libsensors5==1:3.5.0-3
+libsensors5-dbgsym==1:3.5.0-3
+libsnmp30-dbg==5.7.3+dfsg-5
 libsodium23==1.0.17-1
 libsqlite3-0==3.27.2-3+deb10u1
 libssh2-1==1.8.0-2.1
+libssl-dev==1.1.1d-0+deb10u6
 libssl1.1==1.1.1d-0+deb10u6
+libstdc++-8-dev==8.3.0-6
 libswsscommon==1.0.0
+libswsscommon-dbg==1.0.0
 libteam-utils==1.30-1
+libteam-utils-dbgsym==1.30-1
 libteam5==1.30-1
 libteamdctl0==1.30-1
+libteamdctl0-dbgsym==1.30-1
 libthai-data==0.1.28-2
 libthai0==0.1.28-2
+libthrift-0.11.0==0.11.0-4
+libtsan0==8.3.0-6
+libubsan1==8.3.0-6
 libunwind8==1.2.1-10~deb10u1
+libuv1==1.24.1-1
 libwrap0==7.6.q-28
 libx11-6==2:1.6.7-1+deb10u1
 libx11-data==2:1.6.7-1+deb10u1
@@ -152,34 +215,49 @@ libyaml-0-2==0.2.1-1
 libyaml-dev==0.2.1-1
 libyang==1.0.73
 libyang1==1.0.184-2
+libyang1-dbgsym==1.0.184-2
 libzmq5==4.3.1-4+deb10u2
 linux-libc-dev==4.19.181-1
 lldpd==1.0.4-1
+lldpd-dbgsym==1.0.4-1
 lm-sensors==1:3.5.0-3
+lm-sensors-dbgsym==1:3.5.0-3
 locales==2.28-10
 logrotate==3.14.0-4
 lsb-base==10.2019051400
 lsof==4.91+dfsg-1
 lua-bitop==1.0.2-5
 lua-cjson==2.1.0+dfsg-2.1
+make==4.2.1-1.2
 mariadb-common==1:10.3.27-0+deb10u1
 mime-support==3.62
 mysql-common==5.8+1.0.5
 ndisc6==1.0.4-1
 ndppd==0.2.5-4+deb10u1
 net-tools==1.60+git20180626.aebd88e-1
+openssh-client==1:7.9p1-10+deb10u2
 openssl==1.1.1d-0+deb10u6
+patch==2.7.6-3+deb10u1
 perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
 procps==2:3.3.15-2
 psample==1.1-1
 python==2.7.16-1
+python-dev==2.7.16-1
 python-minimal==2.7.16-1
+python-pip==18.1-5
+python-pip-whl==18.1-5
+python-pkg-resources==40.8.0-1
+python-ptf==0.9-1
+python-scapy==2.4.0-2
+python-setuptools==40.8.0-1
 python-smbus==4.1-1
 python-swsscommon==1.0.0
 python2==2.7.16-1
+python2-dev==2.7.16-1
 python2-minimal==2.7.16-1
 python2.7==2.7.16-2+deb10u1
+python2.7-dev==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
 python3==3.7.3-1
 python3-distutils==3.7.3-1
@@ -197,22 +275,34 @@ rrdtool==1.7.1-2
 rsyslog==8.1901.0-1
 sensible-utils==0.0.12
 sensord==1:3.5.0-3
+sensord-dbgsym==1:3.5.0-3
 sflowtool==5.04
 smartmontools==6.6-1
 snmp==5.7.3+dfsg-5
+snmp-dbgsym==5.7.3+dfsg-5
 snmpd==5.7.3+dfsg-5
+snmpd-dbgsym==5.7.3+dfsg-5
 socat==1.7.3.1-2+deb9u1
 sonic-dhcpmon==1.0.0-0
 sonic-mgmt-common==1.0.0
 sonic-mgmt-framework==1.0-01
+sonic-mgmt-framework-dbg==1.0-01
 sonic-telemetry==0.1
+sshpass==1.06-1
+strace==4.26-0.2
 swss==1.0.0
+swss-dbg==1.0.0
 syncd==1.0.0
+syncd-dbg==1.0.0
+syncd-rpc==1.0.0
 tcpdump==4.9.3-1~deb10u2
 ucf==3.0038+nmu1
 udev==241-7~deb10u7
+vim==2:8.1.0875-5
 vim-common==2:8.1.0875-5
+vim-runtime==2:8.1.0875-5
 vim-tiny==2:8.1.0875-5
+wget==1.20.1-1.1
 xxd==2:8.1.0875-5
 xz-utils==5.2.4-1
 zlib1g-dev==1:1.2.11.dfsg-1
\ No newline at end of file
diff --git a/files/build/versions/default/versions-py2 b/files/build/versions/default/versions-py2
index eedc8044a893..59ca48893410 100644
--- a/files/build/versions/default/versions-py2
+++ b/files/build/versions/default/versions-py2
@@ -1,4 +1,5 @@
 bitarray==1.5.3
+cffi==1.7.0
 contextlib2==0.6.0.post1
 enum34==1.1.10
 functools32==3.2.3.post2
@@ -11,13 +12,17 @@ lxml==4.6.3
 MarkupSafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
+nnpy==1.4.2
 pathlib2==2.3.5
+ptf==0.9.1
 pyang==2.4.0
 pyangbind==0.6.0
+pycparser==2.20
 PyYAML==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
 scandir==1.10.0
+scapy==2.4.0
 singledispatch==3.6.1
 six==1.15.0
 thrift==0.13.0
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 11446887ba19..cc8d5bf31cd9 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -12,11 +12,10 @@ http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40
 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b
 http://www.mellanox.com/downloads/MFT/mft-4.16.0-105-x86_64-deb.tgz==2c4a40535af10a278ba7e33022e407dc
+https://bootstrap.pypa.io/pip/2.7/get-pip.py==60e8267eb1b7bc71dc4843eb7bd294d3
 https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:e75c9bf286fbb31347379cb478df2a556ab185b1==9df7a96a4a4fb6e484027d80b3ee821c
 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15
 https://github.com/aristanetworks/sonic-firmware/raw/6d0d1661d92a342acedb6839dba970ae5778b478/phy/phy-credo_1.0_amd64.deb==dd74acbb7bf979b01c1a89e2a628aaf3
-https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20210324_deb10.deb==b1f3087f05b82504130c5a7d428b9ef5
-https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20210324_deb10.deb==40a5468c7b7a003df6f4e6c2f9f98817
 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/libsai_1.6.3-1_amd64.deb==e7a41e5cf06b44ae3ed615d553de40d3
 https://github.com/CumulusNetworks/ifupdown2/archive/1.2.8-1.tar.gz==12f45e90d23178e96cf70f68dc9455e6
 https://github.com/Innovium/SONiC/raw/master/debian/master/ipd.deb==a0f512aba05180b15c2f6b5809b9d5c1
diff --git a/files/build/versions/dockers/docker-database/versions-deb-buster b/files/build/versions/dockers/docker-database/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-database/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
deleted file mode 100644
index 090a9af05b59..000000000000
--- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
+++ /dev/null
@@ -1,13 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-isc-dhcp-relay-dbgsym==4.4.1-2
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
index 861bf8125805..8ce0c99a8c4d 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -1,19 +1,2 @@
-frr-dbgsym==7.5.1-sonic-0
-frr-snmp-dbgsym==7.5.1-sonic-0
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5+deb10u2
-libsnmp30==5.7.3+dfsg-5+deb10u2
-libswsscommon-dbg==1.0.0
-libyang1-dbgsym==1.0.184-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5+deb10u2
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index dced6f540d81..3424f739f586 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -1,16 +1,2 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
-libswsscommon-dbg==1.0.0
-lldpd-dbgsym==1.0.4-1
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster
deleted file mode 100644
index 159c8c90df8b..000000000000
--- a/files/build/versions/dockers/docker-nat/versions-deb-buster
+++ /dev/null
@@ -1,14 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libswsscommon-dbg==1.0.0
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
deleted file mode 100644
index 0969e5edd95e..000000000000
--- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster
+++ /dev/null
@@ -1,15 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsairedis-dbg==1.0.0
-libswsscommon-dbg==1.0.0
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
index cc246ec7ec9d..1532ae12707d 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,26 +1,10 @@
 applibs==1.mlnx.4.4.2522
 applibs-dev==1.mlnx.4.4.2522
 ethtool==1:5.9-1
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libsensors5-dbgsym==1:3.5.0-3
-libswsscommon-dbg==1.0.0
-lm-sensors-dbgsym==1:3.5.0-3
-openssh-client==1:7.9p1-10+deb10u2
 python-sdk-api==1.mlnx.4.4.2522
-sensord-dbgsym==1:3.5.0-3
-sshpass==1.06-1
-strace==4.26-0.2
 sx-complib==1.mlnx.4.4.2522
 sx-complib-dev==1.mlnx.4.4.2522
 sx-gen-utils==1.mlnx.4.4.2522
 sx-gen-utils-dev==1.mlnx.4.4.2522
 sxd-libs==1.mlnx.4.4.2522
-sxd-libs-dev==1.mlnx.4.4.2522
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+sxd-libs-dev==1.mlnx.4.4.2522
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-stretch b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
new file mode 100644
index 000000000000..56b2e60fdf47
--- /dev/null
+++ b/files/build/versions/dockers/docker-ptf/versions-deb-stretch
@@ -0,0 +1,240 @@
+arping==2.14-1+b1
+autoconf==2.69-10
+automake==1:1.15-6
+autotools-dev==20161112.1
+binutils==2.28-5
+bridge-utils==1.5-13+deb9u1
+build-essential==12.3
+bzip2==1.0.6-8.1
+ca-certificates==20200601~deb9u2
+cgmanager==0.41-2
+cmake==3.7.2-1
+cmake-data==3.7.2-1
+cpp==4:6.3.0-4
+cpp-6==6.3.0-18+deb9u1
+cron==3.0pl1-128+deb9u1
+curl==7.52.1-5+deb9u13
+dbus==1.10.32-0+deb9u1
+dirmngr==2.1.18-8~deb9u4
+dmsetup==2:1.02.137-2
+dpkg-dev==1.18.25
+ethtool==1:4.8-1+b1
+exim4==4.89-2+deb9u7
+exim4-base==4.89-2+deb9u7
+exim4-config==4.89-2+deb9u7
+exim4-daemon-light==4.89-2+deb9u7
+fakeroot==1.21-3.1
+file==1:5.30-1+deb9u3
+g++==4:6.3.0-4
+g++-6==6.3.0-18+deb9u1
+gcc==4:6.3.0-4
+gcc-6==6.3.0-18+deb9u1
+git==1:2.11.0-3+deb9u7
+git-man==1:2.11.0-3+deb9u7
+gnupg==2.1.18-8~deb9u4
+gnupg-agent==2.1.18-8~deb9u4
+gnupg-l10n==2.1.18-8~deb9u4
+guile-2.0-libs==2.0.13+1-4
+hping3==3.a2.ds2-7
+krb5-locales==1.15-1+deb9u2
+less==481-2.1
+libalgorithm-diff-perl==1.19.03-1
+libalgorithm-diff-xs-perl==0.04-4+b2
+libalgorithm-merge-perl==0.08-3
+libapparmor1==2.11.0-3+deb9u2
+libarchive13==3.2.2-2+deb9u2
+libasan3==6.3.0-18+deb9u1
+libassuan0==2.4.3-2
+libatomic1==6.3.0-18+deb9u1
+libboost-atomic1.62.0==1.62.0+dfsg-4
+libbsd0==0.8.3-1+deb9u1
+libc-dev-bin==2.24-11+deb9u4
+libc6-dev==2.24-11+deb9u4
+libcc1-0==6.3.0-18+deb9u1
+libcgmanager0==0.41-2
+libcilkrts5==6.3.0-18+deb9u1
+libcryptsetup4==2:1.7.3-4
+libcurl3==7.52.1-5+deb9u13
+libcurl3-gnutls==7.52.1-5+deb9u13
+libdbus-1-3==1.10.32-0+deb9u1
+libdevmapper1.02.1==2:1.02.137-2
+libdouble-conversion1==2.0.1-4
+libdpkg-perl==1.18.25
+libedit2==3.1-20160903-3
+liberror-perl==0.17024-1
+libestr0==0.1.10-2
+libevent-2.0-5==2.0.21-stable-3
+libexpat1==2.2.0-2+deb9u3
+libexpat1-dev==2.2.0-2+deb9u3
+libfakeroot==1.21-3.1
+libfastjson4==0.99.4-1
+libffi-dev==3.2.1-6
+libffi6==3.2.1-6
+libfile-fcntllock-perl==0.22-3+b2
+libfribidi0==0.19.7-1+deb9u1
+libgc1c2==1:7.4.2-8
+libgcc-6-dev==6.3.0-18+deb9u1
+libgdbm3==1.8.3-14
+libglib2.0-0==2.50.3-2+deb9u2
+libglib2.0-data==2.50.3-2+deb9u2
+libgmp10==2:6.1.2+dfsg-1
+libgnutls30==3.5.8-5+deb9u5
+libgomp1==6.3.0-18+deb9u1
+libgpm2==1.20.4-6.2+b1
+libgsasl7==1.8.0-8+b2
+libgssapi-krb5-2==1.15-1+deb9u2
+libhogweed4==3.3-1+b2
+libicu57==57.1-6+deb9u4
+libidn2-0==0.16-1+deb9u1
+libip4tc0==1.6.0+snapshot20161117-6
+libisl15==0.18-1
+libitm1==6.3.0-18+deb9u1
+libjsoncpp1==1.7.4-3
+libk5crypto3==1.15-1+deb9u2
+libkeyutils1==1.5.9-9
+libkmod2==23-2
+libkrb5-3==1.15-1+deb9u2
+libkrb5support0==1.15-1+deb9u2
+libksba8==1.3.5-2
+libkyotocabinet16v5==1.2.76-4.2+b1
+libldap-2.4-2==2.4.44+dfsg-5+deb9u8
+libldap-common==2.4.44+dfsg-5+deb9u8
+liblocale-gettext-perl==1.07-3+b1
+liblogging-stdlog0==1.0.5-2+b2
+liblognorm5==2.0.1-1.1+b1
+liblsan0==6.3.0-18+deb9u1
+libltdl7==2.4.6-2
+liblzo2-2==2.08-1.2+b2
+libmagic-mgc==1:5.30-1+deb9u3
+libmagic1==1:5.30-1+deb9u3
+libmailutils5==1:3.1.1-1
+libmariadbclient18==10.1.48-0+deb9u2
+libmpc3==1.0.3-1+b2
+libmpfr4==3.1.5-1
+libmpx2==6.3.0-18+deb9u1
+libncurses5==6.0+20161126-1+deb9u2
+libnet1==1.1.6+dfsg-3
+libnghttp2-14==1.18.1-1+deb9u1
+libnih-dbus1==1.0.3-8
+libnih1==1.0.3-8
+libnpth0==1.3-1
+libntlm0==1.4-8
+libopts25==1:5.18.12-3
+libp11-kit0==0.23.3-2+deb9u1
+libpam-systemd==232-25+deb9u12
+libpcap0.8==1.8.1-3
+libpcre16-3==2:8.39-3
+libperl5.24==5.24.1-3+deb9u7
+libpopt0==1.16-10+b2
+libprocps6==2:3.3.12-3+deb9u1
+libproxy1v5==0.4.14-2+deb9u2
+libpsl5==0.17.0-3
+libpython-dev==2.7.13-2
+libpython-stdlib==2.7.13-2
+libpython2.7==2.7.13-2+deb9u5
+libpython2.7-dev==2.7.13-2+deb9u5
+libpython2.7-minimal==2.7.13-2+deb9u5
+libpython2.7-stdlib==2.7.13-2+deb9u5
+libqt5core5a==5.7.1+dfsg-3+deb9u3
+libqt5dbus5==5.7.1+dfsg-3+deb9u3
+libqt5network5==5.7.1+dfsg-3+deb9u3
+libquadmath0==6.3.0-18+deb9u1
+libreadline7==7.0-3
+librtmp1==2.4+20151223.gitfa8646d.1-1+b1
+libsasl2-2==2.1.27~101-g0780600+dfsg-3+deb9u1
+libsasl2-modules==2.1.27~101-g0780600+dfsg-3+deb9u1
+libsasl2-modules-db==2.1.27~101-g0780600+dfsg-3+deb9u1
+libseccomp2==2.3.1-2.1+deb9u1
+libsigsegv2==2.10-5
+libsqlite3-0==3.16.2-5+deb9u3
+libssh2-1==1.7.0-1+deb9u1
+libssl-dev==1.1.0l-1~deb9u3
+libssl-doc==1.1.0l-1~deb9u3
+libssl1.0.2==1.0.2u-1~deb9u4
+libssl1.1==1.1.0l-1~deb9u3
+libstdc++-6-dev==6.3.0-18+deb9u1
+libtacacs+1==4.0.4.27a-3
+libtasn1-6==4.10-1.1+deb9u1
+libtcl8.6==8.6.6+dfsg-1+b1
+libthrift-0.11.0==0.11.0-4
+libtsan0==6.3.0-18+deb9u1
+libubsan0==6.3.0-18+deb9u1
+libunistring0==0.9.6+really0.9.3-0.1
+libutempter0==1.1.6-3
+libuv1==1.9.1-3
+libwrap0==7.6.q-26
+libx11-6==2:1.6.4-3+deb9u3
+libx11-data==2:1.6.4-3+deb9u3
+libxau6==1:1.0.8-1
+libxcb1==1.12-1
+libxdmcp6==1:1.1.2-3
+libxext6==2:1.3.3-1+b2
+libxml2==2.9.4+dfsg1-2.2+deb9u3
+libxmuu1==2:1.1.2-2
+linux-libc-dev==4.9.258-1
+logrotate==3.11.0-0.1
+lsof==4.89+dfsg-0.1
+m4==1.4.18-1
+mailutils==1:3.1.1-1
+mailutils-common==1:3.1.1-1
+make==4.1-9.1
+manpages==4.10-2
+manpages-dev==4.10-2
+mime-support==3.60
+mysql-common==5.8+1.0.2
+ncurses-term==6.0+20161126-1+deb9u2
+net-tools==1.60+git20161116.90da8a0-1
+netbase==5.4
+ntp==1:4.2.8p10+dfsg-3+deb9u2
+ntpdate==1:4.2.8p10+dfsg-3+deb9u2
+ntpstat==0.0.0.1-1+b1
+openssh-client==1:7.4p1-10+deb9u7
+openssh-server==1:7.4p1-10+deb9u7
+openssh-sftp-server==1:7.4p1-10+deb9u7
+openssl==1.1.0l-1~deb9u3
+patch==2.7.5-1+deb9u2
+perl==5.24.1-3+deb9u7
+perl-modules-5.24==5.24.1-3+deb9u7
+pinentry-curses==1.0.0-2
+pkg-config==0.29-4+b1
+procps==2:3.3.12-3+deb9u1
+psmisc==22.21-2.1+b2
+publicsuffix==20190415.1030-0+deb9u1
+python==2.7.13-2
+python-dev==2.7.13-2
+python-libpcap==0.6.4-1
+python-minimal==2.7.13-2
+python-ptf==0.9-1
+python-saithrift==0.9.4
+python-scapy==2.3.3-1
+python-six==1.10.0-3
+python-thrift==0.11.0-4
+python2.7==2.7.13-2+deb9u5
+python2.7-dev==2.7.13-2+deb9u5
+python2.7-minimal==2.7.13-2+deb9u5
+qttranslations5-l10n==5.7.1~20161021-1
+readline-common==7.0-3
+rename==0.20-4
+rsync==3.1.2-1+deb9u2
+rsyslog==8.24.0-1
+sgml-base==1.29
+shared-mime-info==1.8-1+deb9u1
+systemd==232-25+deb9u12
+systemd-shim==10-3
+tacacs+==4.0.4.27a-3
+tcpd==7.6.q-26
+tcpdump==4.9.3-1~deb9u2
+telnet==0.17-41
+tmux==2.3-4
+traceroute==1:2.1.0-2
+ucf==3.0036
+unzip==6.0-21+deb9u2
+vim==2:8.0.0197-4+deb9u3
+vim-common==2:8.0.0197-4+deb9u3
+vim-runtime==2:8.0.0197-4+deb9u3
+wget==1.18-5+deb9u3
+xauth==1:1.0.9-1+b2
+xdg-user-dirs==0.15-2+b1
+xml-core==0.17
+xxd==2:8.0.0197-4+deb9u3
+xz-utils==5.2.2-1.2+b1
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
new file mode 100644
index 000000000000..e10f946d766d
--- /dev/null
+++ b/files/build/versions/dockers/docker-ptf/versions-py2
@@ -0,0 +1,50 @@
+backports.functools-lru-cache==1.6.4
+backports.shutil-get-terminal-size==1.0.0
+bcrypt==3.1.7
+cffi==1.14.5
+click==7.1.2
+cryptography==3.3.2
+decorator==4.4.2
+dpkt==1.9.5
+enum34==1.1.6
+exabgp==3.4.17
+Flask==1.0
+Flask-HTTPAuth==2.5.0
+futures==3.2.0
+grpcio==1.18.0
+grpcio-tools==1.15.0
+ipython==5.4.1
+ipython-genutils==0.2.0
+itsdangerous==1.1.0
+oslo.config==2.1.0
+paramiko==2.7.2
+pbr==2.0.0
+pexpect==4.8.0
+pickleshare==0.7.5
+plumbum==1.7.0
+prompt-toolkit==1.0.18
+protobuf==3.6.1
+ptyprocess==0.7.0
+pyaml==20.4.0
+pybrctl==0.1.3
+Pygments==2.5.2
+pylibpcap==0.6.4
+PyNaCl==1.4.0
+Pyro4==4.80
+pysubnettree==0.26
+rpyc==4.1.5
+saithrift==0.9
+scapy==2.2.0.dev0
+selectors34==1.2
+serpent==1.28
+simplegeneric==0.8.1
+six==1.12.0
+stevedore==1.32.0
+supervisor==4.2.2
+thrift==0.11.0
+traitlets==4.3.3
+Twisted==16.0.0
+wcwidth==0.2.5
+Werkzeug==1.0.1
+yabgp==0.8.2
+zope.interface==5.4.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sflow/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-sflow/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster
index 8baa3d5cd96b..3424f739f586 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -1,17 +1,2 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
 libsnmp-base==5.7.3+dfsg-5
-libsnmp30==5.7.3+dfsg-5
-libsnmp30-dbg==5.7.3+dfsg-5
-openssh-client==1:7.9p1-10+deb10u2
-snmp-dbgsym==5.7.3+dfsg-5
-snmpd-dbgsym==5.7.3+dfsg-5
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
+libsnmp30==5.7.3+dfsg-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
deleted file mode 100644
index a29d8370e78a..000000000000
--- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
+++ /dev/null
@@ -1,13 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sonic-mgmt-framework-dbg==1.0-01
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
deleted file mode 100644
index f8cf36dc0e12..000000000000
--- a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
+++ /dev/null
@@ -1,12 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
new file mode 100644
index 000000000000..0b568f271095
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -0,0 +1,40 @@
+bash-completion==1:2.8-6
+dirmngr==2.2.12-1+deb10u1
+dmsetup==2:1.02.155-3
+ethtool==1:4.19-1
+gettext-base==0.19.8.1-9
+gnupg==2.2.12-1+deb10u1
+gnupg-l10n==2.2.12-1+deb10u1
+gnupg-utils==2.2.12-1+deb10u1
+gpg==2.2.12-1+deb10u1
+gpg-agent==2.2.12-1+deb10u1
+gpg-wks-client==2.2.12-1+deb10u1
+gpg-wks-server==2.2.12-1+deb10u1
+gpgconf==2.2.12-1+deb10u1
+gpgsm==2.2.12-1+deb10u1
+grub-common==2.02+dfsg1-20+deb10u4
+grub2-common==2.02+dfsg1-20+deb10u4
+libassuan0==2.5.2-1
+libboost-program-options1.71.0==1.71.0-6~bpo10+1
+libboost-system1.71.0==1.71.0-6~bpo10+1
+libboost-thread1.71.0==1.71.0-6~bpo10+1
+libdevmapper1.02.1==2:1.02.155-3
+libefiboot1==37-2+deb10u1
+libefivar1==37-2+deb10u1
+libfuse2==2.9.9-1+deb10u1
+libjudydebian1==1.0.5-5
+libksba8==1.3.5-2
+libnpth0==1.6-1
+libsaivs==1.0.0
+libyang-cpp==1.0.73
+openssh-server==1:7.9p1-10+deb10u2
+openssh-sftp-server==1:7.9p1-10+deb10u2
+pinentry-curses==1.1.0-2
+psmisc==23.2-1
+python-ply==3.11-3
+python2-yang==1.0.73
+python3-yang==1.0.73
+sonic-device-data==1.0-1
+sonic-host-services-data==1.0-1
+sonic-utilities-data==1.0-1
+syncd-vs==1.0.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
new file mode 100644
index 000000000000..96e7e5b1c7e9
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py2
@@ -0,0 +1,11 @@
+certifi==2020.12.5
+chardet==4.0.0
+crontab==0.23.0
+idna==2.10
+monotonic==1.5
+netifaces==0.10.7
+ply==3.11
+py2-ipaddress==3.4.2
+pyroute2==0.5.3
+requests==2.25.1
+urllib3==1.26.4
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
new file mode 100644
index 000000000000..ae7bcd1adcb3
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -0,0 +1,15 @@
+certifi==2020.12.5
+chardet==3.0.4
+Click==7.0
+deepdiff==5.2.3
+ijson==2.6.1
+jsondiff==1.2.0
+M2Crypto==0.31.0
+netifaces==0.10.7
+ordered-set==4.0.2
+pexpect==4.8.0
+ptyprocess==0.7.0
+requests==2.25.0
+tabulate==0.8.2
+urllib3==1.26.4
+xmltodict==0.12.0
\ No newline at end of file
diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
index 05575075bf83..a562e132a732 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -7,7 +7,7 @@ libexpat1-dev==2.2.6-2+deb10u1
 libpython-dev==2.7.16-1
 libpython2-dev==2.7.16-1
 libpython2.7-dev==2.7.16-2+deb10u1
-mlnx-sai==1.mlnx.SAIRel1.18.1.0
+mlnx-sai==1.mlnx.SAIRel1.18.3.0
 python-dev==2.7.16-1
 python-pkg-resources==40.8.0-1
 python-sdk-api==1.mlnx.4.4.2522
diff --git a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
index 6494a41ddc7f..09f43f402e3f 100644
--- a/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
+++ b/files/build/versions/dockers/docker-syncd-nephos/versions-deb-stretch
@@ -2,7 +2,7 @@ gdb==7.12-6
 gdbserver==7.12-6
 libbabeltrace-ctf1==1.5.1-1
 libbabeltrace1==1.5.1-1
-libbsd0==0.8.3-1
+libbsd0==0.8.3-1+deb9u1
 libdw1==0.168-1
 libedit2==3.1-20160903-3
 libglib2.0-0==2.50.3-2+deb9u2
@@ -10,9 +10,9 @@ libgpm2==1.20.4-6.2+b1
 libicu57==57.1-6+deb9u4
 libmpdec2==2.4.2-1
 libpopt0==1.16-10+b2
-libpython3.5==3.5.3-1+deb9u3
-libpython3.5-minimal==3.5.3-1+deb9u3
-libpython3.5-stdlib==3.5.3-1+deb9u3
+libpython3.5==3.5.3-1+deb9u4
+libpython3.5-minimal==3.5.3-1+deb9u4
+libpython3.5-stdlib==3.5.3-1+deb9u4
 libsaimetadata==1.0.0
 libsaimetadata-dbg==1.0.0
 libsainps==1.5.0
diff --git a/files/build/versions/dockers/docker-teamd/versions-deb-buster b/files/build/versions/dockers/docker-teamd/versions-deb-buster
deleted file mode 100644
index eeb36c01b260..000000000000
--- a/files/build/versions/dockers/docker-teamd/versions-deb-buster
+++ /dev/null
@@ -1,16 +0,0 @@
-gdb==8.2.1-2+b3
-gdbserver==8.2.1-2+b3
-libbabeltrace1==1.5.6-2+deb10u1
-libdw1==0.176-1.1
-libedit2==3.1-20181209-1
-libgpm2==1.20.7-5
-libipt2==2.0-2
-libswsscommon-dbg==1.0.0
-libteam-utils-dbgsym==1.30-1
-libteamdctl0-dbgsym==1.30-1
-openssh-client==1:7.9p1-10+deb10u2
-sshpass==1.06-1
-strace==4.26-0.2
-swss-dbg==1.0.0
-vim==2:8.1.0875-5
-vim-runtime==2:8.1.0875-5
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
index 8245c8630934..ebf84b97150b 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -165,11 +165,11 @@ groff==1.22.4-3+deb10u1
 groff-base==1.22.4-3+deb10u1
 gsettings-desktop-schemas==3.28.1-1
 gsfonts==1:8.11+urwcyr1.0.7~pre44-4.4
-gstreamer1.0-libav==1.15.0.1+git20180723+db823502-2
-gstreamer1.0-plugins-base==1.14.4-2
-gstreamer1.0-plugins-good==1.14.4-1
-gstreamer1.0-plugins-ugly==1.14.4-1
-gstreamer1.0-x==1.14.4-2
+gstreamer1.0-libav==1.15.0.1+git20180723+db823502-2+deb10u1
+gstreamer1.0-plugins-base==1.14.4-2+deb10u1
+gstreamer1.0-plugins-good==1.14.4-1+deb10u1
+gstreamer1.0-plugins-ugly==1.14.4-1+deb10u1
+gstreamer1.0-x==1.14.4-2+deb10u1
 gtk-update-icon-cache==3.24.5-1
 guile-2.0-libs==2.0.13+1-5.1
 hicolor-icon-theme==0.17-2
@@ -536,7 +536,7 @@ libgs9-common==9.27~dfsg-2+deb10u4
 libgsm1==1.0.18-2
 libgssapi-krb5-2==1.17-3+deb10u1
 libgssrpc4==1.17-3+deb10u1
-libgstreamer-plugins-base1.0-0==1.14.4-2
+libgstreamer-plugins-base1.0-0==1.14.4-2+deb10u1
 libgstreamer1.0-0==1.14.4-1
 libgtest-dev==1.8.1-3
 libgtk-3-0==3.24.5-1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py2 b/files/build/versions/dockers/sonic-slave-buster/versions-py2
index 2aaf37e5d3ae..e87f798b9145 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py2
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py2
@@ -58,7 +58,6 @@ Pillow==5.4.1
 pluggy==0.8.0
 ptyprocess==0.7.0
 py==1.7.0
-pyang==2.1.1
 pyasn1==0.4.2
 pyasn1-modules==0.2.1
 pycrypto==2.6.1
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 762a2a60891c..8d632cbd97f4 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -40,7 +40,7 @@ Pillow==5.4.1
 pluggy==0.8.0
 ptyprocess==0.7.0
 py==1.7.0
-pyang==2.1.1
+pyang==2.4.0
 pyangbind==0.8.1
 pycrypto==2.6.1
 pycurl==7.43.0.2
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py2 b/files/build/versions/dockers/sonic-slave-stretch/versions-py2
index c1a558f686db..aeb7e36ef89a 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py2
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py2
@@ -43,7 +43,6 @@ pexpect==4.6.0
 Pillow==4.0.0
 ptyprocess==0.7.0
 py==1.4.32
-pyang==2.1.1
 pyasn1==0.1.9
 pyasn1-modules==0.0.7
 pycrypto==2.6.1
diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster
index 5d9037df546c..57f7d015d0ab 100644
--- a/files/build/versions/host-image/versions-deb-buster
+++ b/files/build/versions/host-image/versions-deb-buster
@@ -2,7 +2,6 @@ acl==2.2.53-4
 apparmor==2.13.2-10
 apt-transport-https==1.8.2.2
 bash-completion==1:2.8-6
-bfn-modules==1.0
 bridge-utils==1.6-2
 bsdmainutils==11.1.2+b1
 busybox==1:1.30.1-4
@@ -21,7 +20,6 @@ dmsetup==2:1.02.155-3
 docker-ce==5:18.09.8~3-0~debian-buster
 docker-ce-cli==5:18.09.8~3-0~debian-buster
 dpkg-dev==1.19.7
-drivers-sonic-platform-arista==1.0
 ebtables==2.0.10.4+snapshot20181205-3
 efibootmgr==15-1
 file==1:5.35-4+deb10u2
@@ -70,9 +68,6 @@ libapparmor1==2.13.2-10
 libapt-inst2.0==1.8.2.2
 libargon2-1==0~20171227-0.2
 libassuan0==2.5.2-1
-libboost-filesystem1.67.0==1.67.0-13+deb10u1
-libboost-program-options1.67.0==1.67.0-13+deb10u1
-libboost-system1.67.0==1.67.0-13+deb10u1
 libbsd0==0.9.1-2+deb10u1
 libc-l10n==2.28-10
 libcap2==1:2.25-2
@@ -85,14 +80,12 @@ libdbi-perl==1.642-1+deb10u2
 libdbus-1-3==1.12.20-0+deb10u1
 libdevmapper1.02.1==2:1.02.155-3
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u3
-libdouble-conversion1==3.1.0-3
 libdw1==0.176-1.1
 libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
 libelf1==0.176-1.1
 libestr0==0.1.10-2.1
-libevent-2.1-6==2.1.8-stable-4
 libexpat1==2.2.6-2+deb10u1
 libfastjson4==0.99.8-2
 libffi-dev==3.2.1-9
@@ -102,9 +95,7 @@ libftdi1-2==1.4-1+b2
 libfuse2==2.9.9-1+deb10u1
 libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
-libgflags2.2==2.2.2-1
 libglib2.0-0==2.58.3-2+deb10u2
-libgoogle-glog0v5==0.3.5-1
 libgpm2==1.20.7-5
 libgssapi-krb5-2==1.17-3+deb10u1
 libhavege1==1.9.1-7
@@ -175,13 +166,11 @@ libswsscommon==1.0.0
 libsysfs2==2.1.0+repack-5
 libtac2==1.4.1-1
 libtcl8.6==8.6.9+dfsg-2
-libunwind8==1.2.1-10~deb10u1
 libusb-0.1-4==2:0.1.12-32
 libusb-1.0-0==2:1.0.22-2
 libutempter0==1.1.6-3
 libwrap0==7.6.q-28
 libxtables12==1.8.2-4
-libyaml-0-2==0.2.1-1
 libyang==1.0.73
 libyang-cpp==1.0.73
 linux-base==4.6
@@ -213,7 +202,6 @@ openssl==1.1.1d-0+deb10u6
 pciutils==1:3.5.2-1
 perl==5.28.1-6+deb10u1
 perl-modules-5.28==5.28.1-6+deb10u1
-phy-credo==1.0
 picocom==3.1-2
 pinentry-curses==1.1.0-2
 procps==2:3.3.15-2
@@ -222,28 +210,19 @@ python==2.7.16-1
 python-apt==1.8.4.3
 python-apt-common==1.8.4.3
 python-argcomplete==1.8.1-1
-python-bottle==0.12.15-2+deb10u1
-python-enum34==1.1.6-2
 python-ipaddr==2.2.0-2
 python-minimal==2.7.16-1
-python-smbus==4.1-1
-python-sonic-platform-arista==1.0
 python-swsscommon==1.0.0
-python-yaml==3.13-2
 python2==2.7.16-1
 python2-minimal==2.7.16-1
 python2-yang==1.0.73
 python2.7==2.7.16-2+deb10u1
 python2.7-minimal==2.7.16-2+deb10u1
 python3==3.7.3-1
-python3-bottle==0.12.15-2+deb10u1
 python3-distutils==3.7.3-1
 python3-lib2to3==3.7.3-1
 python3-minimal==3.7.3-1
-python3-smbus==4.1-1
-python3-sonic-platform-arista==1.0
 python3-swsscommon==1.0.0
-python3-yaml==3.13-2
 python3-yang==1.0.73
 python3.7==3.7.3-2+deb10u3
 python3.7-minimal==3.7.3-2+deb10u3
@@ -255,7 +234,6 @@ sensible-utils==0.0.12
 software-properties-common==0.96.20.2-2
 sonic-device-data==1.0-1
 sonic-host-services-data==1.0-1
-sonic-platform-arista==1.0
 sonic-utilities-data==1.0-1
 sqlite3==3.27.2-3+deb10u1
 squashfs-tools==1:4.3-12
diff --git a/files/build/versions/host-image/versions-py2 b/files/build/versions/host-image/versions-py2
index d74742f391f6..c70251b7cd82 100644
--- a/files/build/versions/host-image/versions-py2
+++ b/files/build/versions/host-image/versions-py2
@@ -1,8 +1,6 @@
 argcomplete==1.8.1
 bitarray==1.5.3
-bottle==0.12.15
 contextlib2==0.6.0.post1
-enum34==1.1.6
 functools32==3.2.3.post2
 future==0.18.2
 importlib-resources==3.3.1
@@ -15,7 +13,6 @@ MarkupSafe==1.1.1
 natsort==6.2.1
 netaddr==0.8.0
 pathlib2==2.3.5
-platform-arista==1.0
 pyang==2.4.0
 pyangbind==0.6.0
 python-apt==1.8.4.3
@@ -24,6 +21,5 @@ redis==3.5.3
 scandir==1.10.0
 singledispatch==3.6.1
 six==1.15.0
-thrift==0.13.0
 typing==3.7.4.3
 zipp==1.2.0
\ No newline at end of file
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 562427bf68a2..5e4ad547c81a 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -2,7 +2,6 @@ azure-common==1.1.27
 azure-nspkg==3.0.2
 azure-storage==0.36.0
 bitarray==1.5.3
-bottle==0.12.15
 certifi==2020.12.5
 cffi==1.14.5
 chardet==3.0.4
@@ -25,7 +24,6 @@ netifaces==0.10.7
 ordered-set==4.0.2
 pathtools==0.1.2
 pexpect==4.8.0
-platform-arista==1.0
 psutil==5.8.0
 ptyprocess==0.7.0
 pyang==2.4.0
@@ -39,7 +37,6 @@ requests==2.25.0
 scapy==2.4.4
 six==1.15.0
 tabulate==0.8.2
-thrift==0.13.0
 urllib3==1.26.4
 watchdog==0.10.3
 websocket-client==0.58.0