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 b7e9050d4f..a7ae56c349 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
@@ -77,7 +77,6 @@ linux-headers-4.19.0-12-2-amd64==4.19.152-1
 linux-headers-4.19.0-12-2-common==4.19.152-1
 lldpd==1.0.4-1
 lm-sensors==1:3.5.0-3
-mft==4.16.0-105
 pango1.0-tools==1.42.4-8~deb10u1
 python-swsscommon==1.0.0
 python-thrift==0.11.0-4
diff --git a/files/build/versions/default/versions-deb-buster b/files/build/versions/default/versions-deb-buster
index e74aed42d2..18164e80bd 100644
--- a/files/build/versions/default/versions-deb-buster
+++ b/files/build/versions/default/versions-deb-buster
@@ -22,22 +22,17 @@ 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+deb10u1
 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
@@ -45,7 +40,6 @@ 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
@@ -63,8 +57,6 @@ libdbus-1-3==1.12.20-0+deb10u1
 libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u5
 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
@@ -81,7 +73,6 @@ libgdbm-compat4==1.18.1-4
 libgdbm6==1.18.1-4
 libglib2.0-0==2.58.3-2+deb10u3
 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
@@ -90,7 +81,6 @@ 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+deb10u5
 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u5
@@ -170,15 +160,11 @@ librrd8==1.7.1-2
 librtmp1==2.4+20151223.gitfa8646d.1-2
 libsaibcm==4.3.3.8-1
 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
@@ -186,12 +172,9 @@ 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
@@ -214,13 +197,10 @@ 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.194-2
 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
@@ -234,7 +214,6 @@ 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
@@ -275,32 +254,22 @@ 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
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
index 0206d9120b..1792aa7bfa 100644
--- a/files/build/versions/default/versions-git
+++ b/files/build/versions/default/versions-git
@@ -1,4 +1,4 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==7f69c8fe8fdc943f2282dbb4504bab19f6593b00
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==0d6d677c9e91a76f3b19e837b318533f97798535
 https://github.com/aristanetworks/swi-tools.git==2ec0a0579b81edd3ff1c1288d73de309819ada0c
 https://github.com/CESNET/libyang.git==6f74fd18e5ace7d8f1ae6c1c1c2b7442dc263b22
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
@@ -12,7 +12,7 @@ https://github.com/sflow/sflowtool==4be2a17b36a3b9796c280b117b8b786323a84ae8
 https://github.com/thom311/libnl==5f395029ad01f05448cd1c7e0ddd8085d758c98a
 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5
 https://salsa.debian.org/dhcp-team/isc-dhcp.git==d0d58776805d720029619ea06df5c57706eecd5a
-https://salsa.debian.org/kernel-team/ethtool/==568def48cfc7d04d42809ebc0e1a375e23b0139b
+https://salsa.debian.org/kernel-team/ethtool/==e784c2607c7e4d2e881f9442b3daea25f66773ef
 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
 https://salsa.debian.org/ssh-team/openssh.git==32717238e7587949cb2799136fd15d6fcea5341c
\ No newline at end of file
diff --git a/files/build/versions/default/versions-py3 b/files/build/versions/default/versions-py3
index f1226aa412..47eaeefcc1 100644
--- a/files/build/versions/default/versions-py3
+++ b/files/build/versions/default/versions-py3
@@ -36,7 +36,7 @@ python-dateutil==2.6.0
 pyyaml==5.4.1
 redis==3.5.3
 redis-dump-load==1.1
-regex==2021.4.4
+regex==2021.7.1
 requests==2.25.1
 scapy==2.4.4
 smbus==1.1.post2
diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web
index 97b58e6582..33cb2cf03e 100644
--- a/files/build/versions/default/versions-web
+++ b/files/build/versions/default/versions-web
@@ -13,7 +13,7 @@ http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==b
 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:4511c670f851c56473a7370c10c199cdad4dfc3c==dfba6e41ed652d9110c5749eae9aed0d
+https://chrome-infra-packages.appspot.com/client?platform=linux-amd64&version=git_revision:9464003f070813371070f9b8f7c350d87619d145==354f6511de4cd572aed26b4facd9b8a2
 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
diff --git a/files/build/versions/dockers/docker-database/versions-deb-buster b/files/build/versions/dockers/docker-database/versions-deb-buster
new file mode 100644
index 0000000000..f8cf36dc0e
--- /dev/null
+++ b/files/build/versions/dockers/docker-database/versions-deb-buster
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000000..090a9af05b
--- /dev/null
+++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-buster
@@ -0,0 +1,13 @@
+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 8ce0c99a8c..861bf81258 100644
--- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
+++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-buster
@@ -1,2 +1,19 @@
+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
\ No newline at end of file
+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
diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
index 35fa7ba37f..1385fbd0ee 100644
--- a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-buster
@@ -1,4 +1,19 @@
+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
+libsaimetadata-dbg==1.0.0
+libsairedis-dbg==1.0.0
 libsaivs==1.0.0
 libsaivs-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
 syncd-vs==1.0.0
-syncd-vs-dbg==1.0.0
\ No newline at end of file
+syncd-vs-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-lldp/versions-deb-buster b/files/build/versions/dockers/docker-lldp/versions-deb-buster
index 3424f739f5..dced6f540d 100644
--- a/files/build/versions/dockers/docker-lldp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-lldp/versions-deb-buster
@@ -1,2 +1,16 @@
+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
\ No newline at end of file
+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
diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster
new file mode 100644
index 0000000000..159c8c90df
--- /dev/null
+++ b/files/build/versions/dockers/docker-nat/versions-deb-buster
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000000..0969e5edd9
--- /dev/null
+++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster
@@ -0,0 +1,15 @@
+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 eb5e901597..16d8aadf78 100644
--- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
+++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster
@@ -1,10 +1,26 @@
 applibs==1.mlnx.4.4.3106
 applibs-dev==1.mlnx.4.4.3106
 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.3106
+sensord-dbgsym==1:3.5.0-3
+sshpass==1.06-1
+strace==4.26-0.2
 sx-complib==1.mlnx.4.4.3106
 sx-complib-dev==1.mlnx.4.4.3106
 sx-gen-utils==1.mlnx.4.4.3106
 sx-gen-utils-dev==1.mlnx.4.4.3106
 sxd-libs==1.mlnx.4.4.3106
-sxd-libs-dev==1.mlnx.4.4.3106
\ No newline at end of file
+sxd-libs-dev==1.mlnx.4.4.3106
+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-router-advertiser/versions-deb-buster b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
new file mode 100644
index 0000000000..f8cf36dc0e
--- /dev/null
+++ b/files/build/versions/dockers/docker-router-advertiser/versions-deb-buster
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000000..f8cf36dc0e
--- /dev/null
+++ b/files/build/versions/dockers/docker-sflow/versions-deb-buster
@@ -0,0 +1,12 @@
+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 3424f739f5..8baa3d5cd9 100644
--- a/files/build/versions/dockers/docker-snmp/versions-deb-buster
+++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster
@@ -1,2 +1,17 @@
+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
\ No newline at end of file
+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
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
new file mode 100644
index 0000000000..a29d8370e7
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000000..f8cf36dc0e
--- /dev/null
+++ b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-buster
@@ -0,0 +1,12 @@
+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
index 2f3ae7e033..a329339c84 100644
--- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
@@ -19,6 +19,7 @@ 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
+libedit2==3.1-20181209-1
 libefiboot1==37-2+deb10u1
 libefivar1==37-2+deb10u1
 libfuse2==2.9.9-1+deb10u1
@@ -27,6 +28,7 @@ libksba8==1.3.5-2
 libnpth0==1.6-1
 libsaivs==1.0.0
 libyang-cpp==1.0.73
+openssh-client==1:7.9p1-10+deb10u2
 openssh-server==1:7.9p1-10+deb10u2
 openssh-sftp-server==1:7.9p1-10+deb10u2
 pinentry-curses==1.1.0-2
diff --git a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
index e5836f0be3..74abbdb5bd 100644
--- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
@@ -1 +1,13 @@
-libsai==1.6.3-1
\ No newline at end of file
+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
+libsai==1.6.3-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
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 2b09371f83..6352f44332 100644
--- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster
@@ -2,7 +2,6 @@ applibs==1.mlnx.4.4.3106
 applibs-dev==1.mlnx.4.4.3106
 iproute2==1.mlnx.4.4.3106
 iproute2-dev==1.mlnx.4.4.3106
-libelf1==0.176-1.1
 mft==4.16.0-105
 mlnx-sai==1.mlnx.SAIRel1.18.3.0
 python-sdk-api==1.mlnx.4.4.3106
diff --git a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
index 35fa7ba37f..1385fbd0ee 100644
--- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
+++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
@@ -1,4 +1,19 @@
+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
+libsaimetadata-dbg==1.0.0
+libsairedis-dbg==1.0.0
 libsaivs==1.0.0
 libsaivs-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
 syncd-vs==1.0.0
-syncd-vs-dbg==1.0.0
\ No newline at end of file
+syncd-vs-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-teamd/versions-deb-buster b/files/build/versions/dockers/docker-teamd/versions-deb-buster
new file mode 100644
index 0000000000..eeb36c01b2
--- /dev/null
+++ b/files/build/versions/dockers/docker-teamd/versions-deb-buster
@@ -0,0 +1,16 @@
+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-git b/files/build/versions/dockers/sonic-slave-buster/versions-git
deleted file mode 100644
index e0ef836d5b..0000000000
--- a/files/build/versions/dockers/sonic-slave-buster/versions-git
+++ /dev/null
@@ -1 +0,0 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==7f69c8fe8fdc943f2282dbb4504bab19f6593b00
\ No newline at end of file
diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
index 6505974157..944476b6d5 100644
--- a/files/build/versions/dockers/sonic-slave-buster/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -58,7 +58,7 @@ pytz==2019.1
 pyxdg==0.25
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.4.4
+regex==2021.7.1
 requests==2.21.0
 roman==2.0.0
 secretstorage==2.3.1
diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
index f6013881a5..d746938454 100644
--- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3
+++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3
@@ -29,7 +29,7 @@ pytz==2016.7
 pyxdg==0.25
 pyyaml==5.3.1
 redis==3.5.3
-regex==2021.4.4
+regex==2021.7.1
 roman==2.0.0
 secretstorage==2.3.1
 six==1.10.0
diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
index 7fa9d072be..518aed06fb 100644
--- a/files/build/versions/host-image/versions-py3
+++ b/files/build/versions/host-image/versions-py3
@@ -30,7 +30,7 @@ pycparser==2.20
 python-dateutil==2.8.1
 pyyaml==5.4.1
 redis==3.5.3
-regex==2021.4.4
+regex==2021.7.1
 requests==2.25.1
 scapy==2.4.4
 six==1.16.0