diff --git a/platform/p4/docker-sonic-p4/startup.sh b/platform/p4/docker-sonic-p4/startup.sh
index 319ac8e578..e5221f8342 100755
--- a/platform/p4/docker-sonic-p4/startup.sh
+++ b/platform/p4/docker-sonic-p4/startup.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+echo "Set onie_platform to x86_64-barefoot_p4-r0"
+export onie_platform=x86_64-barefoot_p4-r0
+
 echo "Start rsyslog"
 service rsyslog start
 
diff --git a/src/sonic-swss b/src/sonic-swss
index 2054056673..96b5b523a0 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 205405667396f606d9560ed6d861063f35f07d94
+Subproject commit 96b5b523a0dedf237228b118f0420f117dca2a5b