diff --git a/upgrade-edge-planet.yml b/upgrade-edge-planet.yml
index 262ff43..6b20fcf 100644
--- a/upgrade-edge-planet.yml
+++ b/upgrade-edge-planet.yml
@@ -157,6 +157,7 @@
 
   roles:
   - { role: apigee-opdk-setup-silent-installation-config, opdk_version: "{{ upgrade_from_opdk_version }}", tags: ['rmp-config'] }
+  - { role: apigee-opdk-server-self, server_types: ['router', 'mp'], tags: ['self']  }
   - { role: apigee-opdk-set-reachable, reachability: False, server_types: ['router', 'mp'], tags: ['rmp-reachability-false'] }
   - { role: apigee-opdk-update-component, component: 'edge', tags: ['rmp-upgrade'] }
   - { role: apigee-opdk-set-reachable, reachability: True, server_types: ['router', 'mp'], tags: ['rmp-reachability-true'] }
@@ -208,6 +209,7 @@
 
   roles:
   - { role: apigee-opdk-setup-silent-installation-config, opdk_version: "{{ upgrade_from_opdk_version }}", tags: ['r-config'] }
+  - { role: apigee-opdk-server-self, server_types: ['router'], tags: ['self']  }
   - { role: apigee-opdk-set-reachable, reachability: False, server_types: ['router'], tags: ['r-reachability-false'] }
   - { role: apigee-opdk-update-component, component: 'edge', tags: ['r-upgrade'] }
   - { role: apigee-opdk-set-reachable, reachability: True, server_types: ['router'], tags: ['r-reachability-true'] }
@@ -252,6 +254,7 @@
       msg: "Upgrading component edge on {{ inventory_hostname }} ( {{ ansible_hostname }} )"
   roles:
   - { role: apigee-opdk-setup-silent-installation-config, opdk_version: "{{ upgrade_from_opdk_version }}", tags: ['mp-config'] }
+  - { role: apigee-opdk-server-self, server_types: ['mp'], tags: ['self']  }
   - { role: apigee-opdk-set-reachable, reachability: False, server_types: ['mp'], tags: ['mp-reachability-false'] }
   - { role: apigee-opdk-update-component, component: 'edge', tags: ['mp-upgrade'] }
   - { role: apigee-opdk-set-reachable, reachability: True, server_types: ['mp'], tags: ['mp-reachability-true'] }