diff --git a/tools/dev/bin/onos-setup-p4-dev b/tools/dev/bin/onos-setup-p4-dev
index 56eb6d3..b8483c5 100755
--- a/tools/dev/bin/onos-setup-p4-dev
+++ b/tools/dev/bin/onos-setup-p4-dev
@@ -15,8 +15,8 @@
 set -e
 
 BUILD_DIR=~/p4tools
-BMV2_COMMIT="1683392d8859907b8367cc0188d3d4ed8bea268c"
-PI_COMMIT="6b47641344c2b0bc77e51876517b98eda51eda45"
+BMV2_COMMIT="4eeb8dad8e8f062636f9d0d8296aa7f288c6f6dd"
+PI_COMMIT="9fc50cd0a0187eb1346272524d4b8bafb51bb513"
 P4C_COMMIT="55067fd0e5f9e25fef06e58e49033da3493f796d"
 PROTOBUF_COMMIT="tags/v3.0.2"
 GRPC_COMMIT="tags/v1.3.0"