diff --git a/platform/broadcom/rules.dep b/platform/broadcom/rules.dep
index 220ee80199..075636a8de 100644
--- a/platform/broadcom/rules.dep
+++ b/platform/broadcom/rules.dep
@@ -30,6 +30,4 @@ include $(PLATFORM_PATH)/libsaithrift-dev.dep
 include $(PLATFORM_PATH)/docker-syncd-brcm-dnx.dep
 include $(PLATFORM_PATH)/docker-syncd-brcm-dnx-rpc.dep
 include $(PLATFORM_PATH)/../components/docker-gbsyncd-credo.dep
-ifeq ($(INCLUDE_GBSYNCD_BRONCOS), y)
 include $(PLATFORM_PATH)/../components/docker-gbsyncd-broncos.dep
-endif
diff --git a/platform/broadcom/rules.mk b/platform/broadcom/rules.mk
index 0b46bb1c8e..c43a66ee43 100644
--- a/platform/broadcom/rules.mk
+++ b/platform/broadcom/rules.mk
@@ -29,9 +29,7 @@ include $(PLATFORM_PATH)/libsaithrift-dev.mk
 include $(PLATFORM_PATH)/docker-syncd-brcm-dnx.mk
 include $(PLATFORM_PATH)/docker-syncd-brcm-dnx-rpc.mk
 include $(PLATFORM_PATH)/../components/docker-gbsyncd-credo.mk
-ifeq ($(INCLUDE_GBSYNCD_BRONCOS), y)
 include $(PLATFORM_PATH)/../components/docker-gbsyncd-broncos.mk
-endif
 
 BCMCMD = bcmcmd
 $(BCMCMD)_URL = "https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r"
diff --git a/platform/components/docker-gbsyncd-broncos.mk b/platform/components/docker-gbsyncd-broncos.mk
index 6e280ee5a6..1aad33f968 100644
--- a/platform/components/docker-gbsyncd-broncos.mk
+++ b/platform/components/docker-gbsyncd-broncos.mk
@@ -1,5 +1,8 @@
-LIBSAI_BRONCOS = libsaibroncos_0.0.1_amd64.deb
-$(LIBSAI_BRONCOS)_URL =
+LIBSAI_BRONCOS_VERSION = 3.8
+LIBSAI_BRONCOS_BRANCH_NAME = REL_3.8
+LIBSAI_BRONCOS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmpai/$(LIBSAI_BRONCOS_BRANCH_NAME)/$(LIBSAI_BRONCOS_VERSION)"
+LIBSAI_BRONCOS = libsaibroncos_$(LIBSAI_BRONCOS_VERSION)_amd64.deb
+$(LIBSAI_BRONCOS)_URL = "$(LIBSAI_BRONCOS_URL_PREFIX)/$(LIBSAI_BRONCOS)"
 
 ifneq ($($(LIBSAI_BRONCOS)_URL),)
 
diff --git a/platform/components/docker-gbsyncd-broncos/Dockerfile.j2 b/platform/components/docker-gbsyncd-broncos/Dockerfile.j2
index f114679c68..154c7735ce 100644
--- a/platform/components/docker-gbsyncd-broncos/Dockerfile.j2
+++ b/platform/components/docker-gbsyncd-broncos/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM docker-config-engine-bullseye
+FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 
 ARG docker_container_name
 RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf