diff --git a/metadata/service/client/cluster.yml b/metadata/service/client/cluster.yml
index 3cfd124..337e9d0 100644
--- a/metadata/service/client/cluster.yml
+++ b/metadata/service/client/cluster.yml
@@ -6,6 +6,8 @@
     opencontrail_identity_port: 35357
     opencontrail_identity_version: '2.0'
     openstack_control_address: 127.0.0.1
+    opencontrail_admin_password: 'none'
+    opencontrail_admin_user: 'contrail'
   opencontrail:
     client:
       enabled: True
@@ -16,8 +18,8 @@
         port: ${_param:opencontrail_identity_port}
         version: ${_param:opencontrail_identity_version}
         tenant: admin
-        user: admin
-        password: ${_param:keystone_admin_password}
+        user: ${_param:opencontrail_admin_user}
+        password: ${_param:opencontrail_admin_password}
       api:
         engine: contrail
         host: ${_param:opencontrail_control_address}
diff --git a/metadata/service/client/single.yml b/metadata/service/client/single.yml
index 19f73eb..8d3a509 100644
--- a/metadata/service/client/single.yml
+++ b/metadata/service/client/single.yml
@@ -5,6 +5,8 @@
     opencontrail_version: 3.0
     opencontrail_identity_port: 35357
     opencontrail_identity_version: '2.0'
+    opencontrail_admin_password: 'none'
+    opencontrail_admin_user: 'contrail'
   opencontrail:
     client:
       enabled: True
@@ -15,8 +17,8 @@
         port: ${_param:opencontrail_identity_port}
         version: ${_param:opencontrail_identity_version}
         tenant: admin
-        user: admin
-        password: ${_param:keystone_admin_password}
+        user: ${_param:opencontrail_admin_user}
+        password: ${_param:opencontrail_admin_password}
       api:
         engine: contrail
         host: ${_param:cluster_local_address}