diff --git a/rolling-restart.yml b/rolling-restart.yml
index 52d2329..0aa74d3 100644
--- a/rolling-restart.yml
+++ b/rolling-restart.yml
@@ -1,25 +1,15 @@
 ---
-#- name: Perform rolling restart of edge components
-#  hosts: ds
-#  gather_facts: no
-#  serial: 1
-#  roles:
-#  - { role: apigee-opdk-cassandra-shutdown-preparation, tags: ['stop', 'restart'] }
-#  - { role: apigee-opdk-stop-components, tags: ['pre_restart', 'pre_stop', 'stop'] }
-#  - { role: apigee-opdk-start-components, tags: ['pre_restart', 'pre_start','start'], component_start_delay: '{{ start_delay | default(0) }}' }
-#  - { role: apigee-opdk-setup-status, tags: ['pre_restart', 'pre_start','start'] }
-
 - name: Perform rolling restart of RMPs
-  hosts: rmp
+  hosts: '{{ hosts }}'
   gather_facts: no
   serial: 1
   roles:
-  - { role: apigee-opdk-server-self, server_types: ['mp']}
-  - { role: apigee-opdk-set-reachable, reachability: 'false', server_types: ['mp'] }
-  - { role: apigee-opdk-stop-components, tags: ['pre_restart', 'pre_stop', 'stop'], component_name: 'edge-message-processor'  }
-  - { 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-server-self, server_types: '{{ self_server_types }}', when: self_server_types is defined}
+  - { role: apigee-opdk-set-reachable, reachability: 'false', server_types: '{{ self_server_types }}', when: self_server_types is defined }
+  - { role: apigee-opdk-stop-components, tags: ['pre_restart', 'pre_stop', 'stop'], component_name: '{{ component }}'  }
+  - { 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: ['mp'] }
+  - { 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
diff --git a/update-replication-factor.yml b/update-replication-factor.yml
index faf9efd..d0cd04e 100644
--- a/update-replication-factor.yml
+++ b/update-replication-factor.yml
@@ -22,7 +22,7 @@
 
 - name: Set message processor consistencylevel=TWO
   include: consistency.yml
-  tags: ['two']
+  tags: ['two', 'two-rmp']
   vars:
     hosts: rmp
     consistency_level: 'TWO'
@@ -31,16 +31,28 @@
 
 - name: Set management server consistencylevel=TWO
   include: consistency.yml
-  tags: ['two']
+  tags: ['two', 'two-ms']
   vars:
     hosts: ms
     consistency_level: 'TWO'
     property_file: 'management-server'
     enable_cache: 'false'
 
-- name: Rolling restart of Cassandra, RMP and MS
+- name: Rolling restart of RMP
   include: rolling-restart.yml
-  tags: ['restart', 'two', 'local-quorum']
+  vars:
+    hosts: 'rmp'
+    component: 'edge-message-processor'
+    self_server_types: ['mp']
+  tags: ['restart','restart-rmp']
+
+- name: Rolling restart of Management Server
+  include: rolling-restart.yml
+  vars:
+    hosts: 'ms'
+    component: 'edge-management-server'
+    self_server_types: ['ms']
+  tags: ['restart','restart-ms']
 
 - name: Execute nodetool repair on Cassandra nodes after updating
   include: repair.yml
@@ -74,12 +86,25 @@
 - name: Execute nodetool repair on Cassandra nodes after updating
   include: repair.yml
 
-- name: Rolling restart of Cassandra, RMP and MS
+- name: Rolling restart of RMP
   include: rolling-restart.yml
+  vars:
+    hosts: 'rmp'
+    component: 'edge-message-processor'
+    self_server_types: ['mp']
+  tags: ['restart','restart-rmp']
+
+- name: Rolling restart of Management Server
+  include: rolling-restart.yml
+  vars:
+    hosts: 'ms'
+    component: 'edge-management-server'
+    self_server_types: ['ms']
+  tags: ['restart','restart-ms']
 
 - name: Set message processor consistencylevel=LOCAL_QUORUM
   include: consistency.yml
-  tags: ['local-quorum']
+  tags: ['local-quorum', 'local-quorum-rmp']
   vars:
     hosts: rmp
     consistency_level: 'LOCAL_QUORUM'
@@ -88,16 +113,13 @@
 
 - name: Set management server consistencylevel=LOCAL_QUORUM
   include: consistency.yml
-  tags: ['local-quorum']
+  tags: ['local-quorum', 'local-quorum-ms']
   vars:
     hosts: ms
     consistency_level: 'LOCAL_QUORUM'
     property_file: 'management-server'
     enable_cache: 'true'
 
-- name: Rolling restart of Cassandra, RMP and MS
-  include: rolling-restart.yml
-
 - name: Download logs and configs from dc-1-ds
   include: opdk-setup-log-files.yml
   vars: