diff --git a/google/cloud/retail/v2/BUILD.bazel b/google/cloud/retail/v2/BUILD.bazel
index 51babed130..9110be97f8 100644
--- a/google/cloud/retail/v2/BUILD.bazel
+++ b/google/cloud/retail/v2/BUILD.bazel
@@ -31,17 +31,17 @@ load(
     "moved_proto_library",
     "nodejs_gapic_assembly_pkg",
     "nodejs_gapic_library",
-    "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",
     "proto_library_with_info",
     "py_gapic_assembly_pkg",
     "py_gapic_library",
     "py_grpc_library",
     "py_proto_library",
-    "ruby_gapic_assembly_pkg",
     "ruby_cloud_gapic_library",
+    "ruby_gapic_assembly_pkg",
     "ruby_grpc_library",
     "ruby_proto_library",
 )
@@ -212,10 +212,8 @@ php_grpc_library(
 
 php_gapic_library(
     name = "retail_php_gapic",
-    src = ":retail_proto_with_info",
-    gapic_yaml = "retail_gapic.yaml",
+    srcs = [":retail_proto_with_info"],
     grpc_service_config = "retail_grpc_service_config.json",
-    package = "google.cloud.retail.v2",
     service_yaml = "retail_v2.yaml",
     deps = [
         ":retail_php_grpc",
diff --git a/google/cloud/retail/v2/retail_gapic.yaml b/google/cloud/retail/v2/retail_gapic.yaml
deleted file mode 100644
index 8cbed69c28..0000000000
--- a/google/cloud/retail/v2/retail_gapic.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-type: com.google.api.codegen.ConfigProto
-config_schema_version: 2.0.0
-language_settings:
-  python:
-    package_name: google.cloud.retail_v2.gapic
-  go:
-    package_name: cloud.google.com/go/retail/apiv2
-  csharp:
-    package_name: Google.Retail.V2
-  ruby:
-    package_name: Google::Cloud::Retail::V2
-  php:
-    package_name: Google\Cloud\Retail\V2
-  nodejs:
-    package_name: retail.v2
-    domain_layer_location: google-cloud
diff --git a/google/cloud/retail/v2alpha/BUILD.bazel b/google/cloud/retail/v2alpha/BUILD.bazel
index cae874780d..e4b1b5450a 100644
--- a/google/cloud/retail/v2alpha/BUILD.bazel
+++ b/google/cloud/retail/v2alpha/BUILD.bazel
@@ -30,10 +30,10 @@ load(
     "java_proto_library",
     "nodejs_gapic_assembly_pkg",
     "nodejs_gapic_library",
-    "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",
     "proto_library_with_info",
     "py_gapic_assembly_pkg",
     "py_gapic_library",
@@ -205,10 +205,8 @@ php_grpc_library(
 
 php_gapic_library(
     name = "retail_php_gapic",
-    src = ":retail_proto_with_info",
-    gapic_yaml = "retail_gapic.yaml",
+    srcs = [":retail_proto_with_info"],
     grpc_service_config = "retail_grpc_service_config.json",
-    package = "google.cloud.retail.v2alpha",
     service_yaml = "retail_v2alpha.yaml",
     deps = [
         ":retail_php_grpc",
@@ -228,11 +226,11 @@ php_gapic_assembly_pkg(
 
 nodejs_gapic_library(
     name = "retail_nodejs_gapic",
+    package_name = "@google-cloud/retail",
     src = ":retail_proto_with_info",
     extra_protoc_parameters = ["metadata"],
     grpc_service_config = "retail_grpc_service_config.json",
     package = "google.cloud.retail.v2alpha",
-    package_name = "@google-cloud/retail",
     service_yaml = "retail_v2alpha.yaml",
     deps = [],
 )
diff --git a/google/cloud/retail/v2beta/BUILD.bazel b/google/cloud/retail/v2beta/BUILD.bazel
index b48f0040a9..e17c8aede2 100644
--- a/google/cloud/retail/v2beta/BUILD.bazel
+++ b/google/cloud/retail/v2beta/BUILD.bazel
@@ -30,10 +30,10 @@ load(
     "java_proto_library",
     "nodejs_gapic_assembly_pkg",
     "nodejs_gapic_library",
-    "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",
     "proto_library_with_info",
     "py_gapic_assembly_pkg",
     "py_gapic_library",
@@ -205,10 +205,8 @@ php_grpc_library(
 
 php_gapic_library(
     name = "retail_php_gapic",
-    src = ":retail_proto_with_info",
-    gapic_yaml = "retail_gapic.yaml",
+    srcs = [":retail_proto_with_info"],
     grpc_service_config = "retail_grpc_service_config.json",
-    package = "google.cloud.retail.v2beta",
     service_yaml = "retail_v2beta.yaml",
     deps = [
         ":retail_php_grpc",
@@ -228,11 +226,11 @@ php_gapic_assembly_pkg(
 
 nodejs_gapic_library(
     name = "retail_nodejs_gapic",
+    package_name = "@google-cloud/retail",
     src = ":retail_proto_with_info",
     extra_protoc_parameters = ["metadata"],
     grpc_service_config = "retail_grpc_service_config.json",
     package = "google.cloud.retail.v2beta",
-    package_name = "@google-cloud/retail",
     service_yaml = "retail_v2beta.yaml",
     deps = [],
 )
diff --git a/google/cloud/retail/v2beta/retail_gapic.yaml b/google/cloud/retail/v2beta/retail_gapic.yaml
index 688ca522d5..0bcb880b63 100644
--- a/google/cloud/retail/v2beta/retail_gapic.yaml
+++ b/google/cloud/retail/v2beta/retail_gapic.yaml
@@ -1,16 +1,2 @@
 type: com.google.api.codegen.ConfigProto
 config_schema_version: 2.0.0
-language_settings:
-  python:
-    package_name: google.cloud.retail_v2beta.gapic
-  go:
-    package_name: cloud.google.com/go/retail/apiv2beta
-  csharp:
-    package_name: Google.Retail.V2beta
-  ruby:
-    package_name: Google::Cloud::Retail::V2beta
-  php:
-    package_name: Google\Cloud\Retail\V2beta
-  nodejs:
-    package_name: retail.v2beta
-    domain_layer_location: google-cloud