diff --git a/classes/cluster/os-aio-ovs/openstack/gateway.yml b/classes/cluster/os-aio-ovs/openstack/gateway.yml
index b167a48..8e12b86 100644
--- a/classes/cluster/os-aio-ovs/openstack/gateway.yml
+++ b/classes/cluster/os-aio-ovs/openstack/gateway.yml
@@ -23,18 +23,21 @@
           mtu: ${_param:interface_mtu}
         primary_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:primary_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         tenant_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:tenant_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         external_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:external_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
@@ -82,4 +85,4 @@
       qos: ${_param:neutron_enable_qos}
       agent_mode: ${_param:neutron_gateway_agent_mode}
       backend:
-        tenant_network_types: ${_param:neutron_tenant_network_types}"
\ No newline at end of file
+        tenant_network_types: ${_param:neutron_tenant_network_types}"
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/gateway.yml b/classes/cluster/os-ha-ovs-ceph/openstack/gateway.yml
index fac3c05..618a98a 100644
--- a/classes/cluster/os-ha-ovs-ceph/openstack/gateway.yml
+++ b/classes/cluster/os-ha-ovs-ceph/openstack/gateway.yml
@@ -23,18 +23,21 @@
           mtu: ${_param:interface_mtu}
         primary_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:primary_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         tenant_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:tenant_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         external_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:external_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
@@ -75,4 +78,4 @@
           use_interfaces:
           - ${_param:external_interface}
           use_ovs_ports:
-          - float-to-ex
\ No newline at end of file
+          - float-to-ex
diff --git a/classes/cluster/os-ha-ovs-syndic/openstack/gateway.yml b/classes/cluster/os-ha-ovs-syndic/openstack/gateway.yml
index 2e7f0f0..d38b87a 100644
--- a/classes/cluster/os-ha-ovs-syndic/openstack/gateway.yml
+++ b/classes/cluster/os-ha-ovs-syndic/openstack/gateway.yml
@@ -23,18 +23,21 @@
           mtu: ${_param:interface_mtu}
         primary_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:primary_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         tenant_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:tenant_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         external_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:external_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
@@ -75,4 +78,4 @@
           use_interfaces:
           - ${_param:external_interface}
           use_ovs_ports:
-          - float-to-ex
\ No newline at end of file
+          - float-to-ex
diff --git a/classes/cluster/os-ha-ovs/openstack/gateway.yml b/classes/cluster/os-ha-ovs/openstack/gateway.yml
index 7d9012d..4e42807 100644
--- a/classes/cluster/os-ha-ovs/openstack/gateway.yml
+++ b/classes/cluster/os-ha-ovs/openstack/gateway.yml
@@ -23,18 +23,21 @@
           mtu: ${_param:interface_mtu}
         primary_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:primary_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         tenant_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:tenant_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         external_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:external_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
@@ -75,4 +78,4 @@
           use_interfaces:
           - ${_param:external_interface}
           use_ovs_ports:
-          - float-to-ex
\ No newline at end of file
+          - float-to-ex
diff --git a/classes/cluster/sl-os-ovs/openstack/gateway.yml b/classes/cluster/sl-os-ovs/openstack/gateway.yml
index 2e7f0f0..d38b87a 100644
--- a/classes/cluster/sl-os-ovs/openstack/gateway.yml
+++ b/classes/cluster/sl-os-ovs/openstack/gateway.yml
@@ -23,18 +23,21 @@
           mtu: ${_param:interface_mtu}
         primary_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:primary_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         tenant_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:tenant_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         external_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:external_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
@@ -75,4 +78,4 @@
           use_interfaces:
           - ${_param:external_interface}
           use_ovs_ports:
-          - float-to-ex
\ No newline at end of file
+          - float-to-ex
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/gateway.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/gateway.yml
index dc29f34..e435b09 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/gateway.yml
@@ -23,18 +23,21 @@
           mtu: ${_param:interface_mtu}
         primary_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:primary_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         tenant_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:tenant_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         external_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:external_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
@@ -75,4 +78,4 @@
           use_interfaces:
           - ${_param:external_interface}
           use_ovs_ports:
-          - float-to-ex
\ No newline at end of file
+          - float-to-ex
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
index 8167f96..21a9e47 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
@@ -23,18 +23,21 @@
           mtu: ${_param:interface_mtu}
         primary_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:primary_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         tenant_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:tenant_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         external_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:external_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
@@ -75,4 +78,4 @@
           use_interfaces:
           - ${_param:external_interface}
           use_ovs_ports:
-          - float-to-ex
\ No newline at end of file
+          - float-to-ex
diff --git a/classes/cluster/virtual-mcp05-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp05-ovs/openstack/gateway.yml
index 946d1c2..e013d36 100644
--- a/classes/cluster/virtual-mcp05-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp05-ovs/openstack/gateway.yml
@@ -23,12 +23,14 @@
           mtu: ${_param:interface_mtu}
         primary_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:primary_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         tenant_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:tenant_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml
index c0303e9..8f6912d 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml
@@ -23,18 +23,21 @@
           mtu: ${_param:interface_mtu}
         primary_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:primary_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         tenant_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:tenant_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         external_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:external_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
@@ -75,4 +78,4 @@
           use_interfaces:
           - ${_param:external_interface}
           use_ovs_ports:
-          - float-to-ex
\ No newline at end of file
+          - float-to-ex
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml
index f89cfcf..a6e99c8 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml
@@ -23,6 +23,7 @@
           mtu: ${_param:interface_mtu}
         primary_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:primary_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
@@ -35,6 +36,7 @@
         #   type: eth
         external_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:external_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
@@ -83,4 +85,4 @@
           use_interfaces:
           - ${_param:external_interface}
           use_ovs_ports:
-          - float-to-ex
\ No newline at end of file
+          - float-to-ex
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/gateway.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/gateway.yml
index 06bf43b..f5d851e 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/gateway.yml
@@ -23,18 +23,21 @@
           mtu: ${_param:interface_mtu}
         primary_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:primary_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         tenant_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:tenant_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         external_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:external_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
@@ -75,4 +78,4 @@
           use_interfaces:
           - ${_param:external_interface}
           use_ovs_ports:
-          - float-to-ex
\ No newline at end of file
+          - float-to-ex
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp11-ovs/openstack/gateway.yml
index 2e7f0f0..d38b87a 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/gateway.yml
@@ -23,18 +23,21 @@
           mtu: ${_param:interface_mtu}
         primary_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:primary_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         tenant_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:tenant_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         external_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:external_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
@@ -75,4 +78,4 @@
           use_interfaces:
           - ${_param:external_interface}
           use_ovs_ports:
-          - float-to-ex
\ No newline at end of file
+          - float-to-ex