diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 946a264..00c337b 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -8,9 +8,6 @@
   opencontrail:
     common:
       version: ${_param:opencontrail_version}
-      source:
-        engine: pkg
-        address: http://mirror.robotice.cz/contrail-havana/
       identity:
         engine: keystone
         host: ${_param:cluster_vip_address}
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index 22122c0..ef36e05 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -8,119 +8,102 @@
   opencontrail:
     common:
       version: ${_param:opencontrail_version}
-      source:
-        engine: pkg
-        address: http://mirror.robotice.cz/contrail-havana/
       identity:
         engine: keystone
-        host: ${_param:cluster_vip_address}
+        host: ${_param:single_address}
         port: 35357
         token: '${_param:keystone_service_token}'
         password: '${_param:keystone_admin_password}'
       network:
         engine: neutron
-        host: ${_param:cluster_vip_address}
+        host: ${_param:single_address}
         port: 9696
     config:
       version: ${_param:opencontrail_version}
       enabled: true
       network:
         engine: neutron
-        host: ${_param:cluster_vip_address}
+        host: ${_param:single_address}
         port: 9696
       discovery:
-        host: ${_param:cluster_vip_address}
+        host: ${_param:single_address}
       analytics:
-        host: ${_param:cluster_vip_address}
+        host: ${_param:single_address}
       bind:
-        address: ${_param:cluster_local_address}
+        address: ${_param:single_address}
       message_queue:
         engine: rabbitmq
-        host: ${_param:cluster_vip_address}
+        host: ${_param:single_address}
         port: 5672
       database:
         members:
-        - host: ${_param:cluster_local_address}
+        - host: ${_param:single_address}
           port: 9160
       cache:
-        host: ${_param:cluster_local_address}
+        host: ${_param:single_address}
       identity:
         engine: keystone
         region: RegionOne
-        host: ${_param:cluster_vip_address}
+        host: ${_param:single_address}
         port: 35357
         user: admin
         password: '${_param:keystone_admin_password}'
         token: '${_param:keystone_service_token}'
         tenant: admin
       members:
-      - host: ${_param:cluster_local_address}
+      - host: ${_param:single_address}
         id: 1
     control:
       version: ${_param:opencontrail_version}
       enabled: true
       bind:
-        address: ${_param:cluster_local_address}
+        address: ${_param:single_address}
       discovery:
-        host: ${_param:cluster_vip_address}
+        host: ${_param:single_address}
       master:
-        host: ${_param:cluster_local_address}
+        host: ${_param:single_address}
       members:
-      - host: ${_param:cluster_local_address}
+      - host: ${_param:single_address}
         id: 1
-    collector:
-      version: ${_param:opencontrail_version}
-      enabled: true
-      bind:
-        address: ${_param:cluster_local_address}
-      master:
-        host: ${_param:cluster_local_address}
-      discovery:
-        host: ${_param:cluster_vip_address}
-      data_ttl: 2
-      database:
-        members:
-        - host: ${_param:cluster_local_address}
-          port: 9160
     database:
       version: ${_param:opencontrail_version}
       cassandra:
         version: 2
       enabled: true
-      minimum_disk: 10
       name: 'Contrail'
+      minimum_disk: 10
       original_token: 0
       data_dirs:
       - /var/lib/cassandra
       id: ${_param:opencontrail_database_id}
       discovery:
-        host: ${_param:cluster_vip_address}
+        host: ${_param:single_address}
       bind:
-        host: ${_param:cluster_local_address}
+        host: ${_param:single_address}
         port: 9042
         rpc_port: 9160
       members:
-      - host: ${_param:cluster_local_address}
+      - host: ${_param:single_address}
         id: 1
     web:
       version: ${_param:opencontrail_version}
       enabled: True
       bind:
-        address: ${_param:cluster_local_address}
+        address: ${_param:single_address}
       analytics:
-        host: ${_param:cluster_vip_address}
+        host: ${_param:single_address}
       master:
-        host: ${_param:cluster_vip_address}
+        host: ${_param:single_address}
       cache:
         engine: redis
-        host: ${_param:cluster_local_address}
+        host: ${_param:single_address}
         port: 6379
       members:
-      - host: ${_param:cluster_local_address}
+      - host: ${_param:single_address}
         id: 1
       identity:
         engine: keystone
-        host: ${_param:cluster_vip_address}
+        host: ${_param:single_address}
         port: 35357
         user: admin
         password: '${_param:keystone_admin_password}'