diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-environment.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-environment.yaml
index 25d2e76..fcb707f 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-environment.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-environment.yaml
@@ -318,7 +318,7 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh
+          role: bond0_ab_ovs_vxlan_mesh_no_tag
         ens6:
           role: bond1_ab_ovs_floating
 
@@ -333,7 +333,7 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh
+          role: bond0_ab_ovs_vxlan_mesh_no_tag
         ens6:
           role: bond1_ab_ovs_floating
 
@@ -348,7 +348,7 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh
+          role: bond0_ab_ovs_vxlan_mesh_no_tag
         ens6:
           role: bond1_ab_ovs_floating
 
@@ -363,7 +363,7 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh
+          role: bond0_ab_ovs_vxlan_mesh_no_tag
         ens6:
           role: bond1_ab_ovs_floating
 
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt.yaml
index 32ca5ce..6123ddf 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt.yaml
@@ -12,3 +12,4 @@
 
 {{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
 
+{{SHARED.MACRO_IPFLUSH_TENANTS_IFACES()}}
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-environment.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-environment.yaml
index 25d2e76..fcb707f 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-environment.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-environment.yaml
@@ -318,7 +318,7 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh
+          role: bond0_ab_ovs_vxlan_mesh_no_tag
         ens6:
           role: bond1_ab_ovs_floating
 
@@ -333,7 +333,7 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh
+          role: bond0_ab_ovs_vxlan_mesh_no_tag
         ens6:
           role: bond1_ab_ovs_floating
 
@@ -348,7 +348,7 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh
+          role: bond0_ab_ovs_vxlan_mesh_no_tag
         ens6:
           role: bond1_ab_ovs_floating
 
@@ -363,7 +363,7 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh
+          role: bond0_ab_ovs_vxlan_mesh_no_tag
         ens6:
           role: bond1_ab_ovs_floating
 
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 e02121f..9bbe479 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt.yaml
@@ -12,3 +12,4 @@
 
 {{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
 
+{{SHARED.MACRO_IPFLUSH_TENANTS_IFACES()}}
diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index 904a562..79abb63 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -1536,3 +1536,15 @@
   skip_fail: false
 
 {%- endmacro %}
+
+{%- macro MACRO_IPFLUSH_TENANTS_IFACES() %}
+{######################################}
+- description: WR Flush addresses on tenant and external ifaces
+  cmd: |
+    salt -C 'gtw* or cmp*' cmd.run 'ip address flush dev ens5';
+    salt -C 'gtw* or cmp*' cmd.run 'ip address flush dev ens6';
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 1}
+  skip_fail: false
+
+{%- endmacro %}