diff --git a/components/opdk-install-component.yml b/components/opdk-install-component.yml
index b2b370f..1a14538 100644
--- a/components/opdk-install-component.yml
+++ b/components/opdk-install-component.yml
@@ -3,6 +3,7 @@
   serial: 1
   roles:
   - apigee-opdk-setup-default-settings
+  - apigee-opdk-setup-component-installer
   - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
 #  - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: '{{ fetched_logs_dir }}' }
   tags:
diff --git a/components/opdk-pre-requisites.yml b/components/opdk-pre-requisites.yml
index ebdbd0f..4be8465 100644
--- a/components/opdk-pre-requisites.yml
+++ b/components/opdk-pre-requisites.yml
@@ -1,4 +1,4 @@
-c---
+---
 - hosts: '{{ hosts }}'
   strategy: free
   vars_files:
@@ -46,8 +46,7 @@
   - ~/.apigee/credentials.yml
   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 }}' }
   tags:
   - apigee-pre-req
-  - apigee-installer
+  - apigee-silent-config
diff --git a/components/opdk-setup-postgresql-add.yml b/components/opdk-setup-postgresql-add.yml
new file mode 100644
index 0000000..6e45161
--- /dev/null
+++ b/components/opdk-setup-postgresql-add.yml
@@ -0,0 +1,9 @@
+---
+- hosts: '{{ hosts }}'
+  vars_files:
+  - ~/.apigee/credentials.yml
+  roles:
+  - apigee-opdk-setup-default-settings
+  - { role: apigee-opdk-server-self, server_type: 'ps'}
+  - apigee-opdk-setup-postgresql-add
+
diff --git a/components/opdk-setup-qpid-add.yml b/components/opdk-setup-qpid-add.yml
new file mode 100644
index 0000000..fc4cb5b
--- /dev/null
+++ b/components/opdk-setup-qpid-add.yml
@@ -0,0 +1,9 @@
+---
+- hosts: '{{ hosts }}'
+  vars_files:
+  - ~/.apigee/credentials.yml
+  roles:
+  - apigee-opdk-setup-default-settings
+  - { role: apigee-opdk-server-self, server_type: 'qs'}
+  - apigee-opdk-setup-qpid-add
+
diff --git a/installation.yml b/installation.yml
index 783f866..b5fc75c 100644
--- a/installation.yml
+++ b/installation.yml
@@ -4,6 +4,11 @@
   - cache
   - os-pre-req
   - apigee-pre-req
+  - ms
+  - ds
+  - qpid
+  - pgmaster
+  - pgstandby
 
 - include: configuration/load-opdk-credentials.yml
   vars:
@@ -134,6 +139,13 @@
   tags:
   - qpid
 
+- include: components/opdk-setup-qpid-add.yml
+  vars:
+    hosts: 'dc-2-qpid'
+  tags:
+  - qpid
+  - qpid-add
+
 - include: components/opdk-setup-postgres-common.yml
   vars:
     hosts: 'dc-2-pgmaster'
@@ -142,6 +154,15 @@
   tags:
   - pgmaster
 
+- include: components/opdk-setup-postgresql-add.yml
+  vars:
+    hosts: 'dc-2-pgmaster'
+    pgmaster_group_name: 'dc-2-pgmaster'
+    pgstandby_group_name: 'dc-2-pgstandby'
+  tags:
+  - pgmaster
+  - pgmaster-add
+
 - include: components/opdk-setup-postgres-common.yml
   vars:
     hosts: 'dc-2-pgstandby'
@@ -150,6 +171,15 @@
   tags:
   - pgstandby
 
+- include: components/opdk-setup-postgresql-add.yml
+  vars:
+    hosts: 'dc-2-pgstandby'
+    pgmaster_group_name: 'dc-2-pgmaster'
+    pgstandby_group_name: 'dc-2-pgstandby'
+  tags:
+  - pgstandby
+  - pgstandby-add
+
 - include: configuration/opdk-setup-org-config.yml
   vars:
     hosts: 'dc-2-ms'
@@ -179,5 +209,87 @@
   - status
 
 - include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-1-ds
   tags:
   - logs
+  - dc-1
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-2-ds
+  tags:
+  - logs
+  - dc-2
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-1-ms
+  tags:
+  - logs
+  - dc-1
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-2-ms
+  tags:
+  - logs
+  - dc-2
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-1-rmp
+  tags:
+  - logs
+  - dc-1
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-2-rmp
+  tags:
+  - logs
+  - dc-2
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-1-qpid
+  tags:
+  - logs
+  - dc-1
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-2-qpid
+  tags:
+  - logs
+  - dc-2
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-1-pgmaster
+  tags:
+  - logs
+  - dc-1
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-2-pgmaster
+  tags:
+  - logs
+  - dc-2
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-1-pgstandby
+  tags:
+  - logs
+  - dc-1
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-2-pgstandby
+  tags:
+  - logs
+  - dc-2
+
+
diff --git a/validations/opdk-server-self.yml b/validations/opdk-server-self.yml
index c95adcf..79b61ba 100644
--- a/validations/opdk-server-self.yml
+++ b/validations/opdk-server-self.yml
@@ -1,6 +1,8 @@
 ---
 - hosts: rmp
   serial: 1
+  vars_files:
+  - ~/.apigee/credentials.yml
   roles:
   - apigee-opdk-setup-default-settings
   tasks:
@@ -24,6 +26,8 @@
 
 - hosts: pg
   serial: 1
+  vars_files:
+  - ~/.apigee/credentials.yml
   roles:
   - apigee-opdk-setup-default-settings
   tasks:
@@ -39,6 +43,8 @@
 
 - hosts: qpid
   serial: 1
+  vars_files:
+  - ~/.apigee/credentials.yml
   roles:
   - apigee-opdk-setup-default-settings
   tasks:
@@ -54,6 +60,8 @@
 
 - hosts: ms
   serial: 1
+  vars_files:
+  - ~/.apigee/credentials.yml
   roles:
   - apigee-opdk-setup-default-settings
   tasks:
diff --git a/validations/opdk-setup-log-files.yml b/validations/opdk-setup-log-files.yml
index 7fd87c6..93fcd4d 100644
--- a/validations/opdk-setup-log-files.yml
+++ b/validations/opdk-setup-log-files.yml
@@ -1,30 +1,30 @@
 ---
-- hosts: planet
+- hosts: '{{ hosts }}'
   become: true
   strategy: free
   roles:
   - apigee-opdk-setup-default-settings
-  - { 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 }}/{{ hosts }}/' }
   tags:
   - logs
   - os-logs
 
-- hosts: planet
+- hosts: '{{ hosts }}'
   become: true
   strategy: free
   roles:
   - apigee-opdk-setup-default-settings
-  - { 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 }}/{{ hosts }}/' }
   tags:
   - logs
   - apigee-logs
 
-- hosts: planet
+- hosts: '{{ hosts }}'
   become: true
   strategy: free
   roles:
   - apigee-opdk-setup-default-settings
-  - { 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 }}/{{ hosts }}/' }
   tags:
   - logs
   - config-logs