diff --git a/files/build/versions/dockers/docker-base-bullseye-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-base-bullseye-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-base-bullseye-sonic/versions-deb-bullseye-armhf b/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye-armhf
similarity index 100%
rename from files/build/versions/dockers/docker-base-bullseye-sonic/versions-deb-bullseye-armhf
rename to files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye-armhf
diff --git a/files/build/versions/dockers/docker-base-bullseye-sonic/versions-py3 b/files/build/versions/dockers/docker-base-bullseye/versions-py3
similarity index 100%
rename from files/build/versions/dockers/docker-base-bullseye-sonic/versions-py3
rename to files/build/versions/dockers/docker-base-bullseye/versions-py3
diff --git a/files/build/versions/dockers/docker-base-buster-sonic/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster
similarity index 100%
rename from files/build/versions/dockers/docker-base-buster-sonic/versions-deb-buster
rename to files/build/versions/dockers/docker-base-buster/versions-deb-buster
diff --git a/files/build/versions/dockers/docker-base-buster-sonic/versions-py3 b/files/build/versions/dockers/docker-base-buster/versions-py3
similarity index 100%
rename from files/build/versions/dockers/docker-base-buster-sonic/versions-py3
rename to files/build/versions/dockers/docker-base-buster/versions-py3
diff --git a/files/build/versions/dockers/docker-base-buster-sonic/versions-web b/files/build/versions/dockers/docker-base-buster/versions-web
similarity index 100%
rename from files/build/versions/dockers/docker-base-buster-sonic/versions-web
rename to files/build/versions/dockers/docker-base-buster/versions-web
diff --git a/files/build/versions/dockers/docker-config-engine-bullseye-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-config-engine-bullseye-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-config-engine-bullseye-sonic/versions-deb-bullseye-armhf b/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye-armhf
similarity index 100%
rename from files/build/versions/dockers/docker-config-engine-bullseye-sonic/versions-deb-bullseye-armhf
rename to files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye-armhf
diff --git a/files/build/versions/dockers/docker-config-engine-bullseye-sonic/versions-py3 b/files/build/versions/dockers/docker-config-engine-bullseye/versions-py3
similarity index 100%
rename from files/build/versions/dockers/docker-config-engine-bullseye-sonic/versions-py3
rename to files/build/versions/dockers/docker-config-engine-bullseye/versions-py3
diff --git a/files/build/versions/dockers/docker-config-engine-buster-sonic/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
similarity index 100%
rename from files/build/versions/dockers/docker-config-engine-buster-sonic/versions-deb-buster
rename to files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster
diff --git a/files/build/versions/dockers/docker-config-engine-buster-sonic/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
similarity index 100%
rename from files/build/versions/dockers/docker-config-engine-buster-sonic/versions-deb-buster-armhf
rename to files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf
diff --git a/files/build/versions/dockers/docker-config-engine-buster-sonic/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
similarity index 100%
rename from files/build/versions/dockers/docker-config-engine-buster-sonic/versions-py3
rename to files/build/versions/dockers/docker-config-engine-buster/versions-py3
diff --git a/files/build/versions/dockers/docker-database-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-database/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-database-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-database/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-dhcp-relay-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-dhcp-relay-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-fpm-frr-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-fpm-frr-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-fpm-frr-sonic/versions-py3 b/files/build/versions/dockers/docker-fpm-frr/versions-py3
similarity index 100%
rename from files/build/versions/dockers/docker-fpm-frr-sonic/versions-py3
rename to files/build/versions/dockers/docker-fpm-frr/versions-py3
diff --git a/files/build/versions/dockers/docker-gbsyncd-broncos-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-gbsyncd-broncos-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-gbsyncd-credo-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-gbsyncd-credo/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-gbsyncd-credo-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-gbsyncd-credo/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-gbsyncd-vs-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-gbsyncd-vs-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-lldp-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-lldp/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-lldp-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-lldp/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-macsec-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-macsec/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-macsec-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-macsec/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-mux-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-mux/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-mux-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-mux/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-nat-sonic/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster
similarity index 100%
rename from files/build/versions/dockers/docker-nat-sonic/versions-deb-buster
rename to files/build/versions/dockers/docker-nat/versions-deb-buster
diff --git a/files/build/versions/dockers/docker-orchagent-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-orchagent-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-orchagent/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-orchagent-sonic/versions-deb-bullseye-armhf b/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye-armhf
similarity index 100%
rename from files/build/versions/dockers/docker-orchagent-sonic/versions-deb-bullseye-armhf
rename to files/build/versions/dockers/docker-orchagent/versions-deb-bullseye-armhf
diff --git a/files/build/versions/dockers/docker-orchagent-sonic/versions-py3 b/files/build/versions/dockers/docker-orchagent/versions-py3
similarity index 100%
rename from files/build/versions/dockers/docker-orchagent-sonic/versions-py3
rename to files/build/versions/dockers/docker-orchagent/versions-py3
diff --git a/files/build/versions/dockers/docker-platform-monitor-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-platform-monitor-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-platform-monitor-sonic/versions-deb-bullseye-armhf b/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye-armhf
similarity index 100%
rename from files/build/versions/dockers/docker-platform-monitor-sonic/versions-deb-bullseye-armhf
rename to files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye-armhf
diff --git a/files/build/versions/dockers/docker-platform-monitor-sonic/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3
similarity index 100%
rename from files/build/versions/dockers/docker-platform-monitor-sonic/versions-py3
rename to files/build/versions/dockers/docker-platform-monitor/versions-py3
diff --git a/files/build/versions/dockers/docker-ptf-sai-sonic/versions-deb-buster b/files/build/versions/dockers/docker-ptf-sai/versions-deb-buster
similarity index 100%
rename from files/build/versions/dockers/docker-ptf-sai-sonic/versions-deb-buster
rename to files/build/versions/dockers/docker-ptf-sai/versions-deb-buster
diff --git a/files/build/versions/dockers/docker-ptf-sai-sonic/versions-py3 b/files/build/versions/dockers/docker-ptf-sai/versions-py3
similarity index 100%
rename from files/build/versions/dockers/docker-ptf-sai-sonic/versions-py3
rename to files/build/versions/dockers/docker-ptf-sai/versions-py3
diff --git a/files/build/versions/dockers/docker-ptf-sonic/versions-deb-buster b/files/build/versions/dockers/docker-ptf/versions-deb-buster
similarity index 100%
rename from files/build/versions/dockers/docker-ptf-sonic/versions-deb-buster
rename to files/build/versions/dockers/docker-ptf/versions-deb-buster
diff --git a/files/build/versions/dockers/docker-ptf-sonic/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2
similarity index 100%
rename from files/build/versions/dockers/docker-ptf-sonic/versions-py2
rename to files/build/versions/dockers/docker-ptf/versions-py2
diff --git a/files/build/versions/dockers/docker-ptf-sonic/versions-py3 b/files/build/versions/dockers/docker-ptf/versions-py3
similarity index 100%
rename from files/build/versions/dockers/docker-ptf-sonic/versions-py3
rename to files/build/versions/dockers/docker-ptf/versions-py3
diff --git a/files/build/versions/dockers/docker-router-advertiser-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-router-advertiser/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-router-advertiser-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-router-advertiser/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-sflow-sonic/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster
similarity index 100%
rename from files/build/versions/dockers/docker-sflow-sonic/versions-deb-buster
rename to files/build/versions/dockers/docker-sflow/versions-deb-buster
diff --git a/files/build/versions/dockers/docker-snmp-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-snmp/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-snmp-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-snmp/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-snmp-sonic/versions-deb-bullseye-armhf b/files/build/versions/dockers/docker-snmp/versions-deb-bullseye-armhf
similarity index 100%
rename from files/build/versions/dockers/docker-snmp-sonic/versions-deb-bullseye-armhf
rename to files/build/versions/dockers/docker-snmp/versions-deb-bullseye-armhf
diff --git a/files/build/versions/dockers/docker-snmp-sonic/versions-py3 b/files/build/versions/dockers/docker-snmp/versions-py3
similarity index 100%
rename from files/build/versions/dockers/docker-snmp-sonic/versions-py3
rename to files/build/versions/dockers/docker-snmp/versions-py3
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework-sonic/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
similarity index 100%
rename from files/build/versions/dockers/docker-sonic-mgmt-framework-sonic/versions-deb-buster
rename to files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework-sonic/versions-deb-buster-armhf b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster-armhf
similarity index 100%
rename from files/build/versions/dockers/docker-sonic-mgmt-framework-sonic/versions-deb-buster-armhf
rename to files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster-armhf
diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework-sonic/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
similarity index 100%
rename from files/build/versions/dockers/docker-sonic-mgmt-framework-sonic/versions-py3
rename to files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
diff --git a/files/build/versions/dockers/docker-sonic-p4rt-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-sonic-p4rt/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-sonic-p4rt-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-sonic-p4rt/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-sonic-telemetry-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-sonic-telemetry-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-sonic-telemetry/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-sonic-vs-sonic/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
similarity index 100%
rename from files/build/versions/dockers/docker-sonic-vs-sonic/versions-deb-buster
rename to files/build/versions/dockers/docker-sonic-vs/versions-deb-buster
diff --git a/files/build/versions/dockers/docker-sonic-vs-sonic/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2
similarity index 100%
rename from files/build/versions/dockers/docker-sonic-vs-sonic/versions-py2
rename to files/build/versions/dockers/docker-sonic-vs/versions-py2
diff --git a/files/build/versions/dockers/docker-sonic-vs-sonic/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
similarity index 100%
rename from files/build/versions/dockers/docker-sonic-vs-sonic/versions-py3
rename to files/build/versions/dockers/docker-sonic-vs/versions-py3
diff --git a/files/build/versions/dockers/docker-swss-layer-bullseye-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-swss-layer-bullseye/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-swss-layer-bullseye-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-swss-layer-bullseye/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-swss-layer-buster-sonic/versions-deb-buster b/files/build/versions/dockers/docker-swss-layer-buster/versions-deb-buster
similarity index 100%
rename from files/build/versions/dockers/docker-swss-layer-buster-sonic/versions-deb-buster
rename to files/build/versions/dockers/docker-swss-layer-buster/versions-deb-buster
diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-syncd-bfn-rpc-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-syncd-bfn-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-syncd-bfn-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-syncd-bfn/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-syncd-brcm-dnx-rpc-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc-sonic/versions-web b/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-web
similarity index 100%
rename from files/build/versions/dockers/docker-syncd-brcm-dnx-rpc-sonic/versions-web
rename to files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-web
diff --git a/files/build/versions/dockers/docker-syncd-brcm-dnx-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm-dnx/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-syncd-brcm-dnx-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-syncd-brcm-dnx/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-syncd-brcm-rpc-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc-sonic/versions-web b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-web
similarity index 100%
rename from files/build/versions/dockers/docker-syncd-brcm-rpc-sonic/versions-web
rename to files/build/versions/dockers/docker-syncd-brcm-rpc/versions-web
diff --git a/files/build/versions/dockers/docker-syncd-brcm-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-syncd-brcm-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-syncd-brcm/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc-sonic/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
similarity index 100%
rename from files/build/versions/dockers/docker-syncd-centec-rpc-sonic/versions-deb-buster
rename to files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster
diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc-sonic/versions-py2 b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
similarity index 100%
rename from files/build/versions/dockers/docker-syncd-centec-rpc-sonic/versions-py2
rename to files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2
diff --git a/files/build/versions/dockers/docker-syncd-centec-sonic/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
similarity index 100%
rename from files/build/versions/dockers/docker-syncd-centec-sonic/versions-deb-buster
rename to files/build/versions/dockers/docker-syncd-centec/versions-deb-buster
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-syncd-mlnx-rpc-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc-sonic/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2
similarity index 100%
rename from files/build/versions/dockers/docker-syncd-mlnx-rpc-sonic/versions-py2
rename to files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-syncd-mlnx-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye
diff --git a/files/build/versions/dockers/docker-syncd-mlnx-sonic/versions-py3 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3
similarity index 100%
rename from files/build/versions/dockers/docker-syncd-mlnx-sonic/versions-py3
rename to files/build/versions/dockers/docker-syncd-mlnx/versions-py3
diff --git a/files/build/versions/dockers/docker-syncd-mrvl-sonic/versions-deb-bullseye-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-bullseye-armhf
similarity index 100%
rename from files/build/versions/dockers/docker-syncd-mrvl-sonic/versions-deb-bullseye-armhf
rename to files/build/versions/dockers/docker-syncd-mrvl/versions-deb-bullseye-armhf
diff --git a/files/build/versions/dockers/docker-syncd-vs-sonic/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
similarity index 100%
rename from files/build/versions/dockers/docker-syncd-vs-sonic/versions-deb-buster
rename to files/build/versions/dockers/docker-syncd-vs/versions-deb-buster
diff --git a/files/build/versions/dockers/docker-teamd-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-teamd/versions-deb-bullseye
similarity index 100%
rename from files/build/versions/dockers/docker-teamd-sonic/versions-deb-bullseye
rename to files/build/versions/dockers/docker-teamd/versions-deb-bullseye