diff --git a/BUILD b/BUILD
index 03d2993..c4daba4 100644
--- a/BUILD
+++ b/BUILD
@@ -301,13 +301,19 @@
        PROTOCOL_APPS
 
 PACKAGES = [
-    "//tools/package:onos-karaf",
-#    "//tools/package:onos-package",
-#    "//tools/package:onos-admin-tools",
-#    "//tools/package:onos-test-tools",
+    "//tools/package:onos-package-admin",
+    "//tools/package:onos-package-test",
+    "//tools/package:onos-package",
 ]
 
 filegroup(
     name = "onos",
     srcs = CORE + APPS + PACKAGES,
+    visibility = ["//visibility:public"],
+)
+
+filegroup(
+    name = "onos-env-defaults",
+    srcs = ["tools/build/envDefaults"],
+    visibility = ["//visibility:public"],
 )