diff --git a/BUCK b/BUCK
index 4da724a..17fe93f 100644
--- a/BUCK
+++ b/BUCK
@@ -1,34 +1,25 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-app-cord-mcast'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:javax.ws.rs-api',
     '//lib:jersey-client',
     '//lib:jersey-common',
     '//utils/rest:onlab-rest',
-    '//apps/olt:onos-app-olt-api',
+    '//apps/olt:onos-apps-olt-api',
 ]
 
-TEST_DEPS = [
-    '//lib:TEST',
+BUNDLES = [
+    '//apps/olt:onos-apps-olt-api',
+    '//apps/cordmcast:onos-apps-cordmcast',
 ]
 
-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 = 'CORD Multicast App',
+    category = 'Traffic Steering',
+    url = 'http://onosproject.org',
+    description = 'CORD Multicast application',
+    included_bundles = BUNDLES,
 )