diff --git a/BUILD b/BUILD
index 934ecd3..0a1d0cb 100644
--- a/BUILD
+++ b/BUILD
@@ -1,5 +1,5 @@
 load("//tools/build/bazel:generate_workspace.bzl", "ONOS_VERSION")
-load(":modules.bzl", "APPS", "CORE")
+load(":modules.bzl", "APPS", "CORE", "FEATURES")
 
 filegroup(
     name = "onos",
@@ -42,7 +42,7 @@
     srcs = [
         "//tools/package/features:onos-features",
         ":onos-karaf",
-    ] + APPS,
+    ] + APPS + FEATURES,
     outs = ["onos.tar.gz"],
     cmd = "$(location tools/package/onos_stage.py) $(location onos.tar.gz) %s $(location :onos-karaf) $(SRCS)" % ONOS_VERSION,
     output_to_bindir = True,
diff --git a/modules.bzl b/modules.bzl
index 21275a5..8b98c9b 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -83,7 +83,7 @@
 
 ONOS_DRIVERS = [
     # Drivers
-    "//drivers/default:onos-drivers-default",
+    "//drivers/default:onos-drivers-default-oar",
     "//drivers/arista:onos-drivers-arista-oar",
     "//drivers/ciena/waveserver:onos-drivers-ciena-waveserver-oar",
     "//drivers/ciena/c5162:onos-drivers-ciena-c5162-oar",
@@ -296,5 +296,18 @@
     #"//apps/kafka-integration/app:onos-apps-kafka-integration-app",
 ]
 
+FEATURES = [
+    "//tools/package/features:onos-thirdparty-base",
+    "//tools/package/features:onos-thirdparty-web",
+    "//tools/package/features:onos-api",
+    "//tools/package/features:onos-core",
+    #    "//tools/package/features:onos-incubator",
+    #    "//tools/package/features:onos-rest",
+    #    "//tools/package/features:onos-gui",
+    #    "//tools/package/features:onos-gui2",
+    #    "//tools/package/features:onos-cli",
+    #    "//tools/package/features:onos-security",
+]
+
 APPS = ONOS_DRIVERS + ONOS_PROVIDERS + ONOS_APPS + MODELS + PIPELINES + \
        PROTOCOL_APPS
diff --git a/tools/build/bazel/onos_app.bzl b/tools/build/bazel/onos_app.bzl
index 2431374..a5d3f82 100644
--- a/tools/build/bazel/onos_app.bzl
+++ b/tools/build/bazel/onos_app.bzl
@@ -249,7 +249,7 @@
         app_name = _get_app_name()
 
     maven_coords = "%s:%s:oar:%s" % (ONOS_GROUP_ID, name, ONOS_VERSION)
-    feature_xml_coords = "%s:%s:xml:features:%s" % (ONOS_GROUP_ID, name, ONOS_VERSION)
+    feature_xml_coords = "mvn:%s:%s:xml:features:%s" % (ONOS_GROUP_ID, name, ONOS_VERSION)
 
     if title == None:
         print("Missing title for %s" % _get_name())
@@ -264,7 +264,7 @@
     #    feature_coords = '$(maven_coords %s)' % included_bundles[0]
 
     if not feature_coords:
-        feature_coords = "%s:%s:%s" % (ONOS_GROUP_ID, name, ONOS_VERSION)
+        feature_coords = "mvn:%s:%s:%s" % (ONOS_GROUP_ID, name, ONOS_VERSION)
 
     # TODO - intra app dependecies
     apps = []
diff --git a/tools/package/features/BUILD b/tools/package/features/BUILD
index b7ad28d..28645f0 100644
--- a/tools/package/features/BUILD
+++ b/tools/package/features/BUILD
@@ -1,4 +1,5 @@
 load("//tools/build/bazel:osgi_features.bzl", "osgi_feature", "osgi_feature_repo")
+load("//:modules.bzl", "FEATURES")
 
 osgi_feature(
     name = "onos-thirdparty-base",
@@ -36,7 +37,6 @@
         "@typesafe_config//jar",
         "@concurrent_trees//jar",
         "@commons_io//jar",
-        "@jersey_client//jar",
         "@mapdb//jar",
         "@bcpkix_jdk15on//jar",
         "@bcprov_jdk15on//jar",
@@ -46,6 +46,7 @@
         "@sigar//jar",
     ],
     required_features = [],
+    visibility = ["//visibility:public"],
 )
 
 osgi_feature(
@@ -68,12 +69,14 @@
         "@jersey_container_servlet//jar",
         "@jersey_container_servlet_core//jar",
         "@jersey_media_multipart//jar",
+        "@jersey_client//jar",
         "@mimepull//jar",
     ],
     required_features = [
         "war",
         "onos-thirdparty-base",
     ],
+    visibility = ["//visibility:public"],
 )
 
 osgi_feature(
@@ -82,13 +85,16 @@
     included_bundles = [
         "//utils/misc:onlab-misc",
         "//utils/osgi:onlab-osgi",
+        "//utils/rest:onlab-rest",
         "//core/api:onos-api",
         "//incubator/api:onos-incubator-api",
     ],
     required_features = [
         "scr",
         "onos-thirdparty-base",
+        "onos-thirdparty-web",
     ],
+    visibility = ["//visibility:public"],
 )
 
 osgi_feature(
@@ -98,25 +104,14 @@
         "//core/net:onos-core-net",
         "//core/common:onos-core-common",
         "//core/store/dist:onos-core-dist",
-        #        "//core/store/primitives:onos-core-primitives",
-        #        "//core/store/persistence:onos-core-persistence",
-        #        "//core/store/serializers:onos-core-serializers",
+        "//core/store/primitives:onos-core-primitives",
+        "//core/store/persistence:onos-core-persistence",
+        "//core/store/serializers:onos-core-serializers",
     ],
     required_features = ["onos-api"],
+    visibility = ["//visibility:public"],
 )
 
-FEATURES = [
-    "//tools/package/features:onos-thirdparty-base",
-    "//tools/package/features:onos-thirdparty-web",
-    "//tools/package/features:onos-api",
-    "//tools/package/features:onos-core",
-    #    "//tools/package/features:onos-incubator",
-    #    "//tools/package/features:onos-rest",
-    #    "//tools/package/features:onos-gui",
-    #    "//tools/package/features:onos-gui2",
-    #    "//tools/package/features:onos-cli",
-    #    "//tools/package/features:onos-security",
-]
 
 osgi_feature_repo(
     name = "onos-features",
diff --git a/utils/junit/BUILD b/utils/junit/BUILD
index 1706641..2e8e690 100644
--- a/utils/junit/BUILD
+++ b/utils/junit/BUILD
@@ -16,7 +16,6 @@
 osgi_jar_with_tests(
     name = "onlab-junit",
     srcs = glob([SRC + "*.java"]),
-    group = "org.onlab",
     test_deps = TEST_DEPS,
     test_srcs = glob([TEST_SRC + "*.java"]),
     visibility = ["//visibility:public"],
diff --git a/utils/misc/BUILD b/utils/misc/BUILD
index 74d05c1..ca4b963 100644
--- a/utils/misc/BUILD
+++ b/utils/misc/BUILD
@@ -13,7 +13,6 @@
         "org.onlab.graph.GraphTest",
         "org.onlab.util.SlidingWindowCounterTest",
     ],
-    group = "org.onlab",
     visibility = ["//visibility:public"],
     deps = COMPILE_DEPS,
 )
diff --git a/utils/osgi/BUILD b/utils/osgi/BUILD
index 8de5fd8..76944e8 100644
--- a/utils/osgi/BUILD
+++ b/utils/osgi/BUILD
@@ -2,7 +2,6 @@
 
 osgi_jar_with_tests(
     name = "onlab-osgi",
-    group = "org.onlab",
     visibility = ["//visibility:public"],
     deps = COMPILE_DEPS,
 )
diff --git a/utils/rest/BUILD b/utils/rest/BUILD
index c52df8e..ffbc664 100644
--- a/utils/rest/BUILD
+++ b/utils/rest/BUILD
@@ -7,7 +7,6 @@
 
 osgi_jar(
     name = "onlab-rest",
-    group = "org.onlab",
     visibility = ["//visibility:public"],
     deps = COMPILE_DEPS,
 )