diff --git a/installations/aio/installation.yml b/installations/aio/installation.yml
index e30aec1..9fd6947 100644
--- a/installations/aio/installation.yml
+++ b/installations/aio/installation.yml
@@ -2,6 +2,8 @@
 - include: configuration/opdk-credentials.yml
   vars:
     hosts: 'planet'
+  tags:
+  - credentials
 
 - hosts: 'planet'
   tasks:
@@ -15,11 +17,15 @@
 - include: configuration/opdk-setup-os.yml
   vars:
     hosts: 'planet'
+  tags:
+  - os
 
 - include: configuration/update-user.yml
   vars:
-    hosts: planet
-    user: root
+    hosts: 'planet'
+    user: 'root'
+  tags:
+  - user
 
 - include: components/opdk-install-component.yml
   vars:
@@ -31,21 +37,19 @@
 - include: configuration/opdk-setup-org-config.yml
   vars:
     hosts: 'planet'
+  tags:
+  - org-config
 
 - include: configuration/opdk-setup-org.yml
   vars:
     hosts: 'planet'
+  tags:
+  - org
 
 - include: validations/opdk-setup-validate.yml
+  tags:
+  - validation
 
 - include: validations/opdk-setup-log-files.yml
   tags:
   - logs
-
-- hosts: dc-1
-  strategy: free
-  roles:
-  - opdk-setup-default-settings
-  - opdk-setup-apigee-log-files
-  tags:
-  - logs
diff --git a/installations/baas/installation.yml b/installations/baas/installation.yml
index 6430c26..cad24be 100644
--- a/installations/baas/installation.yml
+++ b/installations/baas/installation.yml
@@ -1,16 +1,22 @@
 ---
 - include: configuration/opdk-credentials.yml
   vars:
-    hosts: 'baas'
+    hosts: 'planet'
+  tags:
+  - credentials
 
 - include: configuration/opdk-setup-os.yml
   vars:
-    hosts: 'baas'
+    hosts: 'planet'
+  tags:
+  - os
 
 - include: configuration/update-user.yml
   vars:
     hosts: 'planet'
     user: 'root'
+  tags:
+  - user
 
 - include: components/opdk-install-component.yml
   vars:
diff --git a/installations/dc1/installation.yml b/installations/dc1/installation.yml
index d304e14..bb4f7b7 100644
--- a/installations/dc1/installation.yml
+++ b/installations/dc1/installation.yml
@@ -2,6 +2,8 @@
 - include: configuration/opdk-credentials.yml
   vars:
     hosts: 'planet'
+  tags:
+  - credentials
 
 - include: configuration/opdk-setup-os.yml
   vars:
@@ -94,7 +96,7 @@
   vars:
     hosts: 'dc-1-rmp'
   tags:
-  - validate
+  - validation
 
 - include: validations/opdk-internal-port-connectivity-validator.yml
   tags:
diff --git a/installations/dc2/installation.yml b/installations/dc2/installation.yml
index 71c9c36..0862774 100644
--- a/installations/dc2/installation.yml
+++ b/installations/dc2/installation.yml
@@ -2,6 +2,8 @@
 - include: configuration/opdk-credentials.yml
   vars:
     hosts: 'planet'
+  tags:
+  - credentials
 
 - include: configuration/opdk-setup-os.yml
   vars:
@@ -157,7 +159,7 @@
   vars:
     hosts: 'dc-2-rmp'
   tags:
-  - validate
+  - validation
 
 - include: validations/opdk-internal-port-connectivity-validator.yml
   tags:
diff --git a/installations/dc2/validations/opdk-setup-validate.yml b/installations/dc2/validations/opdk-setup-validate.yml
index 22eadf6..ff52369 100644
--- a/installations/dc2/validations/opdk-setup-validate.yml
+++ b/installations/dc2/validations/opdk-setup-validate.yml
@@ -13,5 +13,4 @@
   - opdk-setup-default-settings
   - opdk-setup-validate-cleanup
   tags:
-  - validate
   - validate-cleanup
diff --git a/installations/monetization/installation.yml b/installations/monetization/installation.yml
index 83d1b79..3369557 100644
--- a/installations/monetization/installation.yml
+++ b/installations/monetization/installation.yml
@@ -2,6 +2,8 @@
 - include: configuration/opdk-credentials.yml
   vars:
     hosts: 'ms,rmp'
+  tags:
+  - credentials
 
 - include: components/opdk-install-component.yml
   vars:
@@ -9,11 +11,13 @@
     component_profile: 'mo'
     opdk_monetization: true
   tags:
-  - mo-ms
+  - money
 
 - include: components/opdk-provision-component.yml
   vars:
     hosts: 'ms,rmp'
+  tags:
+  - provision
 
 - include: validations/opdk-setup-status.yml
   vars: