diff --git a/lib/BUCK b/lib/BUCK
index f1774fc..ce7e0a6 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Mon, 21 Aug 2017 15:52:00 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Thu, 24 Aug 2017 21:35:03 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 pass_thru_pom(
@@ -1269,55 +1269,55 @@
 
 remote_jar (
   name = 'onos-yang-model',
-  out = 'onos-yang-model-2.2.0-b4.jar',
-  url = 'mvn:org.onosproject:onos-yang-model:jar:2.2.0-b4',
-  sha1 = 'a1ebb2e81770b2c55cfc2fd9f6e935403bf329b7',
-  maven_coords = 'org.onosproject:onos-yang-model:2.2.0-b4',
+  out = 'onos-yang-model-2.2.0-b6.jar',
+  url = 'mvn:org.onosproject:onos-yang-model:jar:2.2.0-b6',
+  sha1 = 'a84fe63b3244e5e919a378d8c09aff5462130bf1',
+  maven_coords = 'org.onosproject:onos-yang-model:2.2.0-b6',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'onos-yang-compiler-api',
-  out = 'onos-yang-compiler-api-2.2.0-b4.jar',
-  url = 'mvn:org.onosproject:onos-yang-compiler-api:jar:2.2.0-b4',
-  sha1 = 'b0d7f8569dc14c2444c20b32aebc133be4b31719',
-  maven_coords = 'org.onosproject:onos-yang-compiler-api:2.2.0-b4',
+  out = 'onos-yang-compiler-api-2.2.0-b6.jar',
+  url = 'mvn:org.onosproject:onos-yang-compiler-api:jar:2.2.0-b6',
+  sha1 = '9f6151b00b98cff6d41f123b3198b4c5a12007c6',
+  maven_coords = 'org.onosproject:onos-yang-compiler-api:2.2.0-b6',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'onos-yang-runtime',
-  out = 'onos-yang-runtime-2.2.0-b4.jar',
-  url = 'mvn:org.onosproject:onos-yang-runtime:jar:2.2.0-b4',
-  sha1 = '82eeb6c0ecd3e9181f08e6309364e008efd90c73',
-  maven_coords = 'org.onosproject:onos-yang-runtime:2.2.0-b4',
+  out = 'onos-yang-runtime-2.2.0-b6.jar',
+  url = 'mvn:org.onosproject:onos-yang-runtime:jar:2.2.0-b6',
+  sha1 = '41d0382fb1d43cf380b47f081f0007596ae85a55',
+  maven_coords = 'org.onosproject:onos-yang-runtime:2.2.0-b6',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'onos-yang-serializers-json',
-  out = 'onos-yang-serializers-json-2.2.0-b4.jar',
-  url = 'mvn:org.onosproject:onos-yang-serializers-json:jar:2.2.0-b4',
-  sha1 = 'ca24ff1719a3a546220b5a5346d8602fd955026c',
-  maven_coords = 'org.onosproject:onos-yang-serializers-json:2.2.0-b4',
+  out = 'onos-yang-serializers-json-2.2.0-b6.jar',
+  url = 'mvn:org.onosproject:onos-yang-serializers-json:jar:2.2.0-b6',
+  sha1 = '644ad68650897fb08a683541684d1f6e4c531551',
+  maven_coords = 'org.onosproject:onos-yang-serializers-json:2.2.0-b6',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'onos-yang-serializers-xml',
-  out = 'onos-yang-serializers-xml-2.2.0-b4.jar',
-  url = 'mvn:org.onosproject:onos-yang-serializers-xml:jar:2.2.0-b4',
-  sha1 = '0ecfff253688a2d11574e34f3edf14a8bef25790',
-  maven_coords = 'org.onosproject:onos-yang-serializers-xml:2.2.0-b4',
+  out = 'onos-yang-serializers-xml-2.2.0-b6.jar',
+  url = 'mvn:org.onosproject:onos-yang-serializers-xml:jar:2.2.0-b6',
+  sha1 = '569a2cc659f84e8c52b5ef66cd028483cd677846',
+  maven_coords = 'org.onosproject:onos-yang-serializers-xml:2.2.0-b6',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'onos-yang-serializers-utils',
-  out = 'onos-yang-serializers-utils-2.2.0-b4.jar',
-  url = 'mvn:org.onosproject:onos-yang-serializers-utils:jar:2.2.0-b4',
-  sha1 = 'e48c4b374fce66defa1fbe23e9d60e3e78cb48de',
-  maven_coords = 'org.onosproject:onos-yang-serializers-utils:2.2.0-b4',
+  out = 'onos-yang-serializers-utils-2.2.0-b6.jar',
+  url = 'mvn:org.onosproject:onos-yang-serializers-utils:jar:2.2.0-b6',
+  sha1 = '38cadd39f1474c86726aa6f2d54991d2f4f60637',
+  maven_coords = 'org.onosproject:onos-yang-serializers-utils:2.2.0-b6',
   visibility = [ 'PUBLIC' ],
 )
 
diff --git a/lib/deps.json b/lib/deps.json
index 1dd3852..640f630 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -240,12 +240,12 @@
     "onos-yang-datamodel": "mvn:org.onosproject:onos-yang-datamodel:1.11",
     "onos-yang-maven-plugin": "mvn:org.onosproject:onos-yang-maven-plugin:1.11",
     "onos-yang-utils-generator": "mvn:org.onosproject:onos-yang-utils-generator:1.11",
-    "onos-yang-model":"mvn:org.onosproject:onos-yang-model:2.2.0-b4",
-    "onos-yang-compiler-api":"mvn:org.onosproject:onos-yang-compiler-api:2.2.0-b4",
-    "onos-yang-runtime":"mvn:org.onosproject:onos-yang-runtime:2.2.0-b4",
-    "onos-yang-serializers-json":"mvn:org.onosproject:onos-yang-serializers-json:2.2.0-b4",
-    "onos-yang-serializers-xml":"mvn:org.onosproject:onos-yang-serializers-xml:2.2.0-b4",
-    "onos-yang-serializers-utils":"mvn:org.onosproject:onos-yang-serializers-utils:2.2.0-b4",
+    "onos-yang-model":"mvn:org.onosproject:onos-yang-model:2.2.0-b6",
+    "onos-yang-compiler-api":"mvn:org.onosproject:onos-yang-compiler-api:2.2.0-b6",
+    "onos-yang-runtime":"mvn:org.onosproject:onos-yang-runtime:2.2.0-b6",
+    "onos-yang-serializers-json":"mvn:org.onosproject:onos-yang-serializers-json:2.2.0-b6",
+    "onos-yang-serializers-xml":"mvn:org.onosproject:onos-yang-serializers-xml:2.2.0-b6",
+    "onos-yang-serializers-utils":"mvn:org.onosproject:onos-yang-serializers-utils:2.2.0-b6",
     "org.apache.servicemix.bundles.dom4j":"mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:1.6.1_5",
     "plexus-utils": "mvn:org.codehaus.plexus:plexus-utils:3.0.24",
     "sshd-core": "mvn:org.apache.sshd:sshd-core:1.4.0",
diff --git a/lib/pom.xml b/lib/pom.xml
index 6a8fe79..5759aa4 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -40,7 +40,7 @@
         <netty4.version>4.1.8.Final</netty4.version>
         <openflowj.version>3.2.0.onos</openflowj.version>
         <onos-maven-plugin.version>1.10</onos-maven-plugin.version>
-        <onos-yang-tools.version>2.2.0-b4</onos-yang-tools.version>
+        <onos-yang-tools.version>2.2.0-b6</onos-yang-tools.version>
         <osgi.version>5.0.0</osgi.version>
         <karaf.version>3.0.8</karaf.version>
         <jersey.version>2.25.1</jersey.version>
diff --git a/tools/build/onos-buck b/tools/build/onos-buck
index 3c3e47b..9ed162b 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.08.16.01.zip"
-BUCK_SHA="1d6d073c7010432095b0f71b98253155b4fed090"
+BUCK_URL="http://onlab.vicci.org/onos/third-party/buck-v2017.08.24.01.zip"
+BUCK_SHA="3b8dcb39f8ece99db3b4e77815b1ddf05e04d77a"
 
 [  "-U" = "$1" ] && shift && FORCE_UPDATE=True