diff --git a/google/devtools/containeranalysis/v1/BUILD.bazel b/google/devtools/containeranalysis/v1/BUILD.bazel
index e434c860..b4a7bd12 100644
--- a/google/devtools/containeranalysis/v1/BUILD.bazel
+++ b/google/devtools/containeranalysis/v1/BUILD.bazel
@@ -48,12 +48,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",
 )
@@ -71,11 +72,10 @@ java_grpc_library(
 
 java_gapic_library(
     name = "containeranalysis_java_gapic",
-    src = ":containeranalysis_proto_with_info",
+    srcs = [":containeranalysis_proto_with_info"],
     gapic_yaml = "containeranalysis_gapic.yaml",
     grpc_service_config = "containeranalysis_grpc_service_config.json",
     package = "google.devtools.containeranalysis.v1",
-    service_yaml = "containeranalysis_v1.yaml",
     test_deps = [
         ":containeranalysis_java_grpc",
         "//google/iam/v1:iam_java_grpc",
diff --git a/google/devtools/containeranalysis/v1beta1/BUILD.bazel b/google/devtools/containeranalysis/v1beta1/BUILD.bazel
index 340c909e..56ac70a5 100644
--- a/google/devtools/containeranalysis/v1beta1/BUILD.bazel
+++ b/google/devtools/containeranalysis/v1beta1/BUILD.bazel
@@ -49,12 +49,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",
 )
@@ -100,9 +101,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "containeranalysis_java_gapic",
-    src = ":containeranalysis_proto_with_info",
+    grpc_service_config = "containeranalysis_grpc_service_config.json",
+    srcs = [":containeranalysis_proto_with_info"],
     gapic_yaml = "containeranalysis_gapic.yaml",
-    service_yaml = "//google/devtools/containeranalysis:containeranalysis_v1beta1.yaml",
     test_deps = [
         ":containeranalysis_java_grpc",
     ] + _JAVA_GRPC_SUBPACKAGE_DEPS,