diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index abb8188..e0d01d9 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -48,7 +48,7 @@
         host: ${_param:openstack_database_address}
         name: keystone
         password: ${_param:mysql_keystone_password}
-        user: keystone
+        user: ${_param:mysql_keystone_username}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
           ca_file: ${_param:mysql_keystone_ssl_ca_file}
diff --git a/keystone/server/single.yml b/keystone/server/single.yml
index 014a6dc..8c5e594 100644
--- a/keystone/server/single.yml
+++ b/keystone/server/single.yml
@@ -43,7 +43,7 @@
         host: ${_param:single_address}
         name: keystone
         password: ${_param:mysql_keystone_password}
-        user: keystone
+        user: ${_param:mysql_keystone_username}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
           ca_file: ${_param:mysql_keystone_ssl_ca_file}