diff --git a/metadata/service/control/analytics.yml b/metadata/service/control/analytics.yml
index fcc7ddd..3a1d78c 100644
--- a/metadata/service/control/analytics.yml
+++ b/metadata/service/control/analytics.yml
@@ -5,13 +5,15 @@
 parameters:
   _param:
     opencontrail_version: 2.2
+    opencontrail_identity_port: 35357
+    opencontrail_identity_version: '2.0'
   opencontrail:
     common:
       version: ${_param:opencontrail_version}
       identity:
         engine: keystone
         host: ${_param:cluster_vip_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
         token: '${_param:keystone_service_token}'
         password: '${_param:keystone_admin_password}'
       network:
@@ -40,10 +42,10 @@
           port: 9160
       identity:
         engine: keystone
-        version: '2.0'
+        version: ${_param:opencontrail_identity_version}
         region: RegionOne
         host: ${_param:cluster_vip_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
         user: admin
         password: '${_param:keystone_admin_password}'
         token: '${_param:keystone_service_token}'
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 93a5acd..749ccfa 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -5,13 +5,15 @@
 parameters:
   _param:
     opencontrail_version: 2.2
+    opencontrail_identity_port: 35357
+    opencontrail_identity_version: '2.0'
   opencontrail:
     common:
       version: ${_param:opencontrail_version}
       identity:
         engine: keystone
         host: ${_param:cluster_vip_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
         token: '${_param:keystone_service_token}'
         password: '${_param:keystone_admin_password}'
       network:
@@ -48,10 +50,10 @@
           port: 9160
       identity:
         engine: keystone
-        version: '2.0'
+        version: ${_param:opencontrail_identity_version}
         region: RegionOne
         host: ${_param:cluster_vip_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
         user: admin
         password: '${_param:keystone_admin_password}'
         token: '${_param:keystone_service_token}'
@@ -102,10 +104,10 @@
           port: 9160
       identity:
         engine: keystone
-        version: '2.0'
+        version: ${_param:opencontrail_identity_version}
         region: RegionOne
         host: ${_param:cluster_vip_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
         user: admin
         password: '${_param:keystone_admin_password}'
         token: '${_param:keystone_service_token}'
@@ -162,9 +164,9 @@
         port: 9160
       identity:
         engine: keystone
-        version: '2.0'
+        version: ${_param:opencontrail_identity_version}
         host: ${_param:cluster_vip_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
         user: admin
         password: '${_param:keystone_admin_password}'
         token: '${_param:keystone_service_token}'
diff --git a/metadata/service/control/control.yml b/metadata/service/control/control.yml
index fe522cc..a29f7dd 100644
--- a/metadata/service/control/control.yml
+++ b/metadata/service/control/control.yml
@@ -5,13 +5,15 @@
 parameters:
   _param:
     opencontrail_version: 2.2
+    opencontrail_identity_port: 35357
+    opencontrail_identity_version: '2.0'
   opencontrail:
     common:
       version: ${_param:opencontrail_version}
       identity:
         engine: keystone
         host: ${_param:cluster_vip_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
         token: '${_param:keystone_service_token}'
         password: '${_param:keystone_admin_password}'
       network:
@@ -48,10 +50,10 @@
           port: 9160
       identity:
         engine: keystone
-        version: '2.0'
+        version: ${_param:opencontrail_identity_version}
         region: RegionOne
         host: ${_param:cluster_vip_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
         user: admin
         password: '${_param:keystone_admin_password}'
         token: '${_param:keystone_service_token}'
@@ -129,9 +131,10 @@
         port: 9160
       identity:
         engine: keystone
-        version: '2.0'
+        version: ${_param:opencontrail_identity_version}
+        region: RegionOne
         host: ${_param:cluster_vip_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
         user: admin
         password: '${_param:keystone_admin_password}'
         token: '${_param:keystone_service_token}'
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index ae20c5e..ee4d19e 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -5,13 +5,15 @@
 parameters:
   _param:
     opencontrail_version: 2.2
+    opencontrail_identity_port: 35357
+    opencontrail_identity_version: '2.0'
   opencontrail:
     common:
       version: ${_param:opencontrail_version}
       identity:
         engine: keystone
         host: ${_param:single_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
         token: '${_param:keystone_service_token}'
         password: '${_param:keystone_admin_password}'
       network:
@@ -48,10 +50,10 @@
           port: 11211
       identity:
         engine: keystone
-        version: '2.0'
+        version: ${_param:opencontrail_identity_version}
         region: RegionOne
         host: ${_param:single_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
         user: admin
         password: '${_param:keystone_admin_password}'
         token: '${_param:keystone_service_token}'
@@ -89,10 +91,10 @@
           port: 9160
       identity:
         engine: keystone
-        version: '2.0'
+        version: ${_param:opencontrail_identity_version}
         region: RegionOne
         host: ${_param:single_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
         user: admin
         password: '${_param:keystone_admin_password}'
         token: '${_param:keystone_service_token}'
@@ -141,9 +143,9 @@
         port: 9160
       identity:
         engine: keystone
-        version: '2.0'
+        version: ${_param:opencontrail_identity_version}
         host: ${_param:single_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
         user: admin
         password: '${_param:keystone_admin_password}'
         token: '${_param:keystone_service_token}'