diff --git a/google/pubsub/v1/pubsub.yaml b/google/pubsub/v1/pubsub.yaml
index 0b80db09..258083c0 100644
--- a/google/pubsub/v1/pubsub.yaml
+++ b/google/pubsub/v1/pubsub.yaml
@@ -2,7 +2,7 @@
 
 type: google.api.Service
 config_version: 1
-name: pubsub-experimental.googleapis.com
+name: pubsub.googleapis.com
 
 title: Google Cloud Pub/Sub API
 
diff --git a/google/pubsub/v1/pubsub_gapic.yaml b/google/pubsub/v1/pubsub_gapic.yaml
index 2fc00d61..f012bd62 100644
--- a/google/pubsub/v1/pubsub_gapic.yaml
+++ b/google/pubsub/v1/pubsub_gapic.yaml
@@ -32,12 +32,20 @@ interfaces:
   retry_params_def:
   - name: default
     initial_retry_delay_millis: 100
-    retry_delay_multiplier: 1.2
-    max_retry_delay_millis: 1000
-    initial_rpc_timeout_millis: 2000
-    rpc_timeout_multiplier: 1.5
-    max_rpc_timeout_millis: 30000
-    total_timeout_millis: 45000
+    retry_delay_multiplier: 1.3
+    max_retry_delay_millis: 60000 # 60 seconds
+    initial_rpc_timeout_millis: 60000 # 60 seconds
+    rpc_timeout_multiplier: 1
+    max_rpc_timeout_millis: 60000 # 60 seconds
+    total_timeout_millis: 600000 # 10 minutes
+  - name: messaging
+    initial_retry_delay_millis: 100
+    retry_delay_multiplier: 1.3
+    max_retry_delay_millis: 60000 # 60 seconds
+    initial_rpc_timeout_millis: 12000 # 12 seconds
+    rpc_timeout_multiplier: 1
+    max_rpc_timeout_millis: 12000 # 12 seconds
+    total_timeout_millis: 600000 # 10 minutes
   methods:
   - name: CreateSubscription
     flattening:
@@ -50,7 +58,7 @@ interfaces:
     required_fields:
       - name
       - topic
-    retry_codes_name: non_idempotent
+    retry_codes_name: idempotent
     retry_params_name: default
     request_object_method: true
     field_name_patterns:
@@ -124,7 +132,7 @@ interfaces:
       - subscription
       - ack_ids
     retry_codes_name: non_idempotent
-    retry_params_name: default
+    retry_params_name: messaging
     request_object_method: true
     field_name_patterns:
       subscription: subscription
@@ -139,7 +147,7 @@ interfaces:
       - subscription
       - max_messages
     retry_codes_name: non_idempotent
-    retry_params_name: default
+    retry_params_name: messaging
     request_object_method: true
     field_name_patterns:
       subscription: subscription
@@ -168,17 +176,29 @@ interfaces:
     retry_codes:
     - UNAVAILABLE
     - DEADLINE_EXCEEDED
+  - name: one_plus_delivery
+    retry_codes:
+    - UNAVAILABLE
+    - DEADLINE_EXCEEDED
   - name: non_idempotent
     retry_codes:
   retry_params_def:
   - name: default
     initial_retry_delay_millis: 100
-    retry_delay_multiplier: 1.2
-    max_retry_delay_millis: 1000
-    initial_rpc_timeout_millis: 2000
-    rpc_timeout_multiplier: 1.5
-    max_rpc_timeout_millis: 30000
-    total_timeout_millis: 45000
+    retry_delay_multiplier: 1.3
+    max_retry_delay_millis: 60000 # 60 seconds
+    initial_rpc_timeout_millis: 60000 # 60 seconds
+    rpc_timeout_multiplier: 1
+    max_rpc_timeout_millis: 60000 # 60 seconds
+    total_timeout_millis: 600000 # 10 minutes
+  - name: messaging
+    initial_retry_delay_millis: 100
+    retry_delay_multiplier: 1.3
+    max_retry_delay_millis: 60000 # 60 seconds
+    initial_rpc_timeout_millis: 12000 # 12 seconds
+    rpc_timeout_multiplier: 1
+    max_rpc_timeout_millis: 12000 # 12 seconds
+    total_timeout_millis: 600000 # 10 minutes
   methods:
   - name: CreateTopic
     flattening:
@@ -201,16 +221,16 @@ interfaces:
     required_fields:
       - topic
       - messages
-    retry_codes_name: non_idempotent
-    retry_params_name: default
+    retry_codes_name: one_plus_delivery
+    retry_params_name: messaging
     request_object_method: true
     bundling:
       thresholds:
-        element_count_threshold: 800
-        element_count_limit: 1000 # server limit
-        request_byte_threshold: 8388608 # 8 mb
-        request_byte_limit: 10485760 # 10 mb - server limit
-        delay_threshold_millis: 100
+        element_count_threshold: 10
+        element_count_limit: 1000 # TO BE REMOVED LATER
+        request_byte_threshold: 1024 # 1 Kb
+        request_byte_limit: 10485760 # TO BE REMOVED LATER
+        delay_threshold_millis: 10
       bundle_descriptor:
         bundled_field: messages
         discriminator_fields: