diff --git a/backup.yml b/backup.yml
new file mode 100644
index 0000000..735c19b
--- /dev/null
+++ b/backup.yml
@@ -0,0 +1,97 @@
+---
+- 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
+  vars:
+    hosts: 'ds'
+    component_name: 'apigee-zookeeper'
+  tags:
+  - zookeeper
+
+- name: Backup cassandra
+  include: components/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/components/opdk-backup.yml
new file mode 100644
index 0000000..cb3fdba
--- /dev/null
+++ b/components/opdk-backup.yml
@@ -0,0 +1,5 @@
+---
+- hosts: '{{ hosts }}'
+  gather_facts: no
+  roles:
+  - { role: apigee-opdk-backup, component_profile: '{{ component_name }}' }
diff --git a/requirements.yml b/requirements.yml
index 4902cc9..91c6844 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -10,3 +10,5 @@
 - src: https://github.com/carlosfrias/apigee-opdk-setup-default-settings.git
 
 - src: https://github.com/carlosfrias/apigee-opdk-cache-update.git
+
+- src: https://github.com/carlosfrias/apigee-opdk-backup
diff --git a/update.yml b/update.yml
index b90bfaf..b965b42 100644
--- a/update.yml
+++ b/update.yml
@@ -8,6 +8,11 @@
   roles:
   - apigee-opdk-setup-default-settings
 
+- name: Create backup prior to doing any work
+  include: backup.yml
+  tags:
+  - 'backup'
+
 - name: Rolling restart of RMP and MS
   hosts: rmp,ms
   gather_facts: no
@@ -15,8 +20,8 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - { role: apigee-opdk-stop-components, tags: ['pre_restart', 'pre_stop'] }
-  - { role: apigee-opdk-start-components, tags: ['pre_restart', 'pre_start'], component_start_delay: '{{ start_delay | default(0) }}' }
+  - { 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) }}' }
 
 - name: Change cassandra replication factor
   gather_facts: no