diff --git a/apps/tenbi/BUCK b/apps/tenbi/BUCK
index 30ed481..461fddd 100644
--- a/apps/tenbi/BUCK
+++ b/apps/tenbi/BUCK
@@ -11,8 +11,8 @@
     url = 'http://onosproject.org',
     included_bundles = BUNDLES,
     description = 'TE YANG NBI.',
-    required_apps = [ 'org.onosproject.onos-app-tetopology',
-                      'org.onosproject.onos-app-tetunnel',
-                      'org.onosproject.onos-app-yms' ],
+    required_apps = [ 'org.onosproject.tetopology',
+                      'org.onosproject.tetunnel',
+                      'org.onosproject.yms' ],
 )
 
diff --git a/apps/tenbi/yangmodel/BUCK b/apps/tenbi/yangmodel/BUCK
index 4422110..3ee4e7d 100644
--- a/apps/tenbi/yangmodel/BUCK
+++ b/apps/tenbi/yangmodel/BUCK
@@ -2,7 +2,7 @@
   '//lib:CORE_DEPS'
 ]
 
-yang_library(
+yang_osgi_jar(
   deps = COMPILE_DEPS,
   name = 'onos-apps-tenbi-yangmodel',
   srcs = glob(['src/main/**/*.yang']),
diff --git a/apps/yms/app/pom.xml b/apps/yms/app/pom.xml
index 5da851d..1b6f0d4 100644
--- a/apps/yms/app/pom.xml
+++ b/apps/yms/app/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-yang-utils-generator</artifactId>
-            <version>1.10</version>
+            <version>1.11</version>
         </dependency>
     </dependencies>
 
diff --git a/apps/yms/pom.xml b/apps/yms/pom.xml
index a351876..1c1b65e 100644
--- a/apps/yms/pom.xml
+++ b/apps/yms/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-yang-datamodel</artifactId>
-            <version>1.10</version>
+            <version>1.11</version>
         </dependency>
     </dependencies>