diff --git a/protos/google/bigtable/admin/v2/bigtable_instance_admin.proto b/protos/google/bigtable/admin/v2/bigtable_instance_admin.proto
index 8e05bfd0f..8b19b5582 100644
--- a/protos/google/bigtable/admin/v2/bigtable_instance_admin.proto
+++ b/protos/google/bigtable/admin/v2/bigtable_instance_admin.proto
@@ -35,6 +35,7 @@ option java_multiple_files = true;
 option java_outer_classname = "BigtableInstanceAdminProto";
 option java_package = "com.google.bigtable.admin.v2";
 option php_namespace = "Google\\Cloud\\Bigtable\\Admin\\V2";
+option ruby_package = "Google::Cloud::Bigtable::Admin::V2";
 
 // Service for creating, configuring, and deleting Cloud Bigtable Instances and
 // Clusters. Provides access to the Instance and Cluster schemas only, not the
diff --git a/protos/google/bigtable/admin/v2/bigtable_table_admin.proto b/protos/google/bigtable/admin/v2/bigtable_table_admin.proto
index 119ef73a4..6f434a473 100644
--- a/protos/google/bigtable/admin/v2/bigtable_table_admin.proto
+++ b/protos/google/bigtable/admin/v2/bigtable_table_admin.proto
@@ -36,6 +36,7 @@ option java_multiple_files = true;
 option java_outer_classname = "BigtableTableAdminProto";
 option java_package = "com.google.bigtable.admin.v2";
 option php_namespace = "Google\\Cloud\\Bigtable\\Admin\\V2";
+option ruby_package = "Google::Cloud::Bigtable::Admin::V2";
 
 // Service for creating, configuring, and deleting Cloud Bigtable tables.
 //
diff --git a/protos/google/bigtable/admin/v2/common.proto b/protos/google/bigtable/admin/v2/common.proto
index 89d24ea97..17c69d469 100644
--- a/protos/google/bigtable/admin/v2/common.proto
+++ b/protos/google/bigtable/admin/v2/common.proto
@@ -24,6 +24,7 @@ option java_multiple_files = true;
 option java_outer_classname = "CommonProto";
 option java_package = "com.google.bigtable.admin.v2";
 option php_namespace = "Google\\Cloud\\Bigtable\\Admin\\V2";
+option ruby_package = "Google::Cloud::Bigtable::Admin::V2";
 
 // Storage media types for persisting Bigtable data.
 enum StorageType {
diff --git a/protos/google/bigtable/admin/v2/instance.proto b/protos/google/bigtable/admin/v2/instance.proto
index e15f63ac0..2086f9707 100644
--- a/protos/google/bigtable/admin/v2/instance.proto
+++ b/protos/google/bigtable/admin/v2/instance.proto
@@ -27,6 +27,7 @@ option java_multiple_files = true;
 option java_outer_classname = "InstanceProto";
 option java_package = "com.google.bigtable.admin.v2";
 option php_namespace = "Google\\Cloud\\Bigtable\\Admin\\V2";
+option ruby_package = "Google::Cloud::Bigtable::Admin::V2";
 
 // A collection of Bigtable [Tables][google.bigtable.admin.v2.Table] and
 // the resources that serve them.
diff --git a/protos/google/bigtable/admin/v2/table.proto b/protos/google/bigtable/admin/v2/table.proto
index 535378989..e85ca8ca9 100644
--- a/protos/google/bigtable/admin/v2/table.proto
+++ b/protos/google/bigtable/admin/v2/table.proto
@@ -27,6 +27,7 @@ option java_multiple_files = true;
 option java_outer_classname = "TableProto";
 option java_package = "com.google.bigtable.admin.v2";
 option php_namespace = "Google\\Cloud\\Bigtable\\Admin\\V2";
+option ruby_package = "Google::Cloud::Bigtable::Admin::V2";
 
 // Indicates the type of the restore source.
 enum RestoreSourceType {
diff --git a/protos/google/bigtable/v2/bigtable.proto b/protos/google/bigtable/v2/bigtable.proto
index c54225ed3..32aaba21d 100644
--- a/protos/google/bigtable/v2/bigtable.proto
+++ b/protos/google/bigtable/v2/bigtable.proto
@@ -30,6 +30,7 @@ option java_multiple_files = true;
 option java_outer_classname = "BigtableProto";
 option java_package = "com.google.bigtable.v2";
 option php_namespace = "Google\\Cloud\\Bigtable\\V2";
+option ruby_package = "Google::Cloud::Bigtable::V2";
 option (google.api.resource_definition) = {
   type: "bigtable.googleapis.com/Table"
   pattern: "projects/{project}/instances/{instance}/tables/{table}"
diff --git a/protos/google/bigtable/v2/data.proto b/protos/google/bigtable/v2/data.proto
index 8fd0c15cb..2cc916454 100644
--- a/protos/google/bigtable/v2/data.proto
+++ b/protos/google/bigtable/v2/data.proto
@@ -23,6 +23,7 @@ option java_multiple_files = true;
 option java_outer_classname = "DataProto";
 option java_package = "com.google.bigtable.v2";
 option php_namespace = "Google\\Cloud\\Bigtable\\V2";
+option ruby_package = "Google::Cloud::Bigtable::V2";
 
 // Specifies the complete (requested) contents of a single row of a table.
 // Rows which exceed 256MiB in size cannot be read in full.
diff --git a/protos/protos.json b/protos/protos.json
index 274160063..b70fd9f66 100644
--- a/protos/protos.json
+++ b/protos/protos.json
@@ -13,7 +13,8 @@
                     "java_multiple_files": true,
                     "java_outer_classname": "TableProto",
                     "java_package": "com.google.bigtable.admin.v2",
-                    "php_namespace": "Google\\Cloud\\Bigtable\\Admin\\V2"
+                    "php_namespace": "Google\\Cloud\\Bigtable\\Admin\\V2",
+                    "ruby_package": "Google::Cloud::Bigtable::Admin::V2"
                   },
                   "nested": {
                     "BigtableInstanceAdmin": {
@@ -1841,6 +1842,7 @@
                 "java_outer_classname": "DataProto",
                 "java_package": "com.google.bigtable.v2",
                 "php_namespace": "Google\\Cloud\\Bigtable\\V2",
+                "ruby_package": "Google::Cloud::Bigtable::V2",
                 "(google.api.resource_definition).type": "bigtable.googleapis.com/Table",
                 "(google.api.resource_definition).pattern": "projects/{project}/instances/{instance}/tables/{table}"
               },
diff --git a/src/v2/bigtable_client_config.json b/src/v2/bigtable_client_config.json
index 67a35c0bd..749f22e98 100644
--- a/src/v2/bigtable_client_config.json
+++ b/src/v2/bigtable_client_config.json
@@ -31,23 +31,23 @@
       "methods": {
         "ReadRows": {
           "timeout_millis": 43200000,
-          "retry_codes_name": "idempotent",
-          "retry_params_name": "5af39a0f6db447f61c4f695240caeccb74f78362"
+          "retry_codes_name": "non_idempotent",
+          "retry_params_name": "default"
         },
         "SampleRowKeys": {
-          "timeout_millis": 20000,
-          "retry_codes_name": "idempotent",
-          "retry_params_name": "5af39a0f6db447f61c4f695240caeccb74f78362"
+          "timeout_millis": 60000,
+          "retry_codes_name": "non_idempotent",
+          "retry_params_name": "default"
         },
         "MutateRow": {
-          "timeout_millis": 20000,
+          "timeout_millis": 60000,
           "retry_codes_name": "idempotent",
           "retry_params_name": "5af39a0f6db447f61c4f695240caeccb74f78362"
         },
         "MutateRows": {
-          "timeout_millis": 60000,
-          "retry_codes_name": "idempotent",
-          "retry_params_name": "5af39a0f6db447f61c4f695240caeccb74f78362"
+          "timeout_millis": 600000,
+          "retry_codes_name": "non_idempotent",
+          "retry_params_name": "default"
         },
         "CheckAndMutateRow": {
           "timeout_millis": 20000,
diff --git a/synth.metadata b/synth.metadata
index 1f3bafba9..937c109c1 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,15 +4,15 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/nodejs-bigtable.git",
-        "sha": "508d1f9e0c5b089d7a649eb1dd9e6fc166d17f7e"
+        "sha": "c6cc3bccf71316af8cf91cc86c1781f6addcdd07"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "a3a0bf0f6291d69f2ff3df7fcd63d28ee20ac727",
-        "internalRef": "310060413"
+        "sha": "94fe3637559a257634d7b47a15bb8d976daff788",
+        "internalRef": "316039767"
       }
     },
     {