diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
index c3addf5..b1750ee 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
@@ -6,6 +6,7 @@
 - system.salt.minion.cert.etcd_client
 - cluster.k8s-ha-contrail-40.opencontrail.compute
 - cluster.k8s-ha-contrail-40.kubernetes
+- cluster.overrides
 
 parameters:
   linux:
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
index 161940e..2f3d81e 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -10,6 +10,7 @@
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
 - cluster.k8s-ha-contrail-40.infra
+- cluster.overrides
 parameters:
   _param:
     keepalived_vip_interface: ens4
@@ -24,17 +25,19 @@
           mtu: 1500
           address: ${_param:deploy_address}
           netmask: '255.255.255.0'
-          
+          ipflush_onchange: true
+
         ens4:
           enabled: true
           type: eth
           mtu: 1500
           address: ${_param:single_address}
           netmask: '255.255.255.0'
+          ipflush_onchange: true
   etcd:
     server:
       bind:
-        host: ${_param:deploy_address}
+        host: ${_param:single_address}
       source:
         engine: docker_hybrid
       ssl:
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
index d019809..f9a25db 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
@@ -70,7 +70,7 @@
     kubernetes_proxy_node01_address: 172.16.10.121
 
     cluster_vip_address: ${_param:kubernetes_control_address}
-    cluster_local_address: ${_param:deploy_address}
+    cluster_local_address: ${_param:single_address}
 
     # etcd stuff
     cluster_node01_hostname: ${_param:kubernetes_control_node01_hostname}