diff --git a/playbooks/baremetal-undercloud-validate-ha.yml b/playbooks/baremetal-undercloud-validate-ha.yml
index d359854..c2bf972 100644
--- a/playbooks/baremetal-undercloud-validate-ha.yml
+++ b/playbooks/baremetal-undercloud-validate-ha.yml
@@ -125,6 +125,12 @@
   tags:
     - overcloud-deploy-check
 
+- name: Gather undercloud and overcloud facts
+  hosts: undercloud overcloud
+  gather_facts: yes
+  tags:
+    - overcloud-validate-ha
+
 - name: Validate the overcloud using HA tests
   hosts: undercloud
   gather_facts: no
diff --git a/playbooks/overcloud-validate-ha.yml b/playbooks/overcloud-validate-ha.yml
index 29d4fb8..06a7ea5 100644
--- a/playbooks/overcloud-validate-ha.yml
+++ b/playbooks/overcloud-validate-ha.yml
@@ -1,4 +1,7 @@
 ---
+- name: Gather undercloud and overcloud facts
+  hosts: undercloud overcloud
+  gather_facts: yes
 
 - name:  Validate overcloud HA status
   hosts: undercloud
diff --git a/roles/validate-ha/tasks/main.yml b/roles/validate-ha/tasks/main.yml
index 462f0f2..1630e01 100644
--- a/roles/validate-ha/tasks/main.yml
+++ b/roles/validate-ha/tasks/main.yml
@@ -17,13 +17,18 @@
     "{{ working_dir }}/workarounds.sh"
   when: apply_workarounds
 
-- name: Copy ha-test-suite on undercloud and controllers
+- name: Copy ha-test-suite on undercloud
+  synchronize:
+    src: "{{ local_working_dir }}/tripleo-quickstart-utils/tools/ha-test-suite/"
+    dest: "{{ working_dir }}/ha-test-suite"
+    use_ssh_args: true
+
+- name: Copy ha-test-suite on controllers
   shell: >
-    /usr/bin/rsync --delay-updates -F --compress --archive -e 'ssh -F {{ local_working_dir }}/ssh.config.ansible' {{ local_working_dir }}/tripleo-quickstart-utils/tools/ha-test-suite  {{ hostvars[item]['ansible_hostname'] }}:
+    /usr/bin/rsync --delay-updates -F --compress --archive -e 'ssh -F {{ local_working_dir }}/ssh.config.ansible' {{ local_working_dir }}/tripleo-quickstart-utils/tools/ha-test-suite {{ hostvars[item]['ansible_hostname'] }}:
   delegate_to: "localhost"
   with_items:
     - "{{ groups['controller'] }}"
-    - "undercloud"
 
 - name: Include test sequence depending on release
   include_vars: