diff --git a/backup.yml b/backup.yml
index 735c19b..e5978f2 100644
--- a/backup.yml
+++ b/backup.yml
@@ -1,14 +1,6 @@
 ---
-- name: Update the ansible cache
-  hosts: planet
-  tags: ['cache']
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-default-settings
-
 - name: Backup zookeeper
-  include: components/opdk-backup.yml
+  include: opdk-backup.yml
   vars:
     hosts: 'ds'
     component_name: 'apigee-zookeeper'
@@ -16,82 +8,9 @@
   - zookeeper
 
 - name: Backup cassandra
-  include: components/opdk-backup.yml
+  include: opdk-backup.yml
   vars:
     hosts: 'ds'
     component_name: 'apigee-cassandra'
   tags:
   - cassandra
-
-- name: Backup router
-  include: components/opdk-backup.yml
-  vars:
-    hosts: 'rmp'
-    component_name: 'edge-router'
-  tags:
-  - router
-
-- name: Backup mp
-  include: components/opdk-backup.yml
-  vars:
-    hosts: 'rmp'
-    component_name: 'edge-message-processor'
-  tags:
-  - mp
-
-- name: Backup ps
-  include: components/opdk-backup.yml
-  vars:
-    hosts: 'pg'
-    component_name: 'edge-postgres-server'
-  tags:
-  - ps
-
-- name: Backup postgres
-  include: components/opdk-backup.yml
-  vars:
-    hosts: 'pgmaster[0]'
-    component_name: 'apigee-postgresql'
-  tags:
-  - pg
-
-- name: Backup qs
-  include: components/opdk-backup.yml
-  vars:
-    hosts: 'qpid'
-    component_name: 'edge-qpid-server'
-  tags:
-  - qs
-
-- name: Backup qpid
-  include: components/opdk-backup.yml
-  vars:
-    hosts: 'qpid'
-    component_name: 'apigee-qpidd'
-  tags:
-  - qpid
-
-- name: Backup ldap
-  include: components/opdk-backup.yml
-  vars:
-    hosts: 'ldap'
-    component_name: 'apigee-openldap'
-  tags:
-  - ldap
-
-- name: Backup ms
-  include: components/opdk-backup.yml
-  vars:
-    hosts: 'ms'
-    component_name: 'edge-management-server'
-  tags:
-  - ms
-
-- name: Backup ui
-  include: components/opdk-backup.yml
-  vars:
-    hosts: 'ui'
-    component_name: 'edge-ui'
-  tags:
-  - ui
-
diff --git a/components/opdk-backup.yml b/opdk-backup.yml
similarity index 100%
rename from components/opdk-backup.yml
rename to opdk-backup.yml
diff --git a/update.yml b/update.yml
index 5af134c..86948ea 100644
--- a/update.yml
+++ b/update.yml
@@ -13,12 +13,10 @@
   tags:
   - 'backup'
 
-- name: Rolling restart of RMP and MS
-  hosts: rmp,ms
+- name: Rolling restart of Cassandra, RMP and MS
+  hosts: ds,rmp,ms
   gather_facts: no
   serial: 1
-  vars_files:
-  - ~/.apigee/credentials.yml
   roles:
   - { role: apigee-opdk-stop-components, tags: ['pre_restart', 'pre_stop', 'stop', 'restart'] }
   - { role: apigee-opdk-start-components, tags: ['pre_restart', 'pre_start','start', 'restart'], component_start_delay: '{{ start_delay | default(0) }}' }
@@ -27,8 +25,6 @@
   gather_facts: no
   hosts: ds[0]
   serial: 1
-  vars_files:
-  - ~/.apigee/credentials.yml
   vars:
     cassandra_keyspaces:
     - auth
@@ -53,31 +49,17 @@
   hosts: ds
   gather_facts: no
   serial: 1
-  vars_files:
-  - ~/.apigee/credentials.yml
   roles:
   - { role: apigee-opdk-cassandra-repair, tags: ['repair'] }
 
-- name: Rolling restart of RMPs and MS
-  hosts: rmp,ms
+- name: Rolling restart of Cassandra, RMPs and MS
+  hosts: ds,rmp,ms
   gather_facts: no
   serial: 1
-  vars_files:
-  - ~/.apigee/credentials.yml
   roles:
   - { 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) }}' }
 
-- 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'], component_start_delay: '{{ start_delay | default(0) }}' }
-  tags:
-  - restart
-
 - name: Download logs and configs from dc-1-ds
   include: opdk-setup-log-files.yml
   vars: