diff --git a/apps/kafka-integration/BUILD b/apps/kafka-integration/BUILD
index 31e9ff2..86ddce2 100644
--- a/apps/kafka-integration/BUILD
+++ b/apps/kafka-integration/BUILD
@@ -1,6 +1,6 @@
 BUNDLES = [
     "@kafka_clients//jar",
-    "@runtime_protobuf//jar",
+    "//protocols/grpc:protobuf-java-bundle",
     "//core/protobuf/models:onos-core-protobuf-models",
     "//core/protobuf/models/proto:onos-core-protobuf-models-proto",
     "//apps/kafka-integration/api:onos-apps-kafka-integration-api",
diff --git a/apps/openstacktelemetry/BUILD b/apps/openstacktelemetry/BUILD
index 5bd1683..955df03 100644
--- a/apps/openstacktelemetry/BUILD
+++ b/apps/openstacktelemetry/BUILD
@@ -16,13 +16,13 @@
     "@simpleclient_hotspot//jar",
     "@simpleclient_servlet//jar",
     # gRPC dependencies (with patched core)
-    ":grpc-core-repkg",
-    "@runtime_grpc_stub//jar",
-    "@runtime_grpc_netty//jar",
-    "@runtime_grpc_auth//jar",
-    "@runtime_grpc_protobuf//jar",
-    "@runtime_grpc_protobuf_lite//jar",
-    "@runtime_protobuf//jar",
+    "//protocols/grpc:grpc-bundle-core",
+    "//protocols/grpc:grpc-bundle-stub",
+    "//protocols/grpc:grpc-bundle-netty",
+    "//protocols/grpc:grpc-bundle-auth",
+    "//protocols/grpc:grpc-bundle-protobuf",
+    "//protocols/grpc:grpc-bundle-protobuf-lite",
+    "//protocols/grpc:protobuf-java-bundle",
     "@com_google_api_grpc_proto_google_common_protos//jar",
     "@com_google_errorprone_error_prone_annotations//jar",
     "@com_google_auth_google_auth_library_credentials//jar",
@@ -44,10 +44,3 @@
     title = "OpenStack Telemetry Application",
     url = "https://wiki.onosproject.org/display/ONOS/SONA%3A+DC+Network+Virtualization",
 )
-
-wrapped_osgi_jar(
-    name = "grpc-core-repkg",
-    jar = "@io_grpc_grpc_java//core",
-    visibility = ["//visibility:public"],
-    deps = ["@io_opencensus_opencensus_api//jar"],
-)