diff --git a/metadata/service/control/container.yml b/metadata/service/control/container.yml
index 609a448..3d17d2d 100644
--- a/metadata/service/control/container.yml
+++ b/metadata/service/control/container.yml
@@ -40,8 +40,8 @@
                   region: RegionOne
                   host: ${_param:keystone_service_host}
                   port: 35357
-                  user: admin
-                  password: '${_param:keystone_admin_password}'
+                  user: ${_param:opencontrail_admin_user}
+                  password: '${_param:opencontrail_admin_password}'
                   token: '${_param:keystone_service_token}'
                   tenant: admin
         opencontrail-collector:
@@ -99,8 +99,8 @@
                   version: '2.0'
                   host: ${_param:keystone_service_host}
                   port: 35357
-                  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: