diff --git a/components/opdk-install-component.yml b/components/opdk-install-component.yml
index 2c3151e..63f740c 100644
--- a/components/opdk-install-component.yml
+++ b/components/opdk-install-component.yml
@@ -4,6 +4,7 @@
   gather_facts: no
   roles:
   - apigee-opdk-setup-java-home
+  - { role: apigee-opdk-setup-bootstrap, tags: ['apigee-pre-req', 'apigee-bootstrap'] }
   - apigee-opdk-setup-component-installer
   - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
   tags:
diff --git a/components/opdk-update-installer.yml b/components/opdk-update-installer.yml
index 8c71785..74c57df 100644
--- a/components/opdk-update-installer.yml
+++ b/components/opdk-update-installer.yml
@@ -2,9 +2,7 @@
 - hosts: '{{ hosts }}'
   serial: 1
   gather_facts: no
-  vars_files:
-  - ~/.apigee/credentials.yml
   roles:
   - apigee-opdk-setup-java-home
   - apigee-opdk-setup-bootstrap
-  - apigee-opdk-setup-component-installer
+  - { role: 'apigee-opdk-setup-component-installer', upgrade_edge: true }
diff --git a/components/opdk-upgrade-component.yml b/components/opdk-upgrade-component.yml
index 0362ef2..4e10d4e 100644
--- a/components/opdk-upgrade-component.yml
+++ b/components/opdk-upgrade-component.yml
@@ -2,8 +2,6 @@
 - hosts: '{{ hosts }}'
   serial: 1
   gather_facts: no
-  vars_files:
-  - ~/.apigee/credentials.yml
   roles:
   - {
       role: apigee-opdk-set-reachable,
diff --git a/upgrade-rollback.yml b/upgrade-rollback.yml
new file mode 100644
index 0000000..b3f6d95
--- /dev/null
+++ b/upgrade-rollback.yml
@@ -0,0 +1,25 @@
+---
+- name: Update the ansible cache
+  hosts: planet
+  tags: ['cache']
+  gather_facts: no
+  vars_files:
+  - ~/.apigee/credentials.yml
+  roles:
+  - apigee-opdk-setup-default-settings
+
+- name: Rolling back installation and bootstrap
+  hosts: '{{ hosts }}'
+  gather_facts: no
+  vars:
+    remove_apigee: true
+    opdk_version: 4.16.01
+  roles:
+  - apigee-opdk-setup-bootstrap-rollback
+
+- name: Bootstap to the specified version on attribute opdk_version
+  include: components/opdk-install-component.yml
+  vars:
+    opdk_version: 4.16.01
+    component_profile: "{{ component }}"
+    upgrade_edge: true
diff --git a/upgrade.yml b/upgrade.yml
index 98160dd..89934d1 100644
--- a/upgrade.yml
+++ b/upgrade.yml
@@ -34,14 +34,6 @@
   tags:
   - cs-zk
 
-- name: Restore qpid component that is mysteriously uninstalled
-  include: components/opdk-install-component.yml
-  vars:
-    hosts: 'qpid'
-    component_profile: 'qs'
-  tags:
-  - qpid_reinstall
-
 - name: Upgrade qpid
   include: components/opdk-upgrade-component.yml
   vars: