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 b556523..b7d0340 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
@@ -141,7 +141,6 @@ ruby_grpc_library(
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "csharp_grpc_library",
     "csharp_proto_library",
 )
 
@@ -150,10 +149,13 @@ csharp_proto_library(
     deps = [":{{name}}_proto"],
 )
 
-csharp_grpc_library(
-    name = "{{name}}_csharp_grpc",
-    srcs = [":{{name}}_proto"],
-    deps = [":{{name}}_csharp_proto"],
+# Open Source Packages
+csharp_gapic_assembly_pkg(
+    name = "{{type_only_assembly_name}}-csharp",
+    generate_nongapic_package = True,
+    deps = [
+        ":{{name}}_csharp_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 b7a9c63..d31c5ab 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
@@ -145,7 +145,6 @@ ruby_grpc_library(
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "csharp_grpc_library",
     "csharp_proto_library",
 )
 
@@ -154,10 +153,13 @@ csharp_proto_library(
     deps = [":types_proto"],
 )
 
-csharp_grpc_library(
-    name = "types_csharp_grpc",
-    srcs = [":types_proto"],
-    deps = [":types_csharp_proto"],
+# Open Source Packages
+csharp_gapic_assembly_pkg(
+    name = "google-example-library-types-csharp",
+    generate_nongapic_package = True,
+    deps = [
+        ":types_csharp_proto",
+    ],
 )
 
 ##############################################################################