diff --git a/BUCK b/BUCK
index c5663b2..5503e80 100644
--- a/BUCK
+++ b/BUCK
@@ -89,6 +89,8 @@
     '//apps/acl:onos-apps-acl-oar',
     '//apps/bgprouter:onos-apps-bgprouter-oar',
     '//apps/proxyarp:onos-apps-proxyarp-oar',
+    '//apps/segmentrouting:onos-apps-segmentrouting-oar',
+    '//apps/gangliametrics:onos-apps-gangliametrics-oar',
 ]
 
 APP_JARS = [
@@ -111,7 +113,6 @@
     '//apps/olt:onos-app-olt-app',
     '//apps/iptopology-api:onos-app-iptopology-api',
     '//apps/metrics:onos-app-metrics',
-    '//apps/gangliametrics:onos-app-ganglia',
     '//apps/graphitemetrics:onos-app-graphite',
     '//apps/mfwd:onos-app-mfwd',
     '//apps/mlb:onos-app-mlb',
@@ -125,7 +126,6 @@
     '//apps/pim:onos-app-pim',
     '//apps/routing:onos-apps-routing',
     '//apps/sdnip:onos-app-sdnip',
-    '//apps/segmentrouting:onos-app-segmentrouting',
     '//apps/test:onos-app-test',
     '//apps/vtn:onos-app-vtn',
     '//apps/virtualbng:onos-app-virtualbng',
diff --git a/apps/gangliametrics/BUCK b/apps/gangliametrics/BUCK
index 3336db7..6047cfa 100644
--- a/apps/gangliametrics/BUCK
+++ b/apps/gangliametrics/BUCK
@@ -1,31 +1,24 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-app-ganglia'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:gmetric4j',
     '//lib:metrics-ganglia',
+    '//lib:remotetea-oncrpc',
 ]
 
-TEST_DEPS = [
-    '//lib:TEST',
+EXCLUDED_BUNDLES = [
+    '//lib:gmetric4j',
+    '//lib:metrics-ganglia',
+    '//lib:remotetea-oncrpc',
 ]
 
-java_library(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
     deps = COMPILE_DEPS,
-    visibility = ['PUBLIC'],
 )
 
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
+onos_app (
+    title = 'Ganglia Report and Query App',
+    category = 'Monitoring',
+    url = 'http://onosproject.org',
+    description = 'Performance metric service reporter',
+    excluded_bundles = EXCLUDED_BUNDLES,
 )
diff --git a/apps/segmentrouting/BUCK b/apps/segmentrouting/BUCK
index 0aeaa89..b659b86 100644
--- a/apps/segmentrouting/BUCK
+++ b/apps/segmentrouting/BUCK
@@ -1,9 +1,3 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-app-segmentrouting'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:org.apache.karaf.shell.console',
@@ -18,22 +12,14 @@
     '//lib:TEST_ADAPTERS',
 ]
 
-java_library(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
     deps = COMPILE_DEPS,
-    visibility = ['PUBLIC'],
-    resources_root = 'src/main/resources',
-    resources = glob(['src/main/resources/**']),
+    test_deps = TEST_DEPS,
 )
 
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-    resources_root = 'src/test/resources',
-    resources = glob(['src/test/resources/**']),
+onos_app (
+    title = 'Proxy ARP/NDP App',
+    category = 'Traffic Steering',
+    url = 'http://onosproject.org',
+    description = 'Proxy ARP/NDP application.',
 )
diff --git a/bucklets/maven_jar.bucklet b/bucklets/maven_jar.bucklet
index 79f6a89..35af13d 100644
--- a/bucklets/maven_jar.bucklet
+++ b/bucklets/maven_jar.bucklet
@@ -49,6 +49,7 @@
     prebuilt_jar(
             name = name,
             binary_jar = ':%s-jar' % name,
+            maven_coords = id,
             visibility = [ 'PUBLIC' ]
     )
 
diff --git a/lib/BUCK b/lib/BUCK
index cfc2bfd..801b07b 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -943,3 +943,10 @@
   url = 'http://onlab.vicci.org/onos/third-party/checkstyle-6.11.2-all.jar',
   sha1 = 'f504187b1743e73ffe72c2eede0ff57d45536b7d'
 )
+
+maven_jar(
+  name = 'remotetea-oncrpc',
+  id = 'org.acplt.remotetea:remotetea-oncrpc:1.1.3',
+  sha1 = '2f7d94c5179b0267a882259a03a83eaa320cbcce',
+  license = 'Apache2.0',
+)