diff --git a/replication_factor_update.yml b/replication_factor_update.yml
index 0d46cbc..e8ea3f8 100644
--- a/replication_factor_update.yml
+++ b/replication_factor_update.yml
@@ -1,12 +1,14 @@
 ---
 - include: configuration/update_cache.yml
+  tags:
+  - cache
 
 - hosts: '{{ hosts }}'
   serial: 1
   vars_files:
   - ~/.apigee/credentials.yml
   vars:
-    keyspaces:
+    cassandra_keyspaces:
     - auth
     - cache
     - devconnect
@@ -24,10 +26,10 @@
     - counter
 
   roles:
-  - apigee-opdk-setup-default-settings
-  - apigee-opdk-cassandra-change-replication-factor
-  - apigee-opdk-cassandra-repair
-  - apigee-opdk-stop-components
-  - apigee-opdk-start-components
+  - { role: apigee-opdk-setup-default-settings, tags: ['cache'] }
+  - { role: apigee-opdk-cassandra-change-replication-factor, tags: ['update'], keyspaces: '{{ cassandra_keyspaces }}' }
+  - { role: apigee-opdk-cassandra-repair, tags: ['repair'] }
+  - { role: apigee-opdk-stop-components, tags: ['restart', 'stop'] }
+  - { role: apigee-opdk-start-components, tags: ['restart', 'start'] }
 
 
diff --git a/update.yml b/update.yml
index cacf4cc..ff12de2 100644
--- a/update.yml
+++ b/update.yml
@@ -3,15 +3,21 @@
   vars:
     hosts: dc-1-ds
     opdk_region: dc-1
+  tags:
+  - dc-1
 
 - include: replication_factor_update.yml
   vars:
     hosts: dc-2-ds
     opdk_region: dc-2
     replication_factor: '{{ factor }}'
+  tags:
+  - dc-2
 
 - hosts: ms,rmp,qpid,pg
   serial: 1
   roles:
-  - apigee-opdk-stop-components
-  - apigee-opdk-start-components
+  - { role: apigee-opdk-stop-components, tags: ['stop'] }
+  - { role: apigee-opdk-start-components, tags: ['start'] }
+  tags:
+  - restart