diff --git a/google/bigtable/admin/v2/bigtableadmin_gapic.yaml b/google/bigtable/admin/v2/bigtableadmin_gapic.yaml
index a6fdd0a171..4233e2a0d0 100644
--- a/google/bigtable/admin/v2/bigtableadmin_gapic.yaml
+++ b/google/bigtable/admin/v2/bigtableadmin_gapic.yaml
@@ -97,7 +97,7 @@ interfaces:
     retry_params_name: default
     field_name_patterns:
       name: instance
-    timeout_millis: 60000
+    timeout_millis: 120000
     header_request_params:
     - name
   - name: ListInstances
@@ -113,7 +113,7 @@ interfaces:
     field_name_patterns:
       parent: project
     resource_name_treatment: STATIC_TYPES
-    timeout_millis: 60000
+    timeout_millis: 120000
     header_request_params:
     - parent
   - name: UpdateInstance
@@ -168,12 +168,12 @@ interfaces:
     required_fields:
     - name
     request_object_method: false
-    retry_codes_name: idempotent
+    retry_codes_name: non_idempotent
     retry_params_name: default
     field_name_patterns:
       name: instance
     resource_name_treatment: STATIC_TYPES
-    timeout_millis: 60000
+    timeout_millis: 150000
     header_request_params:
     - name
   - name: CreateCluster
@@ -216,7 +216,7 @@ interfaces:
     field_name_patterns:
       name: cluster
     resource_name_treatment: STATIC_TYPES
-    timeout_millis: 60000
+    timeout_millis: 120000
     header_request_params:
     - name
   - name: ListClusters
@@ -232,7 +232,7 @@ interfaces:
     field_name_patterns:
       parent: instance
     resource_name_treatment: STATIC_TYPES
-    timeout_millis: 60000
+    timeout_millis: 120000
     header_request_params:
     - parent
   - name: UpdateCluster
@@ -263,12 +263,12 @@ interfaces:
     required_fields:
     - name
     request_object_method: false
-    retry_codes_name: idempotent
+    retry_codes_name: non_idempotent
     retry_params_name: default
     field_name_patterns:
       name: cluster
     resource_name_treatment: STATIC_TYPES
-    timeout_millis: 60000
+    timeout_millis: 120000
     header_request_params:
     - name
   - name: CreateAppProfile
@@ -288,7 +288,7 @@ interfaces:
     field_name_patterns:
       parent: instance
     resource_name_treatment: STATIC_TYPES
-    timeout_millis: 60000
+    timeout_millis: 120000
     header_request_params:
     - parent
   - name: GetAppProfile
@@ -304,7 +304,7 @@ interfaces:
     field_name_patterns:
       name: app_profile
     resource_name_treatment: STATIC_TYPES
-    timeout_millis: 60000
+    timeout_millis: 120000
     header_request_params:
     - name
   - name: ListAppProfiles
@@ -326,7 +326,7 @@ interfaces:
     field_name_patterns:
       parent: instance
     resource_name_treatment: STATIC_TYPES
-    timeout_millis: 60000
+    timeout_millis: 120000
     header_request_params:
     - parent
   - name: UpdateAppProfile
@@ -344,7 +344,7 @@ interfaces:
     field_name_patterns:
       app_profile.name: app_profile
     resource_name_treatment: STATIC_TYPES
-    timeout_millis: 60000
+    timeout_millis: 120000
     long_running:
       return_type: google.bigtable.admin.v2.AppProfile
       metadata_type: google.bigtable.admin.v2.UpdateAppProfileMetadata
@@ -368,7 +368,7 @@ interfaces:
     field_name_patterns:
       name: app_profile
     resource_name_treatment: STATIC_TYPES
-    timeout_millis: 60000
+    timeout_millis: 120000
     header_request_params:
     - name
   - name: GetIamPolicy
@@ -383,7 +383,7 @@ interfaces:
     retry_params_name: default
     field_name_patterns:
       resource: instance
-    timeout_millis: 60000
+    timeout_millis: 120000
     header_request_params:
     - resource
   - name: SetIamPolicy
@@ -400,7 +400,7 @@ interfaces:
     retry_params_name: default
     field_name_patterns:
       resource: instance
-    timeout_millis: 60000
+    timeout_millis: 120000
     header_request_params:
     - resource
   - name: TestIamPermissions
@@ -417,7 +417,7 @@ interfaces:
     retry_params_name: default
     field_name_patterns:
       resource: instance
-    timeout_millis: 60000
+    timeout_millis: 120000
     header_request_params:
     - resource
 - name: google.bigtable.admin.v2.BigtableTableAdmin
@@ -449,22 +449,6 @@ interfaces:
     rpc_timeout_multiplier: 1
     max_rpc_timeout_millis: 20000
     total_timeout_millis: 600000
-  - name: create_table
-    initial_retry_delay_millis: 100
-    retry_delay_multiplier: 1.3
-    max_retry_delay_millis: 60000
-    initial_rpc_timeout_millis: 130000
-    rpc_timeout_multiplier: 1
-    max_rpc_timeout_millis: 130000
-    total_timeout_millis: 3600000
-  - name: drop_row_range
-    initial_retry_delay_millis: 100
-    retry_delay_multiplier: 1.3
-    max_retry_delay_millis: 60000
-    initial_rpc_timeout_millis: 900000
-    rpc_timeout_multiplier: 1
-    max_rpc_timeout_millis: 900000
-    total_timeout_millis: 3600000
   methods:
   - name: CreateTable
     flattening:
@@ -479,11 +463,11 @@ interfaces:
     - table
     request_object_method: true
     retry_codes_name: non_idempotent
-    retry_params_name: create_table
+    retry_params_name: default
     field_name_patterns:
       parent: instance
     resource_name_treatment: STATIC_TYPES
-    timeout_millis: 130000
+    timeout_millis: 900000
     header_request_params:
     - parent
   - name: CreateTableFromSnapshot
@@ -532,7 +516,7 @@ interfaces:
     field_name_patterns:
       parent: instance
     resource_name_treatment: STATIC_TYPES
-    timeout_millis: 60000
+    timeout_millis: 120000
     header_request_params:
     - parent
   - name: GetTable
@@ -548,7 +532,7 @@ interfaces:
     field_name_patterns:
       name: table
     resource_name_treatment: STATIC_TYPES
-    timeout_millis: 60000
+    timeout_millis: 120000
     header_request_params:
     - name
   - name: DeleteTable
@@ -559,12 +543,12 @@ interfaces:
     required_fields:
     - name
     request_object_method: false
-    retry_codes_name: idempotent
+    retry_codes_name: non_idempotent
     retry_params_name: default
     field_name_patterns:
       name: table
     resource_name_treatment: STATIC_TYPES
-    timeout_millis: 60000
+    timeout_millis: 120000
     header_request_params:
     - name
   - name: ModifyColumnFamilies
@@ -582,7 +566,7 @@ interfaces:
     field_name_patterns:
       name: table
     resource_name_treatment: STATIC_TYPES
-    timeout_millis: 60000
+    timeout_millis: 900000
     header_request_params:
     - name
   - name: DropRowRange
@@ -590,7 +574,7 @@ interfaces:
     - name
     request_object_method: true
     retry_codes_name: non_idempotent
-    retry_params_name: drop_row_range
+    retry_params_name: default
     field_name_patterns:
       name: table
     resource_name_treatment: STATIC_TYPES