diff --git a/classes/cluster/k8s-ha-calico-syndic/infra/config.yml b/classes/cluster/k8s-ha-calico-syndic/infra/config.yml
index ce7924a..768d22d 100644
--- a/classes/cluster/k8s-ha-calico-syndic/infra/config.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/infra/config.yml
@@ -21,7 +21,6 @@
     linux_system_codename: xenial
     salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
     salt_master_host: 127.0.0.1
-    salt_syndic_enabled: false
   salt:
     master:
       worker_threads: 40
diff --git a/classes/cluster/k8s-ha-calico-syndic/infra/init.yml b/classes/cluster/k8s-ha-calico-syndic/infra/init.yml
index e129b05..681892a 100644
--- a/classes/cluster/k8s-ha-calico-syndic/infra/init.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/infra/init.yml
@@ -11,6 +11,7 @@
     infra_config_address: 172.16.10.90
     infra_config_deploy_address: 192.168.10.90
     salt_syndic_master_address: 192.168.10.90
+    salt_syndic_enabled: false
 
     cluster_domain: k8s-ha-calico-syndic.local
     cluster_name: k8s-ha-calico-syndic
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
index 45f9465..1fde55f 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -2,7 +2,6 @@
 - 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
@@ -14,9 +13,7 @@
 - cluster.overrides
 parameters:
   _param:
-    keepalived_k8s_apiserver_vip_interface: ens4
-    keepalived_k8s_apiserver_vip_address: ${_param:kubernetes_control_address}
-    keepalived_k8s_apiserver_vip_password: password
+    keepalived_vip_interface: ens4
 
   linux:
     network:
diff --git a/classes/cluster/os-ha-ovs-syndic/infra/config.yml b/classes/cluster/os-ha-ovs-syndic/infra/config.yml
index 77b5623..e9f25ba 100644
--- a/classes/cluster/os-ha-ovs-syndic/infra/config.yml
+++ b/classes/cluster/os-ha-ovs-syndic/infra/config.yml
@@ -46,7 +46,6 @@
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
-    salt_syndic_enabled: false
   linux:
     network:
       interface:
diff --git a/classes/cluster/os-ha-ovs-syndic/infra/init.yml b/classes/cluster/os-ha-ovs-syndic/infra/init.yml
index 61d2374..0639ab8 100644
--- a/classes/cluster/os-ha-ovs-syndic/infra/init.yml
+++ b/classes/cluster/os-ha-ovs-syndic/infra/init.yml
@@ -6,6 +6,7 @@
     infra_config_hostname: cfg01
     infra_config_address: 172.16.10.90
     salt_syndic_master_address: 192.168.10.90
+    salt_syndic_enabled: false
   linux:
     network:
       host: