diff --git a/google/cloud/osconfig/v1/BUILD.bazel b/google/cloud/osconfig/v1/BUILD.bazel
index 609e4a1b..9aadb87e 100644
--- a/google/cloud/osconfig/v1/BUILD.bazel
+++ b/google/cloud/osconfig/v1/BUILD.bazel
@@ -23,9 +23,9 @@ load(
     "go_gapic_library",
     "go_proto_library",
     "go_test",
-    "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",
     "moved_proto_library",
@@ -93,11 +93,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "osconfig_java_gapic",
-    src = ":osconfig_proto_with_info",
-    gapic_yaml = "osconfig_gapic.yaml",
+    srcs = [":osconfig_proto_with_info"],
     grpc_service_config = "osconfig_grpc_service_config.json",
     package = "google.cloud.osconfig.v1",
-    service_yaml = "osconfig_v1.yaml",
     test_deps = [
         ":osconfig_java_grpc",
     ],
diff --git a/google/cloud/osconfig/v1/osconfig_gapic.yaml b/google/cloud/osconfig/v1/osconfig_gapic.yaml
index dd81d6a9..0ee6371d 100644
--- a/google/cloud/osconfig/v1/osconfig_gapic.yaml
+++ b/google/cloud/osconfig/v1/osconfig_gapic.yaml
@@ -2,8 +2,6 @@ type: com.google.api.codegen.ConfigProto
 config_schema_version: 2.0.0
 # The settings of generated code in a specific language.
 language_settings:
-  java:
-    package_name: com.google.cloud.osconfig.v1
   python:
     package_name: google.cloud.osconfig_v1.gapic
   go:
diff --git a/google/cloud/osconfig/v1beta/BUILD.bazel b/google/cloud/osconfig/v1beta/BUILD.bazel
index 109e593d..3d1121f5 100644
--- a/google/cloud/osconfig/v1beta/BUILD.bazel
+++ b/google/cloud/osconfig/v1beta/BUILD.bazel
@@ -42,12 +42,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",
 )
@@ -65,11 +66,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "osconfig_java_gapic",
-    src = ":osconfig_proto_with_info",
-    gapic_yaml = "osconfig_gapic.yaml",
+    srcs = [":osconfig_proto_with_info"],
     grpc_service_config = "osconfig_grpc_service_config.json",
     package = "google.cloud.osconfig.v1beta",
-    service_yaml = "osconfig_v1beta.yaml",
     test_deps = [
         ":osconfig_java_grpc",
     ],
diff --git a/google/cloud/osconfig/v1beta/osconfig_gapic.yaml b/google/cloud/osconfig/v1beta/osconfig_gapic.yaml
index 56e155e7..dac56879 100644
--- a/google/cloud/osconfig/v1beta/osconfig_gapic.yaml
+++ b/google/cloud/osconfig/v1beta/osconfig_gapic.yaml
@@ -2,8 +2,6 @@ type: com.google.api.codegen.ConfigProto
 config_schema_version: 2.0.0
 # The settings of generated code in a specific language.
 language_settings:
-  java:
-    package_name: com.google.cloud.osconfig.v1beta
   python:
     package_name: google.cloud.osconfig_v1beta.gapic
   go: