diff --git a/apps/config/BUILD b/apps/config/BUILD
new file mode 100644
index 0000000..9421e3a
--- /dev/null
+++ b/apps/config/BUILD
@@ -0,0 +1,23 @@
+APPS = [
+    "org.onosproject.yang",
+]
+
+COMPILE_DEPS = CORE_DEPS + KRYO + CLI + ONOS_YANG + [
+    "//core/store/serializers:onos-core-serializers",
+    "@commons_text//jar",
+]
+
+osgi_jar_with_tests(
+    deps = COMPILE_DEPS,
+)
+
+onos_app(
+    category = "Utility",
+    description = "Provides means to track and distribute service and device configuration data " +
+                  "throughout the ONOS cluster. It works with the YANG runtime to ensure that the tracked " +
+                  "data adheres to the registered YANG models. Applications can traverse and access this " +
+                  "data which is organized in a logically unified tree.<p/>(Under development)",
+    required_apps = APPS,
+    title = "Dynamic Configuration",
+    url = "http://onosproject.org",
+)
diff --git a/apps/netconf/client/BUILD b/apps/netconf/client/BUILD
new file mode 100644
index 0000000..24b9fe3
--- /dev/null
+++ b/apps/netconf/client/BUILD
@@ -0,0 +1,25 @@
+APPS = [
+    "org.onosproject.yang",
+    "org.onosproject.config",
+    "org.onosproject.netconf",
+]
+
+COMPILE_DEPS = CORE_DEPS + ONOS_YANG + [
+    "@onos_yang_runtime//jar",
+    "//apps/config:onos-apps-config",
+    "//protocols/netconf/api:onos-protocols-netconf-api",
+]
+
+osgi_jar_with_tests(
+    deps = COMPILE_DEPS,
+)
+
+onos_app(
+    app_name = "org.onosproject.netconfsb",
+    category = "Protocol",
+    description = "Exposes APIs to establish NETCONF connections to devices and to send and receive " +
+                  "messages and asynchronous notifications over such connection.",
+    required_apps = APPS,
+    title = "NETCONF Protocol Subsystem",
+    url = "http://onosproject.org",
+)
diff --git a/modules.bzl b/modules.bzl
index 3fdd110..223cc9b 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -204,10 +204,10 @@
     #    '//apps/yms:onos-apps-yms-oar',
     #"//apps/ofagent:onos-apps-ofagent-oar",
     "//apps/mappingmanagement:onos-apps-mappingmanagement-oar",
-    #"//apps/config:onos-apps-config-oar",
+    "//apps/config:onos-apps-config-oar",
     #"//apps/configsync:onos-apps-configsync-oar",
     #"//apps/configsync-netconf:onos-apps-configsync-netconf-oar",
-    #"//apps/netconf/client:onos-apps-netconf-client-oar",
+    "//apps/netconf/client:onos-apps-netconf-client-oar",
     #"//apps/tetopology:onos-apps-tetopology-oar",
     #"//apps/tetunnel:onos-apps-tetunnel-oar",
     #    '//apps/tenbi/yangmodel:onos-apps-tenbi-yangmodel-feature',