diff --git a/tcp_tests/templates/virtual-mcp-ocata-dvr/openstack.yaml b/tcp_tests/templates/virtual-mcp-ocata-dvr/openstack.yaml
index 2732cfc..a100266 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-dvr/openstack.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-dvr/openstack.yaml
@@ -80,9 +80,9 @@
 
 - description: Check nova service-list
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@keystone:server' cmd.run '. /root/keystonerc; nova service-list'
+    -C 'I@keystone:server' cmd.run '. /root/keystonerc; nova --debug service-list'
   node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
+  retry: {count: 3, delay: 5}
   skip_fail: false
 
 
@@ -384,10 +384,18 @@
   retry: {count: 1, delay: 5}
   skip_fail: false
 
-- description: Download results
+- description: Download xml results
   download:
     remote_path: /root
     remote_filename: "report_*.xml"
     local_path: {{ os_env('PWD') }}
   node_name: {{ HOSTNAME_GTW01 }}
-  skip_fail: false
+  skip_fail: true
+
+- description: Download html results
+  download:
+    remote_path: /root
+    remote_filename: "report_*.html"
+    local_path: {{ os_env('PWD') }}
+  node_name: {{ HOSTNAME_GTW01 }}
+  skip_fail: true
diff --git a/tcp_tests/templates/virtual-mcp-ocata-ovs/openstack.yaml b/tcp_tests/templates/virtual-mcp-ocata-ovs/openstack.yaml
index 4282bdd..e182601 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-ovs/openstack.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-ovs/openstack.yaml
@@ -80,9 +80,9 @@
 
 - description: Check nova service-list
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@keystone:server' cmd.run '. /root/keystonerc; nova service-list'
+    -C 'I@keystone:server' cmd.run '. /root/keystonerc; nova --debug service-list'
   node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
+  retry: {count: 3, delay: 5}
   skip_fail: false
 
 
@@ -385,10 +385,18 @@
   retry: {count: 1, delay: 5}
   skip_fail: false
 
-- description: Download results
+- description: Download xml results
   download:
     remote_path: /root
     remote_filename: "report_*.xml"
     local_path: {{ os_env('PWD') }}
   node_name: {{ HOSTNAME_GTW01 }}
-  skip_fail: false
+  skip_fail: true
+
+- description: Download html results
+  download:
+    remote_path: /root
+    remote_filename: "report_*.html"
+    local_path: {{ os_env('PWD') }}
+  node_name: {{ HOSTNAME_GTW01 }}
+  skip_fail: true
diff --git a/tcp_tests/templates/virtual-mcp11-dvr/openstack.yaml b/tcp_tests/templates/virtual-mcp11-dvr/openstack.yaml
index 6ab1534..150bf2b 100644
--- a/tcp_tests/templates/virtual-mcp11-dvr/openstack.yaml
+++ b/tcp_tests/templates/virtual-mcp11-dvr/openstack.yaml
@@ -365,10 +365,18 @@
   retry: {count: 1, delay: 30}
   skip_fail: false
 
-- description: Download results
+- description: Download xml results
   download:
     remote_path: /root
     remote_filename: "report_*.xml"
     local_path: {{ os_env('PWD') }}
   node_name: {{ HOSTNAME_GTW01 }}
-  skip_fail: false
+  skip_fail: true
+
+- description: Download html results
+  download:
+    remote_path: /root
+    remote_filename: "report_*.html"
+    local_path: {{ os_env('PWD') }}
+  node_name: {{ HOSTNAME_GTW01 }}
+  skip_fail: true
\ No newline at end of file
diff --git a/tcp_tests/templates/virtual-mcp11-ovs/openstack.yaml b/tcp_tests/templates/virtual-mcp11-ovs/openstack.yaml
index d66501c..6f2d10c 100644
--- a/tcp_tests/templates/virtual-mcp11-ovs/openstack.yaml
+++ b/tcp_tests/templates/virtual-mcp11-ovs/openstack.yaml
@@ -365,10 +365,18 @@
   retry: {count: 1, delay: 30}
   skip_fail: false
 
-- description: Download results
+- description: Download xml results
   download:
     remote_path: /root
     remote_filename: "report_*.xml"
     local_path: {{ os_env('PWD') }}
   node_name: {{ HOSTNAME_GTW01 }}
-  skip_fail: false
+  skip_fail: true
+
+- description: Download html results
+  download:
+    remote_path: /root
+    remote_filename: "report_*.html"
+    local_path: {{ os_env('PWD') }}
+  node_name: {{ HOSTNAME_GTW01 }}
+  skip_fail: true