diff --git a/installation.yml b/installation.yml
index e1709a9..e42ad76 100644
--- a/installation.yml
+++ b/installation.yml
@@ -340,7 +340,98 @@
   - dc-2
 
 - include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-1-ds
   tags:
   - logs
   - dc-1
   - dc-2
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-2-ds
+  tags:
+  - logs
+  - dc-1
+  - dc-2
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-1-ms
+  tags:
+  - logs
+  - dc-1
+  - dc-2
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-2-ms
+  tags:
+  - logs
+  - dc-1
+  - dc-2
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-1-rmp
+  tags:
+  - logs
+  - dc-1
+  - dc-2
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-2-rmp
+  tags:
+  - logs
+  - dc-1
+  - dc-2
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-1-qpid
+  tags:
+  - logs
+  - dc-1
+  - dc-2
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-2-qpid
+  tags:
+  - logs
+  - dc-1
+  - dc-2
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-1-pgmaster
+  tags:
+  - logs
+  - dc-1
+  - dc-2
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-2-pgmaster
+  tags:
+  - logs
+  - dc-1
+  - dc-2
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-1-pgstandby
+  tags:
+  - logs
+  - dc-1
+  - dc-2
+
+- include: validations/opdk-setup-log-files.yml
+  vars:
+    hosts: dc-2-pgstandby
+  tags:
+  - logs
+  - dc-1
+  - dc-2
+
diff --git a/validations/opdk-setup-log-files.yml b/validations/opdk-setup-log-files.yml
index deb1c8c..845428f 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: "~/.apigee/logs_configs/edge-1601-dc-1-expansion/" }
+  - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: "~/.apigee/logs_configs/{{ 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: "~/.apigee/logs_configs/edge-1601-dc-1-expansion/" }
+  - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: "~/.apigee/logs_configs/{{ 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: "~/.apigee/logs_configs/edge-1601-dc-1-expansion/" }
+  - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: "~/.apigee/logs_configs/{{ hosts }}/" }
   tags:
   - logs
   - config-logs