diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index c97196f..ed28f71 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -2,7 +2,7 @@
 - service.haproxy.proxy.single
 - service.keepalived.cluster.single
 - service.opencontrail.control.cluster
-- system.haproxy.proxy.listen.opencontrail.control
+- system.haproxy.proxy.listen.opencontrail.control4_0
 - system.haproxy.proxy.listen.opencontrail.analytics
 parameters:
   _param:
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index 123392c..5d82dec 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -2,7 +2,7 @@
 - service.docker.host
 - service.keepalived.cluster.single
 - service.opencontrail.control.control
-- system.haproxy.proxy.listen.opencontrail.control
+- system.haproxy.proxy.listen.opencontrail.control4_0
 parameters:
   _param:
     mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index 9826b28..7453b1f 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -46,17 +46,6 @@
             host: ${_param:single_address}
             port: 9100
             params: check inter 2000 rise 2 fall 3
-        contrail_discovery:
-          type: contrail-api
-          service_name: contrail
-          binds:
-          - address: ${_param:single_address}
-            port: 5998
-          servers:
-          - name: ctl01
-            host: ${_param:single_address}
-            port: 9110
-            params: check inter 2000 rise 2 fall 3
         contrail_config_stats:
           type: contrail-config
           service_name: contrail