diff --git a/roles/collect-logs/tasks/publish.yml b/roles/collect-logs/tasks/publish.yml
index ff65118af..0b68642ac 100644
--- a/roles/collect-logs/tasks/publish.yml
+++ b/roles/collect-logs/tasks/publish.yml
@@ -38,6 +38,14 @@
     cp {{ artcl_collect_dir }}/undercloud/home/stack/tempest/tempest.{xml,html}{,.gz} {{ artcl_collect_dir }} || true;
     gunzip {{ artcl_collect_dir }}/tempest.{xml,html}.gz || true;
 
+- name: Fetch .sh and .log files from local working directory on localhost
+  shell: >
+    cp {{ item }} {{ artcl_collect_dir }}/
+  with_items:
+    - "{{ local_working_dir }}/*.sh"
+    - "{{ local_working_dir }}/*.log"
+  ignore_errors: "yes"
+
 - name: Rename compressed text based files to end with txt.gz extension
   shell: >
     find {{ artcl_collect_dir }}/ -type f |
diff --git a/roles/validate-ui/meta/main.yml b/roles/validate-ui/meta/main.yml
new file mode 100644
index 000000000..819da26a3
--- /dev/null
+++ b/roles/validate-ui/meta/main.yml
@@ -0,0 +1,2 @@
+dependencies:
+  - extras-common
diff --git a/roles/validate-ui/tasks/main.yml b/roles/validate-ui/tasks/main.yml
index e2442cd13..b99c51923 100644
--- a/roles/validate-ui/tasks/main.yml
+++ b/roles/validate-ui/tasks/main.yml
@@ -9,4 +9,4 @@
   shell: >
     set -o pipefail &&
     {{ local_working_dir }}/ui_validate_simple.sh
-    2>&1  {{ ui_validate_simple_log }}
\ No newline at end of file
+    | tee {{ ui_validate_simple_log }}