diff --git a/playbooks/baremetal-full-overcloud-validate.yml b/playbooks/baremetal-full-overcloud-validate.yml
index eba51f9f5..065320048 100644
--- a/playbooks/baremetal-full-overcloud-validate.yml
+++ b/playbooks/baremetal-full-overcloud-validate.yml
@@ -1,7 +1,23 @@
 ---
+- name: Run dump vars on all!localhost
+  hosts: all:!localhost:!127.0.0.2
+  roles:
+    - dump_vars
+
+- name: Ensure the overcloud nodes are added to the generated inventory
+  hosts: undercloud
+  gather_facts: true
+  tags:
+    - overcloud-validate
+  vars:
+    inventory: all
+  roles:
+    - tripleo-inventory
+  ignore_errors: true
+
 # Execute sanity checks agsinst the overcloud deployment
 - name: setup dstat performance monitoring
-  hosts: overcloud
+  hosts: all:!localhost:!127.0.0.2!undercloud
   tags:
     - overcloud-validate
   roles:
diff --git a/roles/validate-perf/tasks/main.yml b/roles/validate-perf/tasks/main.yml
index aafabe325..eae2794d6 100644
--- a/roles/validate-perf/tasks/main.yml
+++ b/roles/validate-perf/tasks/main.yml
@@ -20,7 +20,7 @@
         --nocolor
         --output /var/log/extra/{{ dstat_log_name }}
         {{ dstat_delay }}
-        > /dev/null &
+        >> /var/log/extra/dstat.txt &
     args:
       executable: /bin/bash
     async: 1