diff --git a/drivers/bti/BUCK b/drivers/bti/BUCK
index a9a69f3..17861a1 100644
--- a/drivers/bti/BUCK
+++ b/drivers/bti/BUCK
@@ -9,7 +9,7 @@
     '//incubator/api:onos-incubator-api'
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/drivers/ciena/BUCK b/drivers/ciena/BUCK
index ec8a793..a366702 100644
--- a/drivers/ciena/BUCK
+++ b/drivers/ciena/BUCK
@@ -11,7 +11,7 @@
     '//protocols/rest/api:onos-restsb-api',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/drivers/cisco/BUCK b/drivers/cisco/BUCK
index 3d25bff..0b538d7 100644
--- a/drivers/cisco/BUCK
+++ b/drivers/cisco/BUCK
@@ -9,7 +9,7 @@
     '//protocols/netconf/api:onos-netconf-api',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/drivers/default/BUCK b/drivers/default/BUCK
index fa0a893..1491498 100644
--- a/drivers/default/BUCK
+++ b/drivers/default/BUCK
@@ -16,7 +16,7 @@
     '//lib:TEST',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/drivers/fujitsu/BUCK b/drivers/fujitsu/BUCK
index 512cc2b..373b7d9 100644
--- a/drivers/fujitsu/BUCK
+++ b/drivers/fujitsu/BUCK
@@ -9,7 +9,7 @@
     '//protocols/netconf/api:onos-netconf-api',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/drivers/lumentum/BUCK b/drivers/lumentum/BUCK
index 0d8c328..50c1c26 100644
--- a/drivers/lumentum/BUCK
+++ b/drivers/lumentum/BUCK
@@ -9,7 +9,7 @@
     '//drivers/utilities:onos-drivers-utilities',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/drivers/netconf/BUCK b/drivers/netconf/BUCK
index c292fa6..bec65c4 100644
--- a/drivers/netconf/BUCK
+++ b/drivers/netconf/BUCK
@@ -9,7 +9,7 @@
     '//protocols/netconf/api:onos-netconf-api',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/drivers/ovsdb/BUCK b/drivers/ovsdb/BUCK
index d1ec756..d63c6b7 100644
--- a/drivers/ovsdb/BUCK
+++ b/drivers/ovsdb/BUCK
@@ -10,7 +10,7 @@
     '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,
diff --git a/drivers/utilities/BUCK b/drivers/utilities/BUCK
index 09c6916..80ec633 100644
--- a/drivers/utilities/BUCK
+++ b/drivers/utilities/BUCK
@@ -12,7 +12,7 @@
     '//lib:TEST',
 ]
 
-java_library(
+osgi_jar(
     name = CURRENT_NAME,
     srcs = glob([SRC + '/*.java']),
     deps = COMPILE_DEPS,