diff --git a/google/cloud/dataproc/v1/BUILD.bazel b/google/cloud/dataproc/v1/BUILD.bazel
index d07c1e00be27e..ef705a2b365bc 100644
--- a/google/cloud/dataproc/v1/BUILD.bazel
+++ b/google/cloud/dataproc/v1/BUILD.bazel
@@ -177,13 +177,14 @@ py_gapic_assembly_pkg(
 
 ##############################################################################
 # PHP
+# DO NOT OVERRIDE this PHP microgenerator section with autogenerated rules.
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "php_gapic_assembly_pkg",
-    "php_gapic_library",
-    "php_grpc_library",
-    "php_proto_library",
+    php_gapic_assembly_pkg = "php_gapic_assembly_pkg2",
+    php_gapic_library = "php_gapic_library2",
+    php_grpc_library = "php_grpc_library2",
+    php_proto_library = "php_proto_library2",
 )
 
 php_proto_library(
@@ -199,10 +200,9 @@ php_grpc_library(
 
 php_gapic_library(
     name = "dataproc_php_gapic",
-    src = ":dataproc_proto_with_info",
+    srcs = [":dataproc_proto_with_info"],
     gapic_yaml = "dataproc_gapic.yaml",
     grpc_service_config = "dataproc_grpc_service_config.json",
-    package = "google.cloud.dataproc.v1",
     service_yaml = "dataproc_v1.yaml",
     deps = [
         ":dataproc_php_grpc",
@@ -254,8 +254,8 @@ nodejs_gapic_assembly_pkg(
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "ruby_gapic_assembly_pkg",
     "ruby_cloud_gapic_library",
+    "ruby_gapic_assembly_pkg",
     "ruby_grpc_library",
     "ruby_proto_library",
 )
diff --git a/google/cloud/dataproc/v1/dataproc_gapic.yaml b/google/cloud/dataproc/v1/dataproc_gapic.yaml
index d38c96c3927a4..bc52ee42edcf9 100644
--- a/google/cloud/dataproc/v1/dataproc_gapic.yaml
+++ b/google/cloud/dataproc/v1/dataproc_gapic.yaml
@@ -1,26 +1,7 @@
 type: com.google.api.codegen.ConfigProto
 config_schema_version: 2.0.0
-language_settings:
-  python:
-    package_name: google.cloud.dataproc_v1.gapic
-  go:
-    package_name: cloud.google.com/go/dataproc/apiv1
-  csharp:
-    package_name: Google.Cloud.Dataproc.V1
-  ruby:
-    package_name: Google::Cloud::Dataproc::V1
-  php:
-    package_name: Google\Cloud\Dataproc\V1
-  nodejs:
-    package_name: dataproc.v1
-    domain_layer_location: google-cloud
 interfaces:
 - name: google.cloud.dataproc.v1.ClusterController
-  smoke_test:
-    method: ListClusters
-    init_fields:
-    - project_id=$PROJECT_ID
-    - region="global"
   methods:
   - name: CreateCluster
     long_running:
diff --git a/google/cloud/dataproc/v1beta2/BUILD.bazel b/google/cloud/dataproc/v1beta2/BUILD.bazel
index 28b6c1e0fa71c..75f0f7d4ca0fe 100644
--- a/google/cloud/dataproc/v1beta2/BUILD.bazel
+++ b/google/cloud/dataproc/v1beta2/BUILD.bazel
@@ -176,13 +176,14 @@ py_gapic_assembly_pkg(
 
 ##############################################################################
 # PHP
+# DO NOT OVERRIDE this PHP microgenerator section with autogenerated rules.
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "php_gapic_assembly_pkg",
-    "php_gapic_library",
-    "php_grpc_library",
-    "php_proto_library",
+    php_gapic_assembly_pkg = "php_gapic_assembly_pkg2",
+    php_gapic_library = "php_gapic_library2",
+    php_grpc_library = "php_grpc_library2",
+    php_proto_library = "php_proto_library2",
 )
 
 php_proto_library(
@@ -198,10 +199,9 @@ php_grpc_library(
 
 php_gapic_library(
     name = "dataproc_php_gapic",
-    src = ":dataproc_proto_with_info",
+    srcs = [":dataproc_proto_with_info"],
     gapic_yaml = "dataproc_gapic.yaml",
     grpc_service_config = "dataproc_grpc_service_config.json",
-    package = "google.cloud.dataproc.v1beta2",
     service_yaml = "dataproc_v1beta2.yaml",
     deps = [
         ":dataproc_php_grpc",
@@ -253,8 +253,8 @@ nodejs_gapic_assembly_pkg(
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "ruby_gapic_assembly_pkg",
     "ruby_cloud_gapic_library",
+    "ruby_gapic_assembly_pkg",
     "ruby_grpc_library",
     "ruby_proto_library",
 )
diff --git a/google/cloud/dataproc/v1beta2/dataproc_gapic.yaml b/google/cloud/dataproc/v1beta2/dataproc_gapic.yaml
index efddce37bb3d2..76c2c367ef913 100644
--- a/google/cloud/dataproc/v1beta2/dataproc_gapic.yaml
+++ b/google/cloud/dataproc/v1beta2/dataproc_gapic.yaml
@@ -1,26 +1,7 @@
 type: com.google.api.codegen.ConfigProto
 config_schema_version: 2.0.0
-language_settings:
-  python:
-    package_name: google.cloud.dataproc_v1beta2.gapic
-  go:
-    package_name: cloud.google.com/go/dataproc/apiv1beta2
-  csharp:
-    package_name: Google.Cloud.Dataproc.V1Beta2
-  ruby:
-    package_name: Google::Cloud::Dataproc::V1beta2
-  php:
-    package_name: Google\Cloud\Dataproc\V1beta2
-  nodejs:
-    package_name: dataproc.v1beta2
-    domain_layer_location: google-cloud
 interfaces:
 - name: google.cloud.dataproc.v1beta2.ClusterController
-  smoke_test:
-    method: ListClusters
-    init_fields:
-    - project_id=$PROJECT_ID
-    - region="global"
   methods:
   - name: CreateCluster
     long_running: