diff --git a/providers/pcep/BUCK b/providers/pcep/BUCK
new file mode 100644
index 0000000..ccf3969
--- /dev/null
+++ b/providers/pcep/BUCK
@@ -0,0 +1,20 @@
+BUNDLES = [
+    '//providers/pcep/topology:onos-providers-pcep-topology',
+    '//providers/pcep/tunnel:onos-providers-pcep-tunnel',
+    '//protocols/pcep/api:onos-pcep-controller-api',
+    '//protocols/pcep/pcepio:onos-pcep-pcepio',
+]
+
+COMPILE_DEPS = [
+    '//lib:CORE_DEPS',
+]
+
+onos_app (
+    title = 'PCEP Provider',
+    category = 'Provider',
+    url = 'http://onosproject.org',
+    included_bundles = BUNDLES,
+    description = 'PCEP protocol providers root.',
+    required_apps = [ 'org.onosproject.pcep-api' ],
+)
+
diff --git a/providers/pcep/topology/BUCK b/providers/pcep/topology/BUCK
index 6f819d1..306fff8 100644
--- a/providers/pcep/topology/BUCK
+++ b/providers/pcep/topology/BUCK
@@ -1,32 +1,10 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-pcep-provider-topology'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//protocols/ovsdb/api:onos-ovsdb-api',
     '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
-    '//apps/pcep-api:onos-app-pcep-api',
+    '//apps/pcep-api:onos-apps-pcep-api',
 ]
 
-TEST_DEPS = [
-    '//lib:TEST',
-]
-
-osgi_jar(
-    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],
 )
diff --git a/providers/pcep/tunnel/BUCK b/providers/pcep/tunnel/BUCK
index 3bf97b6..f794963 100644
--- a/providers/pcep/tunnel/BUCK
+++ b/providers/pcep/tunnel/BUCK
@@ -1,14 +1,8 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-pcep-provider-tunnel'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//protocols/ovsdb/api:onos-ovsdb-api',
     '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
-    '//apps/pcep-api:onos-app-pcep-api',
+    '//apps/pcep-api:onos-apps-pcep-api',
     '//incubator/api:onos-incubator-api',
     '//protocols/pcep/pcepio:onos-pcep-pcepio',
     '//protocols/pcep/api:onos-pcep-controller-api',
@@ -18,18 +12,7 @@
     '//lib:TEST_ADAPTERS',
 ]
 
-osgi_jar(
-    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],
+    test_deps = TEST_DEPS,
 )
diff --git a/providers/rest/device/BUCK b/providers/rest/device/BUCK
index 92dabe8..d5a1f7d 100644
--- a/providers/rest/device/BUCK
+++ b/providers/rest/device/BUCK
@@ -8,7 +8,7 @@
     '//lib:CORE_DEPS',
     '//protocols/ovsdb/api:onos-ovsdb-api',
     '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
-    '//apps/pcep-api:onos-app-pcep-api',
+    '//apps/pcep-api:onos-apps-pcep-api',
     '//incubator/api:onos-incubator-api',
     '//protocols/rest/api:onos-restsb-api',
     '//lib:javax.ws.rs-api',