diff --git a/configuration/opdk-setup-org-config.yml b/configuration/opdk-setup-org-config.yml
deleted file mode 100644
index 6b2e672..0000000
--- a/configuration/opdk-setup-org-config.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- hosts: '{{ hosts }}'
-  strategy: free
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-org-config
-
diff --git a/configuration/opdk-setup-org.yml b/configuration/opdk-setup-org.yml
index 002ae70..37fa528 100644
--- a/configuration/opdk-setup-org.yml
+++ b/configuration/opdk-setup-org.yml
@@ -2,6 +2,8 @@
 - hosts: '{{ hosts }}'
   vars_files:
   - ~/.apigee/credentials.yml
-  strategy: free
+  serial: 1
   roles:
+  - apigee-opdk-setup-org-config
   - apigee-opdk-setup-org
+
diff --git a/installation.yml b/installation.yml
index b2758c3..22e69a7 100644
--- a/installation.yml
+++ b/installation.yml
@@ -2,24 +2,6 @@
 - include: configuration/update_cache.yml
   tags:
   - cache
-  - os-pre-req
-  - apigee-pre-req
-  - ms
-  - ds
-  - qpid
-  - pgmaster
-  - pgstandby
-  - analytics
-  - rmp
-  - pg
-
-- include: configuration/load-opdk-credentials.yml
-  vars:
-    hosts: 'planet'
-  tags:
-  - credentials
-  - os-pre-req
-  - apigee-pre-req
 
 - include: configuration/opdk-setup-os.yml
   vars:
@@ -42,14 +24,6 @@
     opdk_ldap_type: '2'
   tags:
   - apigee-pre-req
-  - ds
-  - ms
-  - rmp
-  - qpid
-  - pg
-  - pgstandby
-  - pgmaster
-  - analytics
 
 - include: components/opdk-install-component.yml
   vars:
@@ -58,7 +32,7 @@
     jdk_version: '1.8'
     opdk_ldap_type: '2'
   tags:
-  - ds
+  - dc-2-ds
 
 - include: components/opdk-install-component.yml
   vars:
@@ -67,14 +41,14 @@
     jdk_version: '1.8'
     opdk_ldap_type: '2'
   tags:
-  - ds
+  - dc-1-ds
 
 - include: components/opdk-cassandra-client-update.yml
   vars:
      hosts: 'dc-1-ms'
      jdk_version: '1.8'
   tags:
-  - ms
+  - dc-1-ms
 
 - include: components/opdk-install-component.yml
   vars:
@@ -83,14 +57,14 @@
     jdk_version: '1.8'
     opdk_ldap_type: '2'
   tags:
-  - ms
+  - dc-1-ms
 
 - include: components/opdk-cassandra-rebuild.yml
   vars:
     hosts: 'dc-2-ds'
     jdk_version: '1.8'
   tags:
-  - ms
+  - dc-2-ms
 
 - include: components/opdk-install-component.yml
   vars:
@@ -99,7 +73,7 @@
     jdk_version: '1.8'
     opdk_ldap_type: '2'
   tags:
-  - ms
+  - dc-2-ms
 
 - include: components/opdk-install-component.yml
   vars:
@@ -107,14 +81,14 @@
     component_profile: 'rmp'
     jdk_version: '1.8'
   tags:
-  - rmp
+  - dc-2-rmp
 
 - include: configuration/opdk-set-reachable.yml
   vars:
     hosts: 'dc-1-rmp'
     reachability: 'false'
   tags:
-  - rmp
+  - dc-1-rmp
 
 - include: components/opdk-install-component.yml
   vars:
@@ -122,14 +96,14 @@
     component_profile: 'rmp'
     jdk_version: '1.8'
   tags:
-  - rmp
+  - dc-1-rmp
 
 - include: configuration/opdk-set-reachable.yml
   vars:
     hosts: 'dc-1-rmp'
     reachability: 'true'
   tags:
-  - rmp
+  - dc-1-rmp
 
 - include: components/opdk-install-component.yml
   vars:
@@ -137,16 +111,13 @@
     component_profile: 'qs'
     jdk_version: '1.8'
   tags:
-  - qpid
-  - analytics
+  - dc-2-qpid
 
 - include: components/opdk-setup-qpid-add.yml
   vars:
     hosts: 'dc-2-qpid'
   tags:
-  - qpid
-  - qpid-add
-  - analytics
+  - dc-2-qpid-registration
 
 - include: components/opdk-setup-postgres-common.yml
   vars:
@@ -154,9 +125,7 @@
     pg_component: 'master'
     jdk_version: '1.8'
   tags:
-  - pg
-  - pgmaster
-  - analytics
+  - dc-2-pgmaster
 
 - include: components/opdk-setup-postgres-common.yml
   vars:
@@ -164,9 +133,7 @@
     pg_component: 'standby'
     jdk_version: '1.8'
   tags:
-  - pg
-  - pgstandby
-  - analytics
+  - dc-2-pgstandby
 
 - include: components/opdk-setup-postgresql-add.yml
   vars:
@@ -174,16 +141,7 @@
     pgmaster_group_name: 'dc-2-pgmaster'
     pgstandby_group_name: 'dc-2-pgstandby'
   tags:
-  - pg
-  - pgmaster
-  - pgmaster-add
-  - analytics
-
-- include: configuration/opdk-setup-org-config.yml
-  vars:
-    hosts: 'dc-2-ms'
-  tags:
-  - org
+  - dc-2-pg-registration
 
 - include: configuration/opdk-setup-org.yml
   vars:
diff --git a/validations/opdk-setup-log-files.yml b/validations/opdk-setup-log-files.yml
index c399550..cb7591d 100644
--- a/validations/opdk-setup-log-files.yml
+++ b/validations/opdk-setup-log-files.yml
@@ -2,26 +2,38 @@
 - hosts: '{{ hosts }}'
   become: true
   strategy: free
+  vars:
+    pattern:
+    - { dir: '/etc/', pattern: 'hosts' }
+    - { dir: '/etc/', pattern: 'hosts.allow' }
+    - { dir: '/etc/', pattern: 'hosts.deny' }
+    - { dir: '/etc/', pattern: 'environment' }
+    - { dir: '/etc/', pattern: 'profile' }
+    - { dir: '/etc/', pattern: 'bashrc' }
+    - { dir: '/etc/', pattern: 'resolv.conf' }
+    - { dir: '/etc/', pattern: 'sysctl.conf' }
+    - { dir: '/etc/', pattern: 'sudoers' }
+    - { dir: '/etc/security/', pattern: 'limits.conf' }
+    - { dir: '/etc/security/limits.d/', pattern: '*conf' }
+    - { dir: '/var/log/', pattern: 'messages' }
+    - { dir: '{{ opdk_installer_path }}/', pattern: '*.log' }
+    - { dir: '{{ opdk_installer_path }}/', pattern: '*.txt' }
+    - { dir: '{{ apigee_installation_home }}/', pattern: '*.out' }
+    - { dir: '{{ apigee_installation_home }}/var/log', pattern: '*.log' }
+    - { dir: '{{ opdk_installer_path }}/', pattern: '*.conf' }
+    - { dir: '{{ opdk_installer_path }}/', pattern: '*.sh' }
+    - { dir: '{{ apigee_installation_home }}/customer/', pattern: '*' }
+    - { dir: '{{ apigee_installation_home }}/etc/', pattern: 'default*.sh' }
+    - { dir: '{{ apigee_installation_home }}/customer', pattern: '*' }
+    - { dir: '{{ apigee_installation_home }}/apigee-cassandra/', pattern: '*conf' }
+    - { dir: '{{ apigee_installation_home }}/apigee-cassandra/', pattern: '*cfg' }
+    - { dir: '{{ apigee_installation_home }}/apigee-cassandra/', pattern: '*yml' }
+    - { dir: '{{ apigee_installation_home }}/apigee-cassandra/', pattern: '*yaml' }
+    - { dir: '{{ apigee_installation_home }}/apigee-cassandra/', pattern: '*properties' }
+    - { dir: '{{ apigee_installation_home }}/apigee-zookeeper/', pattern: '*conf' }
+    - { dir: '{{ apigee_installation_home }}/apigee-zookeeper/', pattern: '*cfg' }
+    - { dir: '{{ apigee_installation_home }}/apigee-zookeeper/', pattern: '*yml' }
+    - { dir: '{{ apigee_installation_home }}/apigee-zookeeper/', pattern: '*yaml' }
+    - { dir: '{{ apigee_installation_home }}/apigee-zookeeper/', pattern: '*properties' }
   roles:
-  - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}/{{ hosts }}/' }
-  tags:
-  - logs
-  - os-logs
-
-- hosts: '{{ hosts }}'
-  become: true
-  strategy: free
-  roles:
-  - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: '{{ fetched_logs_dir }}/{{ hosts }}/' }
-  tags:
-  - logs
-  - apigee-logs
-
-- hosts: '{{ hosts }}'
-  become: true
-  strategy: free
-  roles:
-  - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}/{{ hosts }}/' }
-  tags:
-  - logs
-  - config-logs
+  - { role: apigee-fetch-files, download_pattern: '{{ pattern }}', download_folder: "~/.apigee/logs_configs/{{ hosts }}/" }