diff --git a/google/firestore/bundle/BUILD.bazel b/google/firestore/bundle/BUILD.bazel
index 2630288f..f6511841 100644
--- a/google/firestore/bundle/BUILD.bazel
+++ b/google/firestore/bundle/BUILD.bazel
@@ -31,9 +31,7 @@ proto_library_with_info(
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "java_gapic_assembly_gradle_pkg",
-    "java_gapic_library",
-    "java_gapic_test",
+     java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
     "java_grpc_library",
     "java_proto_library",
 )
diff --git a/google/firestore/v1/BUILD.bazel b/google/firestore/v1/BUILD.bazel
index 934f7cb6..f704766b 100644
--- a/google/firestore/v1/BUILD.bazel
+++ b/google/firestore/v1/BUILD.bazel
@@ -41,12 +41,13 @@ proto_library_with_info(
 
 ##############################################################################
 # Java
+# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules.
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "java_gapic_assembly_gradle_pkg",
-    "java_gapic_library",
-    "java_gapic_test",
+    java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
+    java_gapic_library = "java_gapic_library2",
+    java_gapic_test = "java_gapic_test2",
     "java_grpc_library",
     "java_proto_library",
 )
@@ -64,11 +65,10 @@ java_grpc_library(
 
 java_gapic_library(
     name = "firestore_java_gapic",
-    src = ":firestore_proto_with_info",
+    srcs = [":firestore_proto_with_info"],
     gapic_yaml = "firestore_gapic.yaml",
     grpc_service_config = "firestore_grpc_service_config.json",
     package = "google.firestore.v1",
-    service_yaml = "//google/firestore:firestore_v1.yaml",
     test_deps = [
         ":firestore_java_grpc",
     ],
diff --git a/google/firestore/v1beta1/BUILD.bazel b/google/firestore/v1beta1/BUILD.bazel
index fd2e2bb1..b3a2ed30 100644
--- a/google/firestore/v1beta1/BUILD.bazel
+++ b/google/firestore/v1beta1/BUILD.bazel
@@ -41,12 +41,13 @@ proto_library_with_info(
 
 ##############################################################################
 # Java
+# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules.
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "java_gapic_assembly_gradle_pkg",
-    "java_gapic_library",
-    "java_gapic_test",
+    java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
+    java_gapic_library = "java_gapic_library2",
+    java_gapic_test = "java_gapic_test2",
     "java_grpc_library",
     "java_proto_library",
 )
@@ -64,10 +65,10 @@ java_grpc_library(
 
 java_gapic_library(
     name = "firestore_java_gapic",
-    src = ":firestore_proto_with_info",
+    grpc_service_config = "firestore_grpc_service_config.json",
+    srcs = [":firestore_proto_with_info"],
     gapic_yaml = "firestore_gapic.yaml",
     package = "google.firestore.v1beta1",
-    service_yaml = "//google/firestore:firestore_v1beta1.yaml",
     test_deps = [
         ":firestore_java_grpc",
     ],