diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index d98a19e..399d330 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -7,7 +7,8 @@
     opencontrail_version: 2.2
     opencontrail_identity_port: 35357
     opencontrail_identity_version: '2.0'
-    keystone_admin_password: 'none'
+    opencontrail_admin_password: 'none'
+    opencontrail_admin_user: 'contrail'
     keystone_service_token: 'none'
     redis_password: 'none'
     openstack_region: RegionOne
@@ -19,7 +20,7 @@
         host: ${_param:cluster_vip_address}
         port: ${_param:opencontrail_identity_port}
         token: '${_param:keystone_service_token}'
-        password: '${_param:keystone_admin_password}'
+        password: '${_param:opencontrail_admin_password}'
       network:
         engine: neutron
         host: ${_param:cluster_vip_address}
@@ -58,8 +59,8 @@
         region: ${_param:openstack_region}
         host: ${_param:cluster_vip_address}
         port: ${_param:opencontrail_identity_port}
-        user: admin
-        password: '${_param:keystone_admin_password}'
+        user: ${_param:opencontrail_admin_user}
+        password: '${_param:opencontrail_admin_password}'
         token: '${_param:keystone_service_token}'
         tenant: admin
       members:
@@ -124,8 +125,8 @@
         region: RegionOne
         host: ${_param:cluster_vip_address}
         port: ${_param:opencontrail_identity_port}
-        user: admin
-        password: '${_param:keystone_admin_password}'
+        user: ${_param:opencontrail_admin_user}
+        password: '${_param:opencontrail_admin_password}'
         token: '${_param:keystone_service_token}'
         tenant: admin
       alarm_gen:
@@ -189,8 +190,8 @@
         version: ${_param:opencontrail_identity_version}
         host: ${_param:cluster_vip_address}
         port: ${_param:opencontrail_identity_port}
-        user: admin
-        password: '${_param:keystone_admin_password}'
+        user: ${_param:opencontrail_admin_user}
+        password: '${_param:opencontrail_admin_password}'
         token: '${_param:keystone_service_token}'
         tenant: admin
       network: