diff --git a/core/api/BUCK b/core/api/BUCK
index 387c502..f4d5eb7 100644
--- a/core/api/BUCK
+++ b/core/api/BUCK
@@ -14,7 +14,7 @@
     '//lib:TEST',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/core/common/BUCK b/core/common/BUCK
index cbe9efc..70ea817 100644
--- a/core/common/BUCK
+++ b/core/common/BUCK
@@ -13,7 +13,7 @@
     '//core/api:onos-api-tests',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = SRC_DEPS,
diff --git a/core/net/BUCK b/core/net/BUCK
index 9ec8907..07139f9 100644
--- a/core/net/BUCK
+++ b/core/net/BUCK
@@ -12,7 +12,7 @@
     '//lib:TEST',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/core/security/BUCK b/core/security/BUCK
index 3618496..2f692bd 100644
--- a/core/security/BUCK
+++ b/core/security/BUCK
@@ -12,7 +12,7 @@
     '//lib:TEST',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/core/store/dist/BUCK b/core/store/dist/BUCK
index 8653ad5..c9bd95c 100644
--- a/core/store/dist/BUCK
+++ b/core/store/dist/BUCK
@@ -22,7 +22,7 @@
      '//core/common:onos-core-common-tests',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/core/store/persistence/BUCK b/core/store/persistence/BUCK
index 3caf6ea..0791c14 100644
--- a/core/store/persistence/BUCK
+++ b/core/store/persistence/BUCK
@@ -13,7 +13,7 @@
     '//lib:TEST',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/core/store/primitives/BUCK b/core/store/primitives/BUCK
index 1e77e32..ffdb294 100644
--- a/core/store/primitives/BUCK
+++ b/core/store/primitives/BUCK
@@ -32,7 +32,7 @@
     '//core/api:onos-api-tests',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/core/store/serializers/BUCK b/core/store/serializers/BUCK
index 050269d..f5d9ced 100644
--- a/core/store/serializers/BUCK
+++ b/core/store/serializers/BUCK
@@ -12,7 +12,7 @@
     '//lib:TEST',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,