diff --git a/providers/netconf/BUCK b/providers/netconf/BUCK
new file mode 100644
index 0000000..0675902
--- /dev/null
+++ b/providers/netconf/BUCK
@@ -0,0 +1,20 @@
+BUNDLES = [
+    '//providers/netconf/device:onos-providers-netconf-device',
+    '//protocols/netconf/api:onos-protocols-netconf-api',
+    '//protocols/netconf/ctl:onos-protocols-netconf-ctl',
+]
+
+EXCLUDED_BUNDLES = [
+    '//lib:ganymed-ssh2', # FIXME - Needs wrap
+]
+
+onos_app (
+    title = 'NETCONF Provider',
+    category = 'Provider',
+    url = 'http://onosproject.org',
+    included_bundles = BUNDLES,
+    excluded_bundles = EXCLUDED_BUNDLES,
+    description = 'NETCONF protocol southbound providers.',
+)
+
+
diff --git a/providers/netconf/device/BUCK b/providers/netconf/device/BUCK
index 74307dd..569ee07 100644
--- a/providers/netconf/device/BUCK
+++ b/providers/netconf/device/BUCK
@@ -1,17 +1,9 @@
-SRC = 'src/main/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-netconf-provider-device'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//incubator/api:onos-incubator-api',
-    '//protocols/netconf/api:onos-netconf-api',
+    '//protocols/netconf/api:onos-protocols-netconf-api',
 ]
 
 osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
-    visibility = ['PUBLIC'],
 )