diff --git a/apps/openstacktelemetry/BUILD b/apps/openstacktelemetry/BUILD
index da45a1e..e1e1a78 100644
--- a/apps/openstacktelemetry/BUILD
+++ b/apps/openstacktelemetry/BUILD
@@ -1,3 +1,5 @@
+load("//tools/build/bazel:osgi_java_library.bzl", "wrapped_osgi_jar")
+
 BUNDLES = [
     "@kafka_clients//jar",
     "@influxdb_java//jar",
@@ -5,12 +7,23 @@
     "@retrofit//jar",
     "@okhttp//jar",
     "@logging_interceptor//jar",
-    "@com_google_code_gson_gson//jar",
     "@okio//jar",
     "@moshi//jar",
     "@converter_moshi//jar",
-    "@com_google_protobuf//:protobuf_java",
-    "@io_grpc_grpc_java//core",
+    # 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",
+    "@com_google_api_grpc_proto_google_common_protos//jar",
+    "@com_google_errorprone_error_prone_annotations//jar",
+    "@com_google_auth_google_auth_library_credentials//jar",
+    "@io_opencensus_opencensus_api//jar",
+    "@io_opencensus_opencensus_contrib_grpc_metrics//jar",
+    "@com_google_code_gson_gson//jar",
     "//apps/openstacktelemetry/api:onos-apps-openstacktelemetry-api",
     "//apps/openstacktelemetry/app:onos-apps-openstacktelemetry-app",
 ]
@@ -25,3 +38,10 @@
     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"],
+)
\ No newline at end of file