diff --git a/google/cloud/binaryauthorization/v1beta1/BUILD.bazel b/google/cloud/binaryauthorization/v1beta1/BUILD.bazel
index ae598d3a..f460b94b 100644
--- a/google/cloud/binaryauthorization/v1beta1/BUILD.bazel
+++ b/google/cloud/binaryauthorization/v1beta1/BUILD.bazel
@@ -38,11 +38,11 @@ proto_library_with_info(
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "java_gapic_assembly_gradle_pkg",
-    "java_gapic_library",
-    "java_gapic_test",
     "java_grpc_library",
     "java_proto_library",
+    java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
+    java_gapic_library = "java_gapic_library2",
+    java_gapic_test = "java_gapic_test2",
 )
 
 java_proto_library(
@@ -59,11 +59,9 @@ java_grpc_library(
 # Uncomment, once java file level options are included in the protos
 #java_gapic_library(
 #    name = "binaryauthorization_java_gapic",
-#    src = ":binaryauthorization_proto_with_info",
-#    gapic_yaml = "binaryauthorization_gapic.yaml",
+#    srcs = [":binaryauthorization_proto_with_info"],
 #    grpc_service_config = "binaryauthorization_grpc_service_config.json",
 #    package = "google.cloud.binaryauthorization.v1beta1",
-#    service_yaml = "binaryauthorization_v1beta1.yaml",
 #    test_deps = [
 #        ":binaryauthorization_java_grpc",
 #    ],
@@ -340,8 +338,8 @@ csharp_grpc_library(
 csharp_gapic_library(
     name = "binaryauthorization_csharp_gapic",
     srcs = [":binaryauthorization_proto_with_info"],
-    grpc_service_config = "binaryauthorization_grpc_service_config.json",
     common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
+    grpc_service_config = "binaryauthorization_grpc_service_config.json",
     deps = [
         ":binaryauthorization_csharp_grpc",
         ":binaryauthorization_csharp_proto",
diff --git a/google/cloud/binaryauthorization/v1beta1/binaryauthorization_gapic.yaml b/google/cloud/binaryauthorization/v1beta1/binaryauthorization_gapic.yaml
index 7c7b177a..79409ec4 100644
--- a/google/cloud/binaryauthorization/v1beta1/binaryauthorization_gapic.yaml
+++ b/google/cloud/binaryauthorization/v1beta1/binaryauthorization_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.binaryauthorization.v1beta1
   python:
     package_name: google.cloud.binaryauthorization_v1beta1.gapic
   go: