diff --git a/upgrade.yml b/upgrade.yml
index a62d0dd..8896367 100644
--- a/upgrade.yml
+++ b/upgrade.yml
@@ -78,15 +78,13 @@
   include: components/opdk-upgrade-component.yml
   vars:
     update_apigee_service: true
-    hosts: dc-1-qpid,dc-1-ui
+    hosts: dc-1-qpid,dc-1-ms
     upgrade_component: edge
   tags:
-  - rmp
   - qpid
-  - ui
-  - dc-1-rmp
+  - ms
   - dc-1-qpid
-  - dc-1-rui
+  - dc-1-ms
   - dc-1
 
 - name: Upgrade DC-1 rmp