diff --git a/components/opdk-iptables-block.yml b/components/opdk-iptables-block.yml
index 744c8b3..70144c4 100644
--- a/components/opdk-iptables-block.yml
+++ b/components/opdk-iptables-block.yml
@@ -4,8 +4,6 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-bootstrap
-  - apigee-opdk-setup-component-installer
   - { role: apigee-opdk-set-reachable, reachability: False, server_type: '{{ server_type_name }}' }
   - { role: apigee-opdk-iptables-port-block, destination_port: '{{ qpid_messaging_port }}' }
   - { role: apigee-opdk-update-component, apigee_component: '{{ upgrade_component }}' }
diff --git a/components/opdk-set-reachability.yml b/components/opdk-set-reachability.yml
new file mode 100644
index 0000000..dca6ffe
--- /dev/null
+++ b/components/opdk-set-reachability.yml
@@ -0,0 +1,7 @@
+---
+- hosts: '{{ hosts }}'
+  serial: 1
+  vars_files:
+  - ~/.apigee/credentials.yml
+  roles:
+  - { role: apigee-opdk-set-reachable, reachability: '{{ reachability_setting | bool }}', server_type: '{{ server_type_name }}' }
diff --git a/components/opdk-update-installer.yml b/components/opdk-update-installer.yml
new file mode 100644
index 0000000..551efe2
--- /dev/null
+++ b/components/opdk-update-installer.yml
@@ -0,0 +1,8 @@
+---
+- hosts: '{{ hosts }}'
+  serial: 1
+  vars_files:
+  - ~/.apigee/credentials.yml
+  roles:
+  - apigee-opdk-setup-bootstrap
+  - apigee-opdk-setup-component-installer
diff --git a/components/opdk-upgrade-component.yml b/components/opdk-upgrade-component.yml
index 9955c6d..453f57a 100644
--- a/components/opdk-upgrade-component.yml
+++ b/components/opdk-upgrade-component.yml
@@ -4,6 +4,4 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-bootstrap
-  - apigee-opdk-setup-component-installer
   - { role: apigee-opdk-update-component, apigee_component: '{{ upgrade_component }}' }
diff --git a/components/opdk-upgrade-reachability-component.yml b/components/opdk-upgrade-reachability-component.yml
index 613b39e..c07dd8a 100644
--- a/components/opdk-upgrade-reachability-component.yml
+++ b/components/opdk-upgrade-reachability-component.yml
@@ -4,8 +4,6 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-bootstrap
-  - apigee-opdk-setup-component-installer
   - { role: apigee-opdk-set-reachable, reachability: False, server_type: '{{ server_type_name }}' }
   - { role: apigee-opdk-update-component, apigee_component: '{{ upgrade_component }}' }
   - { role: apigee-opdk-set-reachable, reachability: True, server_type: '{{ server_type_name }}' }
diff --git a/upgrade.yml b/upgrade.yml
index 5186420..b75449f 100644
--- a/upgrade.yml
+++ b/upgrade.yml
@@ -12,13 +12,21 @@
   tasks:
   - name: All components should be running
     shell: "{{ apigee_all }} start"
+    tags:
+    - started
+
+- name: Update the installer for planet
+  include: components/opdk-update-installer.yml
+  vars:
+    hosts: planet
+    upgrade_edge: true
   tags:
-  - started
+  - installer
 
 - name: Upgrade DC-1 Cassandra
   include: components/opdk-upgrade-component.yml
   vars:
-    update_apigee_service: true
+    upgrade_edge: true
     hosts: ds
     upgrade_component: cs,zk
   tags:
@@ -27,17 +35,17 @@
 - name: Upgrade DC-1 qpid
   include: components/opdk-iptables-block.yml
   vars:
-    update_apigee_service: true
+    upgrade_edge: true
     hosts: qpid
     server_type_name: qs
-    upgrade_component: edge
+    upgrade_component: qpid
   tags:
   - qpid
 
 - name: Upgrade DC-1 ldap
   include: components/opdk-upgrade-component.yml
   vars:
-    update_apigee_service: true
+    upgrade_edge: true
     hosts: ldap
     upgrade_component: ldap
   tags:
@@ -46,26 +54,61 @@
 - name: Upgrade DC-1 ms
   include: components/opdk-upgrade-component.yml
   vars:
-    update_apigee_service: true
+    upgrade_edge: true
     hosts: qpid,ms
     upgrade_component: edge
   tags:
-  - qpid
+  - qpid_edge
+
+- name: Unset reachability for router
+  include: components/opdk-set-reachability.yml
+  vars:
+    server_type_name: router
+    reachability_setting: False
+    hosts: rmp
+  tags:
+  - rmp_edge
+
+- name: Unset reachability for message rocessor
+  include: components/opdk-set-reachability.yml
+  vars:
+    server_type_name: mp
+    reachability_setting: False
+    hosts: rmp
+  tags:
+  - rmp_edge
 
 - name: Upgrade DC-1 rmp
-  include: components/opdk-upgrade-reachability-component.yml
+  include: components/opdk-upgrade-component.yml
   vars:
-    update_apigee_service: true
+    upgrade_edge: true
     hosts: rmp
-    server_type_name: router
     upgrade_component: edge
   tags:
-  - rmp
+  - rmp_edge
+
+- name: Unset reachability for router
+  include: components/opdk-set-reachability.yml
+  vars:
+    server_type_name: router
+    reachability_setting: True
+    hosts: rmp
+  tags:
+  - rmp_edge
+
+- name: Unset reachability for message rocessor
+  include: components/opdk-set-reachability.yml
+  vars:
+    server_type_name: mp
+    reachability_setting: True
+    hosts: rmp
+  tags:
+  - rmp_edge
 
 - name: Upgrade DC-1 ui
   include: components/opdk-upgrade-component.yml
   vars:
-    update_apigee_service: true
+    upgrade_edge: true
     hosts: ui
     upgrade_component: ui
   tags:
@@ -85,7 +128,7 @@
 - name: Upgrade DC-1 PS component
   include: components/opdk-upgrade-component.yml
   vars:
-    update_apigee_service: true
+    upgrade_edge: true
     hosts: pgmaster
     server_type_name: ps
     upgrade_component: ps
@@ -106,7 +149,7 @@
 - name: Upgrade DC-1 Postgres standby
   include: components/opdk-upgrade-component.yml
   vars:
-    update_apigee_service: true
+    upgrade_edge: true
     hosts: pgstandby
     server_type_name: ps
     upgrade_component: ps
@@ -164,7 +207,7 @@
 - name: Upgrade DC-1 PG with edge for remaining components
   include: components/opdk-upgrade-component.yml
   vars:
-    update_apigee_service: true
+    upgrade_edge: true
     hosts: pg
     upgrade_component: edge
   tags: