diff --git a/features/BUILD b/features/BUILD
index f188294..1957787 100644
--- a/features/BUILD
+++ b/features/BUILD
@@ -1,4 +1,4 @@
-load("//tools/build/bazel:osgi_features.bzl", "osgi_feature")
+load("//tools/build/bazel:osgi_features.bzl", "osgi_feature", "osgi_feature_repo")
 
 osgi_feature(
     name = "onos-thirdparty-base",
@@ -46,7 +46,6 @@
         "@sigar//jar",
     ],
     required_features = [],
-    visibility = ["//visibility:public"],
 )
 
 osgi_feature(
@@ -75,7 +74,6 @@
         "war",
         "onos-thirdparty-base",
     ],
-    visibility = ["//visibility:public"],
 )
 
 osgi_feature(
@@ -91,7 +89,6 @@
         "scr",
         "onos-thirdparty-base",
     ],
-    visibility = ["//visibility:public"],
 )
 
 osgi_feature(
@@ -106,6 +103,25 @@
         #        "//core/store/serializers:onos-core-serializers",
     ],
     required_features = ["onos-api"],
+)
+
+
+FEATURES = [
+    "//features:onos-thirdparty-base",
+    "//features:onos-thirdparty-web",
+    "//features:onos-api",
+    "//features:onos-core",
+#    "//features:onos-incubator",
+#    "//features:onos-rest",
+#    "//features:onos-gui",
+#    "//features:onos-gui2",
+#    "//features:onos-cli",
+#    "//features:onos-security",
+]
+
+osgi_feature_repo(
+    name = "onos-features",
+    exported_features = FEATURES,
     visibility = ["//visibility:public"],
 )