diff --git a/rolling-restart.yml b/rolling-restart.yml
index 0aa74d3..994de99 100644
--- a/rolling-restart.yml
+++ b/rolling-restart.yml
@@ -1,5 +1,5 @@
 ---
-- name: Perform rolling restart of RMPs
+- name: Perform rolling restart
   hosts: '{{ hosts }}'
   gather_facts: no
   serial: 1
@@ -10,13 +10,3 @@
   - { role: apigee-opdk-start-components, tags: ['pre_restart', 'pre_start','start'], component_start_delay: '{{ start_delay | default(0) }}', component_name: '{{ component }}', when: self_server_types is defined }
   - { role: apigee-opdk-setup-status, tags: ['pre_restart', 'pre_start','start'] }
   - { role: apigee-opdk-set-reachable, reachability: 'true', server_types: '{{ self_server_types }}', when: self_server_types is defined }
-
-- name: Perform rolling restart of Management Servers
-  hosts: ms
-  gather_facts: no
-  serial: 1
-  roles:
-  - { role: apigee-opdk-server-self, server_types: ['ms']}
-  - { role: apigee-opdk-stop-components, tags: ['pre_restart', 'pre_stop', 'stop'], component_name: 'edge-management-server'  }
-  - { role: apigee-opdk-start-components, tags: ['pre_restart', 'pre_start','start'], component_start_delay: '{{ start_delay | default(0) }}', component_name: 'edge-message-processor' }
-  - { role: apigee-opdk-setup-status, tags: ['pre_restart', 'pre_start','start'] }
diff --git a/update-replication-factor.yml b/update-replication-factor.yml
index d0cd04e..9b33757 100644
--- a/update-replication-factor.yml
+++ b/update-replication-factor.yml
@@ -92,7 +92,6 @@
     hosts: 'rmp'
     component: 'edge-message-processor'
     self_server_types: ['mp']
-  tags: ['restart','restart-rmp']
 
 - name: Rolling restart of Management Server
   include: rolling-restart.yml
@@ -100,7 +99,6 @@
     hosts: 'ms'
     component: 'edge-management-server'
     self_server_types: ['ms']
-  tags: ['restart','restart-ms']
 
 - name: Set message processor consistencylevel=LOCAL_QUORUM
   include: consistency.yml