diff --git a/tools/dev/bin/onos-setup-p4-dev b/tools/dev/bin/onos-setup-p4-dev
index 7f36d47..ac12c3d 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="4eeb8dad8e8f062636f9d0d8296aa7f288c6f6dd"
-PI_COMMIT="9fc50cd0a0187eb1346272524d4b8bafb51bb513"
+BMV2_COMMIT="44ac9c21636b00fed660ae8590889d85b5d4df4c"
+PI_COMMIT="a8814a8ac40838a9df83fe47a17a025b69026fcf"
 P4C_COMMIT="040b931fbfcb7912e3a14cd05df950fbdd49b038"
 PROTOBUF_COMMIT="tags/v3.0.2"
 GRPC_COMMIT="tags/v1.3.0"