diff --git a/playbooks/multinode-undercloud-minion.yml b/playbooks/multinode-undercloud-minion.yml
index d1df23e1e..145fb7578 100644
--- a/playbooks/multinode-undercloud-minion.yml
+++ b/playbooks/multinode-undercloud-minion.yml
@@ -19,10 +19,20 @@
       set_fact:
         undercloud_outputs: "{{ hostvars['undercloud']['undercloud_outputs'] }}"
         undercloud_passwords: "{{ hostvars['undercloud']['undercloud_passwords'] }}"
-    - name: write output files
+    - name: write output files to old consistent location
       include_role:
         name: undercloud-setup
         tasks_from: write-outputs
+    - name: create new consistent location
+      file:
+        state: directory
+        path: "{{ working_dir ~ '/tripleo-deploy/minion' }}"
+    - name: write output files to new consistent location
+      include_role:
+        name: undercloud-setup
+        tasks_from: write-outputs
+      vars:
+        undercloud_outputs_dir: "{{ working_dir ~ '/tripleo-deploy/minion/' }}"
   tags:
     - undercloud-setup
 
diff --git a/roles/undercloud-deploy/tasks/gather-outputs.yml b/roles/undercloud-deploy/tasks/gather-outputs.yml
index d42c10de7..0cb94159e 100644
--- a/roles/undercloud-deploy/tasks/gather-outputs.yml
+++ b/roles/undercloud-deploy/tasks/gather-outputs.yml
@@ -3,13 +3,21 @@
 # their contents
 - name: Collect undercloud outputs
   slurp:
-    src: "{{ working_dir }}/tripleo-undercloud-outputs.yaml"
+    src: "{{ lookup('first_found', output_paths, errors='ignore') }}"
   register: tmp_undercloud_outputs
+  vars:
+    output_paths:
+      - "{{ working_dir }}/tripleo-undercloud-outputs.yaml"
+      - "{{ working_dir }}/tripleo-deploy/undercloud/tripleo-undercloud-outputs.yaml"
 
 - name: Collect undercloud passwords
   slurp:
-    src: "{{ working_dir }}/tripleo-undercloud-passwords.yaml"
+    src: "{{ lookup('first_found', password_paths, errors='ignore') }}"
   register: tmp_undercloud_passwords
+  vars:
+    password_paths:
+      - "{{ working_dir }}/tripleo-undercloud-passwords.yaml"
+      - "{{ working_dir }}/tripleo-deploy/undercloud/tripleo-undercloud-passwords.yaml"
 
 - name: Setting undercloud outputs and password facts
   set_fact:
diff --git a/roles/undercloud-setup/defaults/main.yml b/roles/undercloud-setup/defaults/main.yml
index 59e58dd54..48b5388fc 100644
--- a/roles/undercloud-setup/defaults/main.yml
+++ b/roles/undercloud-setup/defaults/main.yml
@@ -42,3 +42,5 @@ undercloud_ara: false
 install_atop: true
 atop_command: atop -R -w /var/log/atop.bin
 tripleo_set_unique_hostname: false
+
+undercloud_outputs_dir: "{{ working_dir }}"
diff --git a/roles/undercloud-setup/tasks/write-outputs.yml b/roles/undercloud-setup/tasks/write-outputs.yml
index b3337bd84..4d9b50ebb 100644
--- a/roles/undercloud-setup/tasks/write-outputs.yml
+++ b/roles/undercloud-setup/tasks/write-outputs.yml
@@ -3,9 +3,9 @@
 - name: Write out tripleo-undercloud-outputs.yaml
   copy:
     content: "{{ undercloud_outputs }}"
-    dest: "{{ working_dir }}/tripleo-undercloud-outputs.yaml"
+    dest: "{{ undercloud_outputs_dir }}/tripleo-undercloud-outputs.yaml"
 
 - name: Write out tripleo-undercloud-passwords.yaml
   copy:
     content: "{{ undercloud_passwords }}"
-    dest: "{{ working_dir }}/tripleo-undercloud-passwords.yaml"
+    dest: "{{ undercloud_outputs_dir }}/tripleo-undercloud-passwords.yaml"