diff --git a/manila/common/cluster.yml b/manila/common/cluster.yml
index 57ced1d..73c679b 100644
--- a/manila/common/cluster.yml
+++ b/manila/common/cluster.yml
@@ -28,7 +28,7 @@
         host: ${_param:openstack_database_address}
         port: 3306
         name: manila
-        user: manila
+        user: ${_param:mysql_manila_username}
         password: ${_param:mysql_manila_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
@@ -42,7 +42,7 @@
         region: ${_param:openstack_region}
         host: ${_param:manila_cluster_vip_address}
         port: 35357
-        user: manila
+        user: ${_param:keystone_manila_username}
         password: ${_param:keystone_manila_password}
         tenant: service
         auth_type: password
diff --git a/manila/common/single.yml b/manila/common/single.yml
index 00f42eb..fe59263 100644
--- a/manila/common/single.yml
+++ b/manila/common/single.yml
@@ -26,7 +26,7 @@
         host: ${_param:single_address}
         port: 3306
         name: manila
-        user: manila
+        user: ${_param:mysql_manila_username}
         password: ${_param:mysql_manila_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
@@ -40,7 +40,7 @@
         region: ${_param:openstack_region}
         host: ${_param:single_address}
         port: 35357
-        user: manila
+        user: ${_param:keystone_manila_username}
         password: ${_param:keystone_manila_password}
         tenant: service
         auth_type: password