diff --git a/tools/dev/bin/onos-setup-p4-dev b/tools/dev/bin/onos-setup-p4-dev
index ac12c3d..5450651 100755
--- a/tools/dev/bin/onos-setup-p4-dev
+++ b/tools/dev/bin/onos-setup-p4-dev
@@ -15,10 +15,10 @@
 set -e
 
 BUILD_DIR=~/p4tools
-BMV2_COMMIT="44ac9c21636b00fed660ae8590889d85b5d4df4c"
-PI_COMMIT="a8814a8ac40838a9df83fe47a17a025b69026fcf"
+BMV2_COMMIT="d930fa2818d8ed71f3bf36eaf3f3687d9b68184f"
+PI_COMMIT="13d611a9c655938676ebcde2bd5653b461f46ca7"
 P4C_COMMIT="040b931fbfcb7912e3a14cd05df950fbdd49b038"
-PROTOBUF_COMMIT="tags/v3.0.2"
+PROTOBUF_COMMIT="tags/v3.2.0"
 GRPC_COMMIT="tags/v1.3.0"
 
 NUM_CORES=`grep -c ^processor /proc/cpuinfo`