diff --git a/cassandra-repair.yml b/cassandra-repair.yml
new file mode 100644
index 0000000..68f8198
--- /dev/null
+++ b/cassandra-repair.yml
@@ -0,0 +1,11 @@
+---
+- include: configuration/update_cache.yml
+
+- hosts: ds
+  serial: 1
+  vars_files:
+  - ~/.apigee/credentials.yml
+
+  roles:
+  - apigee-opdk-setup-default-settings
+  - apigee-opdk-cassandra-repair
diff --git a/configuration/update_cache.yml b/configuration/update_cache.yml
new file mode 100644
index 0000000..754e9e4
--- /dev/null
+++ b/configuration/update_cache.yml
@@ -0,0 +1,11 @@
+---
+- hosts: planet
+  vars_files:
+  - ~/.apigee/credentials.yml
+  pre_tasks:
+  - setup:
+  - ec2_facts:
+    when: "{{ ansible_bios_version | lower | search('amazon') }}"
+  roles:
+  - apigee-opdk-setup-default-settings
+
diff --git a/replication_factor_update.yml b/replication_factor_update.yml
new file mode 100644
index 0000000..84ee29b
--- /dev/null
+++ b/replication_factor_update.yml
@@ -0,0 +1,25 @@
+---
+- include: configuration/update_cache.yml
+
+- hosts: '{{ hosts }}'
+  serial: 1
+  vars_files:
+  - ~/.apigee/credentials.yml
+  vars:
+    keyspaces:
+    - apimodel
+    - analytics
+    - counter
+    - devconnect
+    - edgenotification
+    - audit
+    - scheduler
+    - cache
+    - keyvaluemap
+    - kms
+    - auth
+    - ax_custom_report_model
+
+  roles:
+  - apigee-opdk-setup-default-settings
+  - apigee-opdk-cassandra-change-replication-factor
diff --git a/requirements.yml b/requirements.yml
index fc14d05..c214bcf 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -2,3 +2,7 @@
 - src: https://github.com/carlosfrias/apigee-opdk-cassandra-change-replication-factor.git
 
 - src: https://github.com/carlosfrias/apigee-opdk-cassandra-repair.git
+
+- src: https://github.com/carlosfrias/apigee-opdk-stop-components.git
+
+- src: https://github.com/carlosfrias/apigee-opdk-start-components.git
diff --git a/update.yml b/update.yml
index a1388ac..474fcf4 100644
--- a/update.yml
+++ b/update.yml
@@ -1,10 +1,21 @@
 ---
-- hosts: '{{ hosts }}'
+- include: replication_factor_update.yml
+  vars:
+    hosts: dc-1-ds
+    opdk_region: dc-1
+
+- include: replication_factor_update.yml
+  vars:
+    hosts: dc-2-ds
+    opdk_region: dc-2
+    replication_factor: '{{ factor }}'
+
+- include: cassandra-repair.yml
+  vars:
+    hosts: ds
+
+- hosts: ds,ms,rmp,qpid,pg
   serial: 1
-
-  vars_files:
-  - ~/.apigee/credentials.yml
-
   roles:
-  - apigee-opdk-cassandra-change-replication-factor
-  - apigee-opdk-cassandra-repair
+  - apigee-opdk-stop-components
+  - apigee-opdk-start-components