diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index 3eb7866..763ad09 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -28,7 +28,7 @@
         host: ${_param:openstack_database_address}
         port: 3306
         name: glance
-        user: glance
+        user: ${_param:mysql_glance_username}
         password: ${_param:mysql_glance_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
@@ -50,7 +50,7 @@
         engine: keystone
         host: ${_param:cluster_vip_address}
         port: 35357
-        user: glance
+        user: ${_param:keystone_glance_username}
         password: ${_param:keystone_glance_password}
         region: ${_param:openstack_region}
         tenant: service