diff --git a/bazel/src/main/java/com/google/api/codegen/bazel/BUILD.bazel.raw_api.mustache b/bazel/src/main/java/com/google/api/codegen/bazel/BUILD.bazel.raw_api.mustache
index 73ce5fc..b556523 100644
--- a/bazel/src/main/java/com/google/api/codegen/bazel/BUILD.bazel.raw_api.mustache
+++ b/bazel/src/main/java/com/google/api/codegen/bazel/BUILD.bazel.raw_api.mustache
@@ -23,7 +23,6 @@ proto_library(
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "java_grpc_library",
     "java_proto_library",
 )
 
@@ -32,10 +31,13 @@ java_proto_library(
     deps = [":{{name}}_proto"],
 )
 
-java_grpc_library(
-    name = "{{name}}_java_grpc",
-    srcs = [":{{name}}_proto"],
-    deps = [":{{name}}_java_proto"],
+# Open Source Packages
+java_gapic_assembly_gradle_pkg(
+    name = "{{type_only_assembly_name}}-java",
+    deps = [
+        ":{{name}}_proto",
+        ":{{name}}_java_proto",
+    ],
 )
 
 ##############################################################################
diff --git a/bazel/src/test/data/googleapis/google/example/library/type/BUILD.bazel.baseline b/bazel/src/test/data/googleapis/google/example/library/type/BUILD.bazel.baseline
index 17e3407..892a703 100644
--- a/bazel/src/test/data/googleapis/google/example/library/type/BUILD.bazel.baseline
+++ b/bazel/src/test/data/googleapis/google/example/library/type/BUILD.bazel.baseline
@@ -25,7 +25,6 @@ proto_library(
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "java_grpc_library",
     "java_proto_library",
 )
 
@@ -34,10 +33,13 @@ java_proto_library(
     deps = [":types_proto"],
 )
 
-java_grpc_library(
-    name = "types_java_grpc",
-    srcs = [":types_proto"],
-    deps = [":types_java_proto"],
+# Open Source Packages
+java_gapic_assembly_gradle_pkg(
+    name = "library-types-java",
+    deps = [
+        ":types_proto",
+        ":types_java_proto",
+    ],
 )
 
 ##############################################################################