diff --git a/protocols/p4runtime/model/BUILD b/protocols/p4runtime/model/BUILD
index 3ac33b6..f29c84c 100644
--- a/protocols/p4runtime/model/BUILD
+++ b/protocols/p4runtime/model/BUILD
@@ -2,7 +2,6 @@
 
 COMPILE_DEPS = CORE_DEPS + [
     "//protocols/p4runtime/proto:p4_runtime_java_proto",
-    "//protocols/p4runtime/proto:p4_config_java_proto",
     "@com_google_protobuf//:protobuf_java",
 ]
 
diff --git a/protocols/p4runtime/proto/BUILD b/protocols/p4runtime/proto/BUILD
index 51da262..73c65b0 100644
--- a/protocols/p4runtime/proto/BUILD
+++ b/protocols/p4runtime/proto/BUILD
@@ -1,23 +1,22 @@
 java_proto_library(
-    name = "p4_types_java_proto",
-    visibility = ["//visibility:public"],
-    deps = ["@p4lang_pi//:p4types_proto"],
-)
-
-java_proto_library(
-    name = "p4_config_java_proto",
-    visibility = ["//visibility:public"],
-    deps = ["@p4lang_pi//:p4config_proto"],
-)
-
-java_proto_library(
-    name = "p4_tmp_config_java_proto",
-    visibility = ["//visibility:public"],
-    deps = ["@p4lang_pi//:p4_tmp_config_proto"],
-)
-
-java_proto_library(
     name = "p4_runtime_java_proto",
     visibility = ["//visibility:public"],
     deps = ["@p4lang_pi//:p4_runtime_proto"],
 )
+
+wrapped_osgi_library(
+    name = "rpc_java_proto-osgi",
+    jar = "@google_rpc//:rpc_java_proto",
+    visibility = ["//visibility:public"],
+    deps = CORE_DEPS + ["@protobuf_java_3_2_0//jar"],
+)
+
+wrapped_osgi_library(
+    name = "p4_runtime_java_proto-osgi",
+    jar = ":p4_runtime_java_proto",
+    visibility = ["//visibility:public"],
+    deps = CORE_DEPS + [
+        "@protobuf_java_3_2_0//jar",
+        "@google_rpc//:rpc_java_proto",
+    ],
+)