diff --git a/installations/dc1/clean.yml b/installations/dc1/clean.yml
index 2419405..489da83 100644
--- a/installations/dc1/clean.yml
+++ b/installations/dc1/clean.yml
@@ -15,4 +15,6 @@
     - '~/.apigee/ssh_keys'
     - '~/.apigee/logs'
     - '~/.apigee/configs'
+    - '~/.apigee/logs_configs'
+
 
diff --git a/installations/dc1/components/opdk-install-component.yml b/installations/dc1/components/opdk-install-component.yml
index a73b402..279d06a 100644
--- a/installations/dc1/components/opdk-install-component.yml
+++ b/installations/dc1/components/opdk-install-component.yml
@@ -4,9 +4,11 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
+  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-apigee-user
   tags:
-  - user
+  - apigee-user
+  - apigee-pre-req
 
 - hosts: '{{ hosts }}'
   strategy: free
@@ -14,15 +16,17 @@
   - ~/.apigee/credentials.yml
   roles:
   - apigee-opdk-setup-os-limits
-  - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
+#  - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
   tags:
-  - os
+  - apigee-pre-req
+  - apigee-tuning
 
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
   - apigee-opdk-setup-openjdk
   tags:
+  - apigee-pre-req
   - openjdk
 
 - hosts: '{{ hosts }}'
@@ -30,9 +34,11 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
+  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-bootstrap
   tags:
-  - bootstrap
+  - apigee-pre-req
+  - apigee-bootstrap
 
 - hosts: '{{ hosts }}'
   strategy: free
@@ -41,14 +47,16 @@
   roles:
   - apigee-opdk-setup-silent-installation-config
   - apigee-opdk-setup-component-installer
-  - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
+#  - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
   tags:
-  - installer
+  - apigee-pre-req
+  - apigee-installer
 
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
+  - apigee-opdk-setup-default-settings
   - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
-  - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: '{{ fetched_logs_dir }}' }
+#  - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: '{{ fetched_logs_dir }}' }
   tags:
-  - component
+  - apigee-component
diff --git a/installations/dc1/components/opdk-setup-postgres-common.yml b/installations/dc1/components/opdk-setup-postgres-common.yml
index f00638b..7015614 100644
--- a/installations/dc1/components/opdk-setup-postgres-common.yml
+++ b/installations/dc1/components/opdk-setup-postgres-common.yml
@@ -1,23 +1,15 @@
 ---
 - hosts: '{{ hosts }}'
   strategy: free
+  vars_files:
+  - ~/.apigee/credentials.yml
   roles:
   - apigee-opdk-enable-swap
+  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-apigee-user
   - apigee-opdk-setup-os-postgres
   - apigee-opdk-setup-postgres-config
 
-- hosts: '{{ hosts }}'
-  roles:
-  - apigee-opdk-setup-default-settings
-  tasks:
-  - name: Remove pgdata from pgstandby server
-    become: true
-    file:
-      path: '{{ apigee_installation_home }}/data/apigee-postgresql/pgdata'
-      state: absent
-    when: pg_component is defined and pg_component == 'standby'
-
 - include: opdk-install-component.yml
   vars:
     hosts: '{{ hosts }}'
diff --git a/installations/dc1/installation.yml b/installations/dc1/installation.yml
index 1c8ef96..692e781 100644
--- a/installations/dc1/installation.yml
+++ b/installations/dc1/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: