diff --git a/apps/l3vpn/BUCK b/apps/l3vpn/BUCK
index 4e6aaf3..b34eb4c 100644
--- a/apps/l3vpn/BUCK
+++ b/apps/l3vpn/BUCK
@@ -25,17 +25,18 @@
     'org.onosproject.models.l3vpn',
 ]
 
-osgi_jar_with_tests(
-    deps = COMPILE_DEPS,
-    test_deps = TEST_DEPS,
-)
+#Removed until this app builds with onos-yang-tools 2.1
+#osgi_jar_with_tests(
+#    deps = COMPILE_DEPS,
+#    test_deps = TEST_DEPS,
+#)
 
-onos_app(
-    app_name = 'org.onosproject.l3vpn',
-    title = 'YANG L3VPN App',
-    category = 'Traffic Steering',
-    url = 'http://onosproject.org',
-    description = 'L3VPN YANG Application',
-    required_apps = APPS,
-)
+#onos_app(
+#    app_name = 'org.onosproject.l3vpn',
+#    title = 'YANG L3VPN App',
+#    category = 'Traffic Steering',
+#    url = 'http://onosproject.org',
+#    description = 'L3VPN YANG Application',
+#    required_apps = APPS,
+#)
 
diff --git a/apps/openroadm/network/src/main/java/org/onosproject/openroadm/network/OpenRoadmNetworkModelRegistrator.java b/apps/openroadm/network/src/main/java/org/onosproject/openroadm/network/OpenRoadmNetworkModelRegistrator.java
index d7a52b2..b9e5d8e 100644
--- a/apps/openroadm/network/src/main/java/org/onosproject/openroadm/network/OpenRoadmNetworkModelRegistrator.java
+++ b/apps/openroadm/network/src/main/java/org/onosproject/openroadm/network/OpenRoadmNetworkModelRegistrator.java
@@ -18,15 +18,15 @@
 import com.google.common.collect.ImmutableMap;
 import org.apache.felix.scr.annotations.Component;
 import org.onosproject.yang.AbstractYangModelRegistrator;
-import org.onosproject.yang.gen.v1.http.org.openroadm.common.types.rev20161014.OrgOpenroadmCommonTypes;
-import org.onosproject.yang.gen.v1.http.org.openroadm.degree.rev20161014.OrgOpenroadmDegree;
-import org.onosproject.yang.gen.v1.http.org.openroadm.equipment.states.types.rev20161014.OrgOpenroadmEquipmentStatesTypes;
-import org.onosproject.yang.gen.v1.http.org.openroadm.external.pluggable.rev20161014.OrgOpenroadmExternalPluggable;
-import org.onosproject.yang.gen.v1.http.org.openroadm.network.rev20161014.OrgOpenroadmNetwork;
-import org.onosproject.yang.gen.v1.http.org.openroadm.roadm.rev20161014.OrgOpenroadmRoadm;
-import org.onosproject.yang.gen.v1.http.org.openroadm.srg.rev20161014.OrgOpenroadmSrg;
-import org.onosproject.yang.gen.v1.http.org.openroadm.xponder.rev20161014.OrgOpenroadmXponder;
-import org.onosproject.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev20130715.IetfInetTypes;
+import org.onosproject.yang.gen.v1.ietfinettypes.rev20130715.IetfInetTypes;
+import org.onosproject.yang.gen.v1.orgopenroadmcommontypes.rev20161014.OrgOpenroadmCommonTypes;
+import org.onosproject.yang.gen.v1.orgopenroadmdegree.rev20161014.OrgOpenroadmDegree;
+import org.onosproject.yang.gen.v1.orgopenroadmequipmentstatestypes.rev20161014.OrgOpenroadmEquipmentStatesTypes;
+import org.onosproject.yang.gen.v1.orgopenroadmexternalpluggable.rev20161014.OrgOpenroadmExternalPluggable;
+import org.onosproject.yang.gen.v1.orgopenroadmnetwork.rev20161014.OrgOpenroadmNetwork;
+import org.onosproject.yang.gen.v1.orgopenroadmroadm.rev20161014.OrgOpenroadmRoadm;
+import org.onosproject.yang.gen.v1.orgopenroadmsrg.rev20161014.OrgOpenroadmSrg;
+import org.onosproject.yang.gen.v1.orgopenroadmxponder.rev20161014.OrgOpenroadmXponder;
 import org.onosproject.yang.model.DefaultYangModuleId;
 import org.onosproject.yang.model.YangModuleId;
 import org.onosproject.yang.runtime.AppModuleInfo;
diff --git a/apps/openroadm/service/src/main/java/org/onosproject/openroadm/service/OpenRoadmServiceModelRegistrator.java b/apps/openroadm/service/src/main/java/org/onosproject/openroadm/service/OpenRoadmServiceModelRegistrator.java
index f5f68b6..317d980 100644
--- a/apps/openroadm/service/src/main/java/org/onosproject/openroadm/service/OpenRoadmServiceModelRegistrator.java
+++ b/apps/openroadm/service/src/main/java/org/onosproject/openroadm/service/OpenRoadmServiceModelRegistrator.java
@@ -18,15 +18,15 @@
 import com.google.common.collect.ImmutableMap;
 import org.apache.felix.scr.annotations.Component;
 import org.onosproject.yang.AbstractYangModelRegistrator;
-import org.onosproject.yang.gen.v1.http.org.openroadm.common.service.types.rev20161014.OrgOpenroadmCommonServiceTypes;
-import org.onosproject.yang.gen.v1.http.org.openroadm.common.types.rev20161014.OrgOpenroadmCommonTypes;
-import org.onosproject.yang.gen.v1.http.org.openroadm.resource.rev20161014.OrgOpenroadmResource;
-import org.onosproject.yang.gen.v1.http.org.openroadm.resource.types.rev20161014.OrgOpenroadmResourceTypes;
-import org.onosproject.yang.gen.v1.http.org.openroadm.routing.constrains.rev20161014.OrgOpenroadmRoutingConstraints;
-import org.onosproject.yang.gen.v1.http.org.openroadm.service.rev20161014.OrgOpenroadmService;
-import org.onosproject.yang.gen.v1.http.org.openroadm.topology.rev20161014.OrgOpenroadmTopology;
-import org.onosproject.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev20130715.IetfInetTypes;
-import org.onosproject.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev20130715.IetfYangTypes;
+import org.onosproject.yang.gen.v1.ietfinettypes.rev20130715.IetfInetTypes;
+import org.onosproject.yang.gen.v1.ietfyangtypes.rev20130715.IetfYangTypes;
+import org.onosproject.yang.gen.v1.orgopenroadmcommonservicetypes.rev20161014.OrgOpenroadmCommonServiceTypes;
+import org.onosproject.yang.gen.v1.orgopenroadmcommontypes.rev20161014.OrgOpenroadmCommonTypes;
+import org.onosproject.yang.gen.v1.orgopenroadmresource.rev20161014.OrgOpenroadmResource;
+import org.onosproject.yang.gen.v1.orgopenroadmresourcetypes.rev20161014.OrgOpenroadmResourceTypes;
+import org.onosproject.yang.gen.v1.orgopenroadmroutingconstraints.rev20161014.OrgOpenroadmRoutingConstraints;
+import org.onosproject.yang.gen.v1.orgopenroadmservice.rev20161014.OrgOpenroadmService;
+import org.onosproject.yang.gen.v1.orgopenroadmtopology.rev20161014.OrgOpenroadmTopology;
 import org.onosproject.yang.model.DefaultYangModuleId;
 import org.onosproject.yang.model.YangModuleId;
 import org.onosproject.yang.runtime.AppModuleInfo;
diff --git a/drivers/huawei/BUCK b/drivers/huawei/BUCK
index ccbe21e..a98299b 100644
--- a/drivers/huawei/BUCK
+++ b/drivers/huawei/BUCK
@@ -31,18 +31,19 @@
     '//utils/osgi:onlab-osgi-tests',
 ]
 
-osgi_jar_with_tests(
-    deps = COMPILE_DEPS,
-    test_deps = TEST_DEPS,
-    resources_root = 'src/main/resources',
-    resources = glob(['src/main/resources/**']),
-)
+#Removed until this app builds with onos-yang-tools 2.1
+#osgi_jar_with_tests(
+#    deps = COMPILE_DEPS,
+#    test_deps = TEST_DEPS,
+#    resources_root = 'src/main/resources',
+#    resources = glob(['src/main/resources/**']),
+#)
 
-onos_app(
-    app_name = 'org.onosproject.drivers.huawei',
-    title = 'Huawei Device Drivers',
-    category = 'Drivers',
-    url = 'http://onosproject.org',
-    description = 'ONOS Huawei Device Drivers application.',
-    required_apps = APPS
-)
\ No newline at end of file
+#onos_app(
+#    app_name = 'org.onosproject.drivers.huawei',
+#    title = 'Huawei Device Drivers',
+#    category = 'Drivers',
+#    url = 'http://onosproject.org',
+#    description = 'ONOS Huawei Device Drivers application.',
+#    required_apps = APPS
+#)
\ No newline at end of file
diff --git a/modules.defs b/modules.defs
index 9d0b53e..117ef0e 100644
--- a/modules.defs
+++ b/modules.defs
@@ -96,7 +96,8 @@
     '//drivers/juniper:onos-drivers-juniper-oar',
     '//drivers/lisp:onos-drivers-lisp-oar',
     '//drivers/flowspec:onos-drivers-flowspec-oar',
-    '//drivers/huawei:onos-drivers-huawei-oar',
+#    Removed until it compiles against onos-yang-tools 2.1
+#    '//drivers/huawei:onos-drivers-huawei-oar',
 #   Removed until we can handle v1.12 of onos-yang-tools - in the mean time build manually with Maven
 #   '//drivers/microsemi/ea1000driver:onos-drivers-microsemi-ea1000driver-oar',
     '//drivers/oplink:onos-drivers-oplink-oar',
@@ -196,14 +197,16 @@
     '//apps/yang-gui:onos-apps-yang-gui-oar',
     '//apps/cord-support:onos-apps-cord-support-oar',
     '//apps/network-troubleshoot:onos-apps-network-troubleshoot-oar',
-    '//apps/l3vpn:onos-apps-l3vpn-oar',
+#    Removed until it compiles against onos-yang-tools 2.1
+#    '//apps/l3vpn:onos-apps-l3vpn-oar',
     '//apps/openroadm:onos-apps-openroadm-oar',
 ]
 
 MODELS = [
     '//models/huawei:onos-models-huawei-oar',
     '//models/openroadm:onos-models-openroadm-oar',
-    '//models/l3vpn:onos-models-l3vpn-oar',
+#    Removed until it compiles against onos-yang-tools 2.1
+#    '//models/l3vpn:onos-models-l3vpn-oar',
 ]
 
 APP_JARS = [
diff --git a/tools/build/onos-buck b/tools/build/onos-buck
index 1153958..97da071 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.05.09.01.zip"
-BUCK_SHA="fd5179b9945194bdea3d6fe141f7746af03bb2bd"
+BUCK_URL="http://onlab.vicci.org/onos/third-party/buck-v2017.05.25.01.zip"
+BUCK_SHA="3803bc4ee74504e8c590dac5943c9abaf6ba6157"
 
 [  "-U" = "$1" ] && shift && FORCE_UPDATE=True