diff --git a/metadata/service/client/cluster.yml b/metadata/service/client/cluster.yml
index 169367b..fabf22c 100644
--- a/metadata/service/client/cluster.yml
+++ b/metadata/service/client/cluster.yml
@@ -2,18 +2,19 @@
 - opencontrail
 parameters:
   _param:
-    opencontrail_version: 2.2
+    opencontrail_version: 3.0
   opencontrail:
     client:
+      enabled: True
       version: ${_param:opencontrail_version}
       identity:
         engine: keystone
-        host: ${_param:cluster_vip_address}
+        host: ${_param:openstack_control_address}
         port: 35357
         tenant: admin
         user: admin
         password: ${_param:keystone_admin_password}
       api:
         engine: contrail
-        host: ${_param:cluster_vip_address}
+        host: ${_param:opencontrail_control_address}
         port: 8082
diff --git a/metadata/service/client/single.yml b/metadata/service/client/single.yml
index fb9abd7..67038c2 100644
--- a/metadata/service/client/single.yml
+++ b/metadata/service/client/single.yml
@@ -2,9 +2,10 @@
 - opencontrail
 parameters:
   _param:
-    opencontrail_version: 2.2
+    opencontrail_version: 3.0
   opencontrail:
     client:
+      enabled: True
       version: ${_param:opencontrail_version}
       identity:
         engine: keystone