diff --git a/installations/dc2/clean.yml b/installations/dc2/clean.yml
index 72ff1ad..a6f16d7 100644
--- a/installations/dc2/clean.yml
+++ b/installations/dc2/clean.yml
@@ -11,7 +11,7 @@
     with_items:
     - '~/.ansible/tmp/cache'
     - '~/.ansible/tmp/ansible.log'
-    - 'ssh_keys'
-    - 'configs_and_logs'
-    - 'rpm_resources'
+    - '~/.apigee/ssh_keys'
+    - '~/.apigee/logs'
+    - '~/.apigee/configs'
 
diff --git a/installations/dc2/validations/opdk-setup-log-files.yml b/installations/dc2/validations/opdk-setup-log-files.yml
index 041c9f4..fbf244a 100644
--- a/installations/dc2/validations/opdk-setup-log-files.yml
+++ b/installations/dc2/validations/opdk-setup-log-files.yml
@@ -2,7 +2,7 @@
 - hosts: planet
   strategy: free
   roles:
-  - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}' }
+  - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: '{{ fetched_logs_dir }}' }
   tags:
   - logs
   - apigee-logs
@@ -11,7 +11,7 @@
   become: true
   strategy: free
   roles:
-  - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}' }
+  - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
   tags:
   - logs
   - os-logs
@@ -19,7 +19,7 @@
 - hosts: planet
   strategy: free
   roles:
-  - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}' }
+  - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
   tags:
   - logs
   - config-logs