diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
index 6d70146..b2cdbaf 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
@@ -2,6 +2,7 @@
 - service.etcd.server.cluster
 - service.kubernetes.control.cluster
 - system.haproxy.proxy.listen.kubernetes.apiserver
+- system.keepalived.cluster.instance.kube_api_server_vip
 - system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
@@ -10,8 +11,9 @@
 - cluster.k8s-ha-calico-cloudprovider
 parameters:
   _param:
-    keepalived_vip_interface: ${_param:primary_interface}
-    keepalived_vip_virtual_router_id: 60
+    keepalived_k8s_apiserver_vip_interface: ${_param:primary_interface}
+    keepalived_k8s_apiserver_vip_address: ${_param:kubernetes_control_address}
+    keepalived_k8s_apiserver_vip_password: password
   etcd:
     server:
       source:
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
index 9547241..34cace7 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
@@ -2,6 +2,7 @@
 - service.etcd.server.cluster
 - service.kubernetes.control.cluster
 - system.haproxy.proxy.listen.kubernetes.apiserver
+- system.keepalived.cluster.instance.kube_api_server_vip
 - system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
@@ -10,8 +11,9 @@
 - cluster.k8s-ha-calico-flannel-virtlet
 parameters:
   _param:
-    keepalived_vip_interface: ${_param:primary_interface}
-    keepalived_vip_virtual_router_id: 60
+    keepalived_k8s_apiserver_vip_interface: ${_param:primary_interface}
+    keepalived_k8s_apiserver_vip_address: ${_param:kubernetes_control_address}
+    keepalived_k8s_apiserver_vip_password: password
   etcd:
     server:
       bind:
diff --git a/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml
index 9785cc4..5454ad0 100644
--- a/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml
@@ -2,6 +2,7 @@
 - service.etcd.server.cluster
 - service.kubernetes.control.cluster
 - system.haproxy.proxy.listen.kubernetes.apiserver
+- system.keepalived.cluster.instance.kube_api_server_vip
 - system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
@@ -10,8 +11,9 @@
 - cluster.k8s-ha-calico-syndic
 parameters:
   _param:
-    keepalived_vip_interface: ${_param:primary_interface}
-    keepalived_vip_virtual_router_id: 60
+    keepalived_k8s_apiserver_vip_interface: ${_param:primary_interface}
+    keepalived_k8s_apiserver_vip_address: ${_param:kubernetes_control_address}
+    keepalived_k8s_apiserver_vip_password: password
   etcd:
     server:
       source:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
index c6ccca6..afde0e5 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -2,6 +2,7 @@
 - service.etcd.server.cluster
 - service.kubernetes.control.cluster
 - system.haproxy.proxy.listen.kubernetes.apiserver
+- system.keepalived.cluster.instance.kube_api_server_vip
 - system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
@@ -10,8 +11,9 @@
 - cluster.k8s-ha-calico
 parameters:
   _param:
-    keepalived_vip_interface: ${_param:primary_interface}
-    keepalived_vip_virtual_router_id: 60
+    keepalived_k8s_apiserver_vip_interface: ${_param:primary_interface}
+    keepalived_k8s_apiserver_vip_address: ${_param:kubernetes_control_address}
+    keepalived_k8s_apiserver_vip_password: password
   etcd:
     server:
       bind:
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
index 957235b..45f9465 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -2,6 +2,7 @@
 - service.etcd.server.cluster
 - service.kubernetes.control.cluster
 - system.haproxy.proxy.listen.kubernetes.apiserver
+- system.keepalived.cluster.instance.kube_api_server_vip
 - system.linux.system.repo.docker_legacy
 - system.kubernetes.pool.cluster
 - system.salt.minion.cert.k8s_client
@@ -13,8 +14,9 @@
 - cluster.overrides
 parameters:
   _param:
-    keepalived_vip_interface: ens4
-    keepalived_vip_virtual_router_id: 60
+    keepalived_k8s_apiserver_vip_interface: ens4
+    keepalived_k8s_apiserver_vip_address: ${_param:kubernetes_control_address}
+    keepalived_k8s_apiserver_vip_password: password
 
   linux:
     network:
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
index 5468b98..b2807ee 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
@@ -2,6 +2,7 @@
 - service.etcd.server.cluster
 - service.kubernetes.control.cluster
 - system.haproxy.proxy.listen.kubernetes.apiserver
+- system.keepalived.cluster.instance.kube_api_server_vip
 - system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
@@ -10,8 +11,9 @@
 - cluster.k8s-ha-contrail
 parameters:
   _param:
-    keepalived_vip_interface: vhost0
-    keepalived_vip_virtual_router_id: 60
+    keepalived_k8s_apiserver_vip_interface: vhost0
+    keepalived_k8s_apiserver_vip_address: ${_param:kubernetes_control_address}
+    keepalived_k8s_apiserver_vip_password: password
   etcd:
     server:
       bind:
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/control.yml b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
index 0dc70b6..270555a 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
@@ -1,6 +1,7 @@
 classes:
 - service.etcd.server.cluster
 - system.haproxy.proxy.listen.kubernetes.apiserver
+- system.keepalived.cluster.instance.kube_api_server_vip
 - system.linux.system.repo.mcp.apt_mirantis.docker_legacy
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
@@ -11,8 +12,9 @@
 - cluster.sl-k8s-calico
 parameters:
   _param:
-    keepalived_vip_interface: ${_param:primary_interface}
-    keepalived_vip_virtual_router_id: 60
+    keepalived_k8s_apiserver_vip_interface: ${_param:primary_interface}
+    keepalived_k8s_apiserver_vip_address: ${_param:kubernetes_control_address}
+    keepalived_k8s_apiserver_vip_password: password
   etcd:
     server:
       source:
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
index 7cd47fb..5176dc6 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
@@ -1,6 +1,7 @@
 classes:
 - service.etcd.server.cluster
 - system.haproxy.proxy.listen.kubernetes.apiserver
+- system.keepalived.cluster.instance.kube_api_server_vip
 - system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
@@ -10,8 +11,9 @@
 - cluster.sl-k8s-contrail
 parameters:
   _param:
-    keepalived_vip_interface: ens3
-    keepalived_vip_virtual_router_id: 60
+    keepalived_k8s_apiserver_vip_interface: vhost0
+    keepalived_k8s_apiserver_vip_address: ${_param:kubernetes_control_address}
+    keepalived_k8s_apiserver_vip_password: password
   etcd:
     server:
       source:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
index 3823e73..94958ec 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
@@ -2,6 +2,7 @@
 - service.etcd.server.cluster
 - service.kubernetes.control.cluster
 - system.haproxy.proxy.listen.kubernetes.apiserver
+- system.keepalived.cluster.instance.kube_api_server_vip
 - system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
@@ -12,8 +13,9 @@
 - cluster.overrides
 parameters:
   _param:
-    keepalived_vip_interface: ens3
-    keepalived_vip_virtual_router_id: 60
+    keepalived_k8s_apiserver_vip_interface: ens3
+    keepalived_k8s_apiserver_vip_address: ${_param:kubernetes_control_address}
+    keepalived_k8s_apiserver_vip_password: password
   etcd:
     server:
       source:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
index 295bca6..9c21917 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
@@ -2,6 +2,7 @@
 - service.etcd.server.cluster
 - service.kubernetes.control.cluster
 - system.haproxy.proxy.listen.kubernetes.apiserver
+- system.keepalived.cluster.instance.kube_api_server_vip
 - system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
@@ -11,8 +12,9 @@
 - cluster.overrides
 parameters:
   _param:
-    keepalived_vip_interface: ens3
-    keepalived_vip_virtual_router_id: 60
+    keepalived_k8s_apiserver_vip_interface: ens3
+    keepalived_k8s_apiserver_vip_address: ${_param:kubernetes_control_address}
+    keepalived_k8s_apiserver_vip_password: password
   etcd:
     server:
       source:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index b93fd2a..21a2573 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -2,6 +2,7 @@
 - service.etcd.server.cluster
 - service.kubernetes.control.cluster
 - system.haproxy.proxy.listen.kubernetes.apiserver
+- system.keepalived.cluster.instance.kube_api_server_vip
 - system.linux.system.repo.mcp.apt_mirantis.docker_legacy
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
@@ -12,8 +13,9 @@
 - cluster.virtual-mcp11-k8s-calico
 parameters:
   _param:
-    keepalived_vip_interface: ${_param:primary_interface}
-    keepalived_vip_virtual_router_id: 60
+    keepalived_k8s_apiserver_vip_interface: ${_param:primary_interface}
+    keepalived_k8s_apiserver_vip_address: ${_param:kubernetes_control_address}
+    keepalived_k8s_apiserver_vip_password: password
     cluster_local_address: ${_param:deploy_address}
   etcd:
     server:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index 82d9206..1027e55 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -2,6 +2,7 @@
 - service.etcd.server.cluster
 - service.kubernetes.control.cluster
 - system.haproxy.proxy.listen.kubernetes.apiserver
+- system.keepalived.cluster.instance.kube_api_server_vip
 - system.linux.system.repo.docker_legacy
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
@@ -11,8 +12,9 @@
 - cluster.virtual-mcp11-k8s-contrail
 parameters:
   _param:
-    keepalived_vip_interface: vhost0
-    keepalived_vip_virtual_router_id: 60
+    keepalived_k8s_apiserver_vip_interface: vhost0
+    keepalived_k8s_apiserver_vip_address: ${_param:kubernetes_control_address}
+    keepalived_k8s_apiserver_vip_password: password
     cluster_local_address: ${_param:deploy_address}
   etcd:
     server:
diff --git a/classes/system b/classes/system
index 3d227a7..7b0aefe 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 3d227a7e3be6d3da6a459cc8254637be2228d1fb
+Subproject commit 7b0aefebe440043ae217f795f56edbe43f6ab1fc