diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
index b1750ee..8aa48ea 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
@@ -39,6 +39,8 @@
       kubelet:
         address: ${_param:single_address}
         fail_on_swap: ${_param:kubelet_fail_on_swap}
+      kube_proxy:
+        enabled: false
       network:
         opencontrail:
           enabled: true
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
index b9388c8..c556728 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -24,14 +24,14 @@
           type: eth
           mtu: 1500
           proto: dhcp
-
         ens4:
           enabled: true
           type: eth
           mtu: 1500
-          address: ${_param:single_address}
           netmask: '255.255.255.0'
-          ipflush_onchange: true
+          address: ${_param:single_address}
+          pre_up_cmds:
+          - ip addr flush dev ens4
   etcd:
     server:
       bind:
@@ -49,6 +49,8 @@
         engine: none
         opencontrail:
           enabled: false
+      kube_proxy:
+        enabled: false
     common:
       addons:
         dashboard:
@@ -96,9 +98,9 @@
           private_ip_range: 10.150.0.0/16
           network_manager:
             image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-kube-manager
-#          config:
-#            api:
-#              host: ${_param:opencontrail_control_address}
+          config:
+            api:
+              host: ${_param:keepalived_vip_address}
           identity:
             auth_user: admin
             auth_password: contrail123
diff --git a/classes/cluster/os-ha-contrail-40/infra/config.yml b/classes/cluster/os-ha-contrail-40/infra/config.yml
index 6f85651..7eb7bfa 100644
--- a/classes/cluster/os-ha-contrail-40/infra/config.yml
+++ b/classes/cluster/os-ha-contrail-40/infra/config.yml
@@ -160,7 +160,6 @@
         openstack_control_node01:
           classes:
           - service.galera.master.cluster
-          - cluster.os-ha-contrail-40.openstack.dashboard
           params:
             mysql_cluster_role: master
             linux_system_codename: xenial
@@ -168,7 +167,6 @@
         openstack_control_node02:
           classes:
           - service.galera.slave.cluster
-          - cluster.os-ha-contrail-40.openstack.dashboard
           params:
             mysql_cluster_role: slave
             linux_system_codename: xenial
@@ -176,7 +174,6 @@
         openstack_control_node03:
           classes:
           - service.galera.slave.cluster
-          - cluster.os-ha-contrail-40.openstack.dashboard
           params:
             mysql_cluster_role: slave
             linux_system_codename: xenial
diff --git a/classes/cluster/os-ha-contrail-40/openstack/control.yml b/classes/cluster/os-ha-contrail-40/openstack/control.yml
index 7fd147b..787fce7 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/control.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/control.yml
@@ -31,6 +31,7 @@
 - system.galera.server.database.nova
 - system.galera.server.database.designate
 - system.haproxy.proxy.listen.openstack.nova-placement
+- cluster.os-ha-contrail-40.openstack.dashboard
 - cluster.os-ha-contrail-40
 parameters:
   _param: