diff --git a/platform/barefoot/bfn-platform-wnc.mk b/platform/barefoot/bfn-platform-wnc.mk
new file mode 100644
index 0000000000..57ef0e1421
--- /dev/null
+++ b/platform/barefoot/bfn-platform-wnc.mk
@@ -0,0 +1,5 @@
+BFN_PLATFORM = bfnplatformwnc_1.0.0_amd64.deb
+$(BFN_PLATFORM)_URL = "https://github.com/YaoTien/download/raw/master/sonic/sde/7_0_0_18/bfnplatformwnc_1.0.0_amd64.deb"
+
+SONIC_ONLINE_DEBS += $(BFN_WNC_PLATFORM) # $(BFN_SAI_DEV)
+$(BFN_SAI_DEV)_DEPENDS += $(BFN_WNC_PLATFORM)
diff --git a/platform/barefoot/bfn-platform.mk b/platform/barefoot/bfn-platform.mk
index b5c67a3fd3..0851626880 100644
--- a/platform/barefoot/bfn-platform.mk
+++ b/platform/barefoot/bfn-platform.mk
@@ -1,5 +1,6 @@
 BFN_PLATFORM = bfnplatform_1.0.0_amd64.deb
-$(BFN_PLATFORM)_URL = "https://github.com/YaoTien/download/blob/master/sonic/sde/7_0_0_18/bfnplatform_1.0.0_amd64.deb"
+#$(BFN_PLATFORM)_URL =	"https://github.com/barefootnetworks/sonic-release-pkgs/raw/rel_7_0/bfnplatform_1.0.0_amd64.deb"
+$(BFN_PLATFORM)_URL = "https://github.com/YaoTien/download/raw/master/sonic/sde/7_0_0_18/bfnplatform_1.0.0_amd64.deb"
 
 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 28abac7e90..87b374d3a3 100644
--- a/platform/barefoot/bfn-sai.mk
+++ b/platform/barefoot/bfn-sai.mk
@@ -1,5 +1,6 @@
 BFN_SAI = bfnsdk_1.0.0_amd64.deb
-$(BFN_SAI)_URL =	"https://github.com/YaoTien/download/blob/master/sonic/sde/7_0_0_18/bfnsdk_1.0.0_amd64.deb"
+#$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/rel_7_0/bfnsdk_1.0.0_amd64.deb"
+$(BFN_SAI)_URL = "https://github.com/YaoTien/download/raw/master/sonic/sde/7_0_0_18/bfnsdk_1.0.0_amd64.deb"
 # $(BFN_SAI_DEV)_URL =	"https://www.dropbox.com/s/4ljk6hzw82rudsr/bfnsdk_1.0.0_amd64.deb?dl=0"
 
 SONIC_ONLINE_DEBS += $(BFN_SAI) # $(BFN_SAI_DEV)
diff --git a/platform/barefoot/one-image.mk b/platform/barefoot/one-image.mk
index b6dc08aa96..8dc12e9fa8 100644
--- a/platform/barefoot/one-image.mk
+++ b/platform/barefoot/one-image.mk
@@ -3,8 +3,8 @@
 SONIC_ONE_IMAGE = sonic-barefoot.bin
 $(SONIC_ONE_IMAGE)_MACHINE = barefoot
 $(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
-#$(SONIC_ONE_IMAGE)_INSTALLS += $(BFN_PLATFORM_MODULE) 
-#$(SONIC_ONE_IMAGE)_INSTALLS += $(BFN_MONTARA_PLATFORM_MODULE)
+$(SONIC_ONE_IMAGE)_INSTALLS += $(BFN_PLATFORM_MODULE) 
+$(SONIC_ONE_IMAGE)_INSTALLS += $(BFN_MONTARA_PLATFORM_MODULE)
 $(SONIC_ONE_IMAGE)_INSTALLS += $(WNC_OSW1800_PLATFORM_MODULE) 
 $(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
 SONIC_INSTALLERS += $(SONIC_ONE_IMAGE)
diff --git a/platform/barefoot/rules.mk b/platform/barefoot/rules.mk
index c339b81699..a482c1d12f 100644
--- a/platform/barefoot/rules.mk
+++ b/platform/barefoot/rules.mk
@@ -10,12 +10,13 @@ include $(PLATFORM_PATH)/libsaithrift-dev.mk
 include $(PLATFORM_PATH)/python-saithrift.mk
 include $(PLATFORM_PATH)/docker-ptf-bfn.mk
 include $(PLATFORM_PATH)/bfn-platform.mk
+include $(PLATFORM_PATH)/bfn-platform-wnc.mk
 
 SONIC_ALL += $(SONIC_ONE_IMAGE) \
              $(DOCKER_FPM)
 
 # Inject sai into sairedis
-$(LIBSAIREDIS)_DEPENDS += $(BFN_SAI)  $(BFN_PLATFORM)#$(LIBSAITHRIFT_DEV_BFN)
+$(LIBSAIREDIS)_DEPENDS += $(BFN_SAI) $(BFN_PLATFORM) $(BFN_WNC_PLATFORM)#$(LIBSAITHRIFT_DEV_BFN)
 
 # Runtime dependency on sai is set only for syncd
-$(SYNCD)_RDEPENDS += $(BFN_SAI) $(BFN_PLATFORM)
+$(SYNCD)_RDEPENDS += $(BFN_SAI) $(BFN_PLATFORM) $(BFN_WNC_PLATFORM)