diff --git a/installations/aio/components/opdk-install-component.yml b/installations/aio/components/opdk-install-component.yml
index c2b5cd2..fc3c608 100644
--- a/installations/aio/components/opdk-install-component.yml
+++ b/installations/aio/components/opdk-install-component.yml
@@ -16,7 +16,7 @@
   - apigee-opdk-setup-os-limits
 #  - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
   tags:
-  - os
+  - os-tuning
 
 - hosts: '{{ hosts }}'
   strategy: free
diff --git a/installations/baas/components/opdk-install-component.yml b/installations/baas/components/opdk-install-component.yml
index c2b5cd2..fc3c608 100644
--- a/installations/baas/components/opdk-install-component.yml
+++ b/installations/baas/components/opdk-install-component.yml
@@ -16,7 +16,7 @@
   - apigee-opdk-setup-os-limits
 #  - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
   tags:
-  - os
+  - os-tuning
 
 - hosts: '{{ hosts }}'
   strategy: free
diff --git a/installations/dc2/installation.yml b/installations/dc2/installation.yml
index a20be07..9f067e8 100644
--- a/installations/dc2/installation.yml
+++ b/installations/dc2/installation.yml
@@ -1,24 +1,29 @@
 ---
 - include: configuration/update_cache.yml
+  tags:
+  - cache
+  - os-pre-req
 
 - include: configuration/opdk-credentials.yml
   vars:
     hosts: 'planet'
   tags:
   - credentials
+  - os-pre-req
 
 - include: configuration/opdk-setup-os.yml
   vars:
     hosts: 'planet'
   tags:
   - os
+  - os-pre-req
 
 - include: configuration/update-user.yml
   vars:
     hosts: 'planet'
     user: 'root'
   tags:
-  - user
+  - root-user
 
 - include: components/opdk-install-component.yml
   vars:
diff --git a/installations/monetization/components/opdk-install-component.yml b/installations/monetization/components/opdk-install-component.yml
index e92d52a..aedc523 100644
--- a/installations/monetization/components/opdk-install-component.yml
+++ b/installations/monetization/components/opdk-install-component.yml
@@ -16,7 +16,7 @@
   - apigee-opdk-setup-os-limits
 #  - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
   tags:
-  - os
+  - os-tuning
 
 - hosts: '{{ hosts }}'
   strategy: free
diff --git a/installations/monetization/installation.yml b/installations/monetization/installation.yml
index e8a0e8c..bdedfcc 100644
--- a/installations/monetization/installation.yml
+++ b/installations/monetization/installation.yml
@@ -1,9 +1,12 @@
 ---
 - include: configuration/update_cache.yml
+  tags:
+  - cache
+  - os-pre-req
 
 - include: configuration/opdk-credentials.yml
   vars:
-    hosts: 'ms,rmp'
+    hosts: 'planet'
   tags:
   - credentials