diff --git a/update.yml b/update.yml
index 63fea72..b90bfaf 100644
--- a/update.yml
+++ b/update.yml
@@ -1,13 +1,16 @@
 ---
 - name: Update the ansible cache
   hosts: planet
+  gather_facts: no
   tags: ['cache']
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
   - apigee-opdk-setup-default-settings
 
+- name: Rolling restart of RMP and MS
   hosts: rmp,ms
+  gather_facts: no
   serial: 1
   vars_files:
   - ~/.apigee/credentials.yml
@@ -16,6 +19,7 @@
   - { role: apigee-opdk-start-components, tags: ['pre_restart', 'pre_start'], component_start_delay: '{{ start_delay | default(0) }}' }
 
 - name: Change cassandra replication factor
+  gather_facts: no
   hosts: ds[0]
   serial: 1
   vars_files:
@@ -42,14 +46,16 @@
 
 - name: Execute nodetool repair on Cassandra nodes
   hosts: ds
+  gather_facts: no
   serial: 1
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
   - { role: apigee-opdk-cassandra-repair, tags: ['repair'] }
 
-- name: Rolling restart of all RMPs and MS
+- name: Rolling restart of RMPs and MS
   hosts: rmp,ms
+  gather_facts: no
   serial: 1
   vars_files:
   - ~/.apigee/credentials.yml
@@ -57,10 +63,12 @@
   - { role: apigee-opdk-stop-components, tags: ['post_restart', 'post_stop'] }
   - { role: apigee-opdk-start-components, tags: ['post_restart', 'post_start'], component_start_delay: '{{ start_delay | default(0) }}' }
 
-- hosts: ms,rmp,qpid,pg
+- name: Rolling restart of remaining components
+  hosts: ms,rmp,qpid,pg
+  gather_facts: no
   serial: 1
   roles:
   - { role: apigee-opdk-stop-components, tags: ['stop'] }
-  - { role: apigee-opdk-start-components, tags: ['start'] }
+  - { role: apigee-opdk-start-components, tags: ['start'], component_start_delay: '{{ start_delay | default(0) }}' }
   tags:
   - restart