diff --git a/metadata/service/client/cluster.yml b/metadata/service/client/cluster.yml
index fabf22c..8d0595f 100644
--- a/metadata/service/client/cluster.yml
+++ b/metadata/service/client/cluster.yml
@@ -3,6 +3,8 @@
 parameters:
   _param:
     opencontrail_version: 3.0
+    opencontrail_identity_port: 35357
+    opencontrail_identity_version: '2.0'
   opencontrail:
     client:
       enabled: True
@@ -10,7 +12,8 @@
       identity:
         engine: keystone
         host: ${_param:openstack_control_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
+        version: ${_param:opencontrail_identity_version}
         tenant: admin
         user: admin
         password: ${_param:keystone_admin_password}
diff --git a/metadata/service/client/single.yml b/metadata/service/client/single.yml
index 67038c2..19f73eb 100644
--- a/metadata/service/client/single.yml
+++ b/metadata/service/client/single.yml
@@ -3,6 +3,8 @@
 parameters:
   _param:
     opencontrail_version: 3.0
+    opencontrail_identity_port: 35357
+    opencontrail_identity_version: '2.0'
   opencontrail:
     client:
       enabled: True
@@ -10,7 +12,8 @@
       identity:
         engine: keystone
         host: ${_param:cluster_local_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
+        version: ${_param:opencontrail_identity_version}
         tenant: admin
         user: admin
         password: ${_param:keystone_admin_password}