diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt.yaml
index 3b77cfd..53bd91c 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt.yaml
@@ -16,6 +16,7 @@
 {{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
 
 {{SHARED.MACRO_IPFLUSH_TENANTS_IFACES()}}
+{{SHARED.DISABLE_EMPTY_NODE()}}
 
 {{SHARED_TEST_TOOLS.MACRO_INSTALL_RECLASS_TOOLS()}}
 {{ SHARED_WORKAROUNDS.MACRO_CEPH_SET_PGNUM() }}
\ No newline at end of file
diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index 259cbf9..247e7fd 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -828,9 +828,36 @@
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: true
+
 {%- endmacro %}
 
 
+
+{%- macro DISABLE_EMPTY_NODE() %}
+{#######################################}
+{%- for ssh in config.underlay.ssh %}
+  {%- set none_roles = [] %}
+  {%- for role in ssh['roles'] %}
+    {%- if role == "none" %}
+      {%- set _ = none_roles.append(role) %}
+    {%- endif %}
+  {%- endfor %}
+
+  {%- if none_roles %}
+- description: Move non-product node  out of Salt Cluster ( {{ ssh['node_name'] }} )
+  cmd: |
+    set -ex;
+    # Use salt-key -a {{ ssh['node_name'] }} --include-all -y  command to return node back
+    salt-key -r {{ ssh['node_name'] }} --include-all -y
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: { count: 1, delay: 5 }
+  skip_fail: true
+  {%- endif %}
+{%- endfor %}
+{%- endmacro %}
+
+
+
 {%- macro MACRO_INSTALL_FORMULAS(FORMULA_SERVICES='') %}
 {#######################################################}
 - description: Install salt formulas