diff --git a/platform/barefoot/bfn-platform.mk b/platform/barefoot/bfn-platform.mk
index ca33fb9fa3..b0d40cd8ba 100644
--- a/platform/barefoot/bfn-platform.mk
+++ b/platform/barefoot/bfn-platform.mk
@@ -1,5 +1,10 @@
-BFN_PLATFORM = bfnplatform_master.df38274.deb
-$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/vxlan_poc/bfnplatform_master.df38274.deb"
+ifdef BLDENV
+BFN_PLATFORM = bfnplatform_master.92171a1_deb9.deb
+$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/sde-master/bfnplatform_master.92171a1_deb9.deb"
+else
+BFN_PLATFORM = bfnplatform_master.92171a1_deb8.deb
+$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/sde-master/bfnplatform_master.92171a1_deb8.deb"
+endif
 
 SONIC_ONLINE_DEBS += $(BFN_PLATFORM) # $(BFN_SAI_DEV)
 $(BFN_SAI_DEV)_DEPENDS += $(BFN_PLATFORM)
diff --git a/platform/barefoot/bfn-sai.mk b/platform/barefoot/bfn-sai.mk
index 6b2cee9082..51c1e1a74f 100644
--- a/platform/barefoot/bfn-sai.mk
+++ b/platform/barefoot/bfn-sai.mk
@@ -1,5 +1,10 @@
-BFN_SAI = bfnsdk_master.df38274.deb
-$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/vxlan_poc/bfnsdk_master.df38274.deb"
+ifdef BLDENV
+BFN_SAI = bfnsdk_master.92171a1_deb9.deb
+$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/sde-master/bfnsdk_master.92171a1_deb9.deb"
+else
+BFN_SAI = bfnsdk_master.92171a1_deb8.deb
+$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/sde-master/bfnsdk_master.92171a1_deb8.deb"
+endif
 
 SONIC_ONLINE_DEBS += $(BFN_SAI) # $(BFN_SAI_DEV)
 $(BFN_SAI_DEV)_DEPENDS += $(BFN_SAI)
diff --git a/platform/barefoot/docker-syncd-bfn-rpc.mk b/platform/barefoot/docker-syncd-bfn-rpc.mk
index 61f5570c16..9ef1839b55 100644
--- a/platform/barefoot/docker-syncd-bfn-rpc.mk
+++ b/platform/barefoot/docker-syncd-bfn-rpc.mk
@@ -5,6 +5,7 @@ $(DOCKER_SYNCD_BFN_RPC)_PATH = $(PLATFORM_PATH)/docker-syncd-bfn-rpc
 $(DOCKER_SYNCD_BFN_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT)
 $(DOCKER_SYNCD_BFN_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BFN)
 SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC)
+SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BFN_RPC)
 ifeq ($(ENABLE_SYNCD_RPC),y)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC)
 endif
diff --git a/platform/barefoot/docker-syncd-bfn.mk b/platform/barefoot/docker-syncd-bfn.mk
index 22bb10763e..8fa7a30e2c 100644
--- a/platform/barefoot/docker-syncd-bfn.mk
+++ b/platform/barefoot/docker-syncd-bfn.mk
@@ -3,8 +3,9 @@
 DOCKER_SYNCD_BFN = docker-syncd-bfn.gz
 $(DOCKER_SYNCD_BFN)_PATH = $(PLATFORM_PATH)/docker-syncd-bfn
 $(DOCKER_SYNCD_BFN)_DEPENDS += $(SYNCD)
-$(DOCKER_SYNCD_BFN)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
+$(DOCKER_SYNCD_BFN)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
 SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN)
+SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BFN)
 ifneq ($(ENABLE_SYNCD_RPC),y)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN)
 endif
diff --git a/platform/barefoot/docker-syncd-bfn/Dockerfile.j2 b/platform/barefoot/docker-syncd-bfn/Dockerfile.j2
index 25c7872f64..73a12b8a05 100755
--- a/platform/barefoot/docker-syncd-bfn/Dockerfile.j2
+++ b/platform/barefoot/docker-syncd-bfn/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM docker-config-engine
+FROM docker-config-engine-stretch
 
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
@@ -11,7 +11,16 @@ debs/{{ deb }}{{' '}}
 {%- endfor -%}
 debs/
 
-RUN apt-get install -y libxml2 libpcap-dev libusb-1.0-0-dev libcurl3 libcurl4-gnutls-dev libunwind8-dev libpython3.4
+RUN apt-get install -y \
+        libxml2 \
+        libpcap-dev \
+        libusb-1.0-0-dev \
+        libcurl3 \
+        libcurl4-gnutls-dev \
+        libunwind8-dev \
+        libpython3.4 \
+        libc-ares2 \
+        libgoogle-perftools4
 
 RUN dpkg -i \
 {% for deb in docker_syncd_bfn_debs.split(' ') -%}
diff --git a/platform/barefoot/rules.mk b/platform/barefoot/rules.mk
index 99e96157ba..4c8ec0c23f 100644
--- a/platform/barefoot/rules.mk
+++ b/platform/barefoot/rules.mk
@@ -12,8 +12,8 @@ include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
 include $(PLATFORM_PATH)/docker-ptf-bfn.mk
 include $(PLATFORM_PATH)/bfn-platform.mk
-include $(PLATFORM_PATH)/bfn-platform-wnc.mk
-include $(PLATFORM_PATH)/bfn-platform-ingrasys.mk
+#include $(PLATFORM_PATH)/bfn-platform-wnc.mk
+#include $(PLATFORM_PATH)/bfn-platform-ingrasys.mk
 include $(PLATFORM_PATH)/bfn-modules.mk
 
 SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT) \
diff --git a/sonic-slave-stretch/Dockerfile b/sonic-slave-stretch/Dockerfile
index 9048cab082..5ad7f070b2 100644
--- a/sonic-slave-stretch/Dockerfile
+++ b/sonic-slave-stretch/Dockerfile
@@ -114,6 +114,13 @@ RUN apt-get update && apt-get install -y \
 # For mellanox sai build
         libtool-bin \
         libxml2-dev \
+# For BFN sdk build
+        libusb-1.0-0-dev \
+        libcurl3-nss-dev \
+        libunwind8-dev \
+        telnet \
+        libc-ares2 \
+        libgoogle-perftools4 \
 # For build image
         cpio \
         squashfs-tools \
diff --git a/sonic-slave/Dockerfile b/sonic-slave/Dockerfile
index 3c3b051f0a..a59d23b711 100644
--- a/sonic-slave/Dockerfile
+++ b/sonic-slave/Dockerfile
@@ -124,6 +124,8 @@ RUN apt-get update && apt-get install -y \
         libcurl3-nss-dev \
         libunwind8-dev \
         telnet \
+        libc-ares2 \
+        libgoogle-perftools4 \
 # For build image
         cpio \
         squashfs-tools \