diff --git a/tools/build/buck-publish-package b/tools/build/buck-publish-package
index ae78285..a845ec7 100755
--- a/tools/build/buck-publish-package
+++ b/tools/build/buck-publish-package
@@ -15,14 +15,14 @@
 # build plugins
 
 pushd buck
-onos-buck build buck
+buck build buck
 popd #buck
 
 pushd onos
-onos-buck build //tools/build/buck-plugin:onos
+buck build //tools/build/buck-plugin:onos
 popd #onos
 
-pushd onos-yang-tools/compiler
+pushd onos-yang-tools
 mvn clean package
 popd #onos-yang-tools
 
@@ -32,7 +32,7 @@
 
 cp buck/buck-out/gen/programs/buck.pex $ZIP_STAGE/buck
 cp onos/buck-out/gen/tools/build/buck-plugin/onos.jar $ZIP_STAGE/plugins/onos.jar
-cp onos-yang-tools/compiler/plugin/buck/target/onos-yang-compiler-buck-plugin-*.jar $ZIP_STAGE/plugins/yang.jar
+cp onos-yang-tools/plugin/buck/target/onos-yang-buck-plugin-*.jar $ZIP_STAGE/plugins/yang.jar
 
 BUCK_VERSION=$(buck/buck-out/gen/programs/buck.pex -V)
 echo $BUCK_VERSION > $ZIP_STAGE/.buck_version
diff --git a/tools/build/onos-buck b/tools/build/onos-buck
index b82c110..de1fb8f 100755
--- a/tools/build/onos-buck
+++ b/tools/build/onos-buck
@@ -5,8 +5,8 @@
 
 set -e
 
-BUCK_URL="http://onlab.vicci.org/onos/third-party/buck-v2017.03.10.01.zip"
-BUCK_SHA="baa7bae077ef0e65b371525fd525a5763fef41c4"
+BUCK_URL="http://onlab.vicci.org/onos/third-party/buck-v2016.12.02.01.zip"
+BUCK_SHA="c7b1b46f998c08a175adec37f210c14092f84216"
 REQUIRED_VERSION="buck version c4e714c9c0c774cbb674c2fde0a4419824f0cfdb"
 
 [  "-U" = "$1" ] && shift && FORCE_UPDATE=True