diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index 354d59e..1f43386 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -1559,23 +1559,12 @@
 {%- macro MACRO_CHECK_SALT_VERSION_ON_NODES() %}
 {#####################################################}
 
-{%- for ssh in config.underlay.ssh %}
-  {%- set salt_roles = [] %}
-  {%- for role in ssh['roles'] %}
-    {%- if role in config.salt_deploy.salt_roles %}
-      {%- set _ = salt_roles.append(role) %}
-    {%- endif %}
-  {%- endfor %}
-
-  {%- if salt_roles %}
-- description: 'Check salt version is as expected'
-  cmd: salt-call test.version | grep {{ SALT_VERSION }}
-  node_name: {{ ssh['node_name'] }}
-  retry: {count: 1, delay: 1}
+- description: 'Check salt version is as expected on nodes'
+  cmd: salt --timeout=15 '*' cmd.run "if salt-call test.version |grep -q {{ SALT_VERSION }} ; then echo True; fi"
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 5, delay: 5}
   skip_fail: false
-  {%- endif %}
 
-{%- endfor %}
 {%- endmacro %}
 
 {%- macro MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG() %}