diff --git a/mysql/client/database_upgrade/aodh.yml b/mysql/client/database_upgrade/aodh.yml
index d363161..e351db3 100644
--- a/mysql/client/database_upgrade/aodh.yml
+++ b/mysql/client/database_upgrade/aodh.yml
@@ -7,11 +7,11 @@
             aodh_upgrade:
               encoding: utf8
               users:
-              - name: aodh
+              - name: ${_param:mysql_aodh_username}
                 password: ${_param:mysql_aodh_password}
                 host: '%'
                 rights: all
-              - name: aodh
+              - name: ${_param:mysql_aodh_username}
                 password: ${_param:mysql_aodh_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/ceilometer.yml b/mysql/client/database_upgrade/ceilometer.yml
index 5344b4b..28f6a26 100644
--- a/mysql/client/database_upgrade/ceilometer.yml
+++ b/mysql/client/database_upgrade/ceilometer.yml
@@ -7,11 +7,11 @@
             ceilometer_upgrade:
               encoding: utf8
               users:
-              - name: ceilometer
+              - name: ${_param:mysql_ceilometer_username}
                 password: ${_param:mysql_ceilometer_password}
                 host: '%'
                 rights: all
-              - name: ceilometer
+              - name: ${_param:mysql_ceilometer_username}
                 password: ${_param:mysql_ceilometer_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/cinder.yml b/mysql/client/database_upgrade/cinder.yml
index bafc70d..a72823e 100644
--- a/mysql/client/database_upgrade/cinder.yml
+++ b/mysql/client/database_upgrade/cinder.yml
@@ -7,11 +7,11 @@
             cinder_upgrade:
               encoding: utf8
               users:
-              - name: cinder
+              - name: ${_param:mysql_cinder_username}
                 password: ${_param:mysql_cinder_password}
                 host: '%'
                 rights: all
-              - name: cinder
+              - name: ${_param:mysql_cinder_username}
                 password: ${_param:mysql_cinder_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/designate.yml b/mysql/client/database_upgrade/designate.yml
index 48b7fce..7f13286 100644
--- a/mysql/client/database_upgrade/designate.yml
+++ b/mysql/client/database_upgrade/designate.yml
@@ -7,11 +7,11 @@
             designate_upgrade:
               encoding: utf8
               users:
-              - name: designate
+              - name: ${_param:mysql_designate_username}
                 password: ${_param:mysql_designate_password}
                 host: '%'
                 rights: all
-              - name: designate
+              - name: ${_param:mysql_designate_username}
                 password: ${_param:mysql_designate_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/designate_pool_manager.yml b/mysql/client/database_upgrade/designate_pool_manager.yml
index 26dd975..abc9491 100644
--- a/mysql/client/database_upgrade/designate_pool_manager.yml
+++ b/mysql/client/database_upgrade/designate_pool_manager.yml
@@ -7,11 +7,11 @@
             designate_pool_manager_upgrade:
               encoding: utf8
               users:
-              - name: designate
+              - name: ${_param:mysql_designate_username}
                 password: ${_param:mysql_designate_password}
                 host: '%'
                 rights: all
-              - name: designate
+              - name: ${_param:mysql_designate_username}
                 password: ${_param:mysql_designate_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/glance.yml b/mysql/client/database_upgrade/glance.yml
index bebe604..d1690ae 100644
--- a/mysql/client/database_upgrade/glance.yml
+++ b/mysql/client/database_upgrade/glance.yml
@@ -7,11 +7,11 @@
             glance_upgrade:
               encoding: utf8
               users:
-              - name: glance
+              - name: ${_param:mysql_glance_username}
                 password: ${_param:mysql_glance_password}
                 host: '%'
                 rights: all
-              - name: glance
+              - name: ${_param:mysql_glance_username}
                 password: ${_param:mysql_glance_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/grafana.yml b/mysql/client/database_upgrade/grafana.yml
index 7759a66..30c9d35 100644
--- a/mysql/client/database_upgrade/grafana.yml
+++ b/mysql/client/database_upgrade/grafana.yml
@@ -7,11 +7,11 @@
             grafana_upgrade:
               encoding: utf8
               users:
-              - name: grafana
+              - name: ${_param:mysql_grafana_username}
                 password: ${_param:mysql_grafana_password}
                 host: '%'
                 rights: all
-              - name: grafana
+              - name: ${_param:mysql_grafana_username}
                 password: ${_param:mysql_grafana_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/heat.yml b/mysql/client/database_upgrade/heat.yml
index 24e4cb1..1dd29cd 100644
--- a/mysql/client/database_upgrade/heat.yml
+++ b/mysql/client/database_upgrade/heat.yml
@@ -7,11 +7,11 @@
             heat_upgrade:
               encoding: utf8
               users:
-              - name: heat
+              - name: ${_param:mysql_heat_username}
                 password: ${_param:mysql_heat_password}
                 host: '%'
                 rights: all
-              - name: heat
+              - name: ${_param:mysql_heat_username}
                 password: ${_param:mysql_heat_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/keystone.yml b/mysql/client/database_upgrade/keystone.yml
index 8265662..c9b884f 100644
--- a/mysql/client/database_upgrade/keystone.yml
+++ b/mysql/client/database_upgrade/keystone.yml
@@ -7,11 +7,11 @@
             keystone_upgrade:
               encoding: utf8
               users:
-              - name: keystone
+              - name: ${_param:mysql_keystone_username}
                 password: ${_param:mysql_keystone_password}
                 host: '%'
                 rights: all
-              - name: keystone
+              - name: ${_param:mysql_keystone_username}
                 password: ${_param:mysql_keystone_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/murano.yml b/mysql/client/database_upgrade/murano.yml
index 2223ce6..45342a8 100644
--- a/mysql/client/database_upgrade/murano.yml
+++ b/mysql/client/database_upgrade/murano.yml
@@ -7,11 +7,11 @@
             murano_upgrade:
               encoding: utf8
               users:
-              - name: murano
+              - name: ${_param:mysql_murano_username}
                 password: ${_param:mysql_murano_password}
                 host: '%'
                 rights: all
-              - name: murano
+              - name: ${_param:mysql_murano_username}
                 password: ${_param:mysql_murano_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/neutron.yml b/mysql/client/database_upgrade/neutron.yml
index 7dd723c..ee5e200 100644
--- a/mysql/client/database_upgrade/neutron.yml
+++ b/mysql/client/database_upgrade/neutron.yml
@@ -7,11 +7,11 @@
             neutron_upgrade:
               encoding: utf8
               users:
-              - name: neutron
+              - name: ${_param:mysql_neutron_username}
                 password: ${_param:mysql_neutron_password}
                 host: '%'
                 rights: all
-              - name: neutron
+              - name: ${_param:mysql_neutron_username}
                 password: ${_param:mysql_neutron_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/nova.yml b/mysql/client/database_upgrade/nova.yml
index 699c9c3..2a0e246 100644
--- a/mysql/client/database_upgrade/nova.yml
+++ b/mysql/client/database_upgrade/nova.yml
@@ -7,11 +7,11 @@
             nova_upgrade:
               encoding: utf8
               users:
-              - name: nova
+              - name: ${_param:mysql_nova_username}
                 password: ${_param:mysql_nova_password}
                 host: '%'
                 rights: all
-              - name: nova
+              - name: ${_param:mysql_nova_username}
                 password: ${_param:mysql_nova_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/nova_api.yml b/mysql/client/database_upgrade/nova_api.yml
index 8bb33c8..d9815d5 100644
--- a/mysql/client/database_upgrade/nova_api.yml
+++ b/mysql/client/database_upgrade/nova_api.yml
@@ -7,11 +7,11 @@
             nova_upgrade_api:
               encoding: utf8
               users:
-              - name: nova
+              - name: ${_param:mysql_nova_username}
                 password: ${_param:mysql_nova_password}
                 host: '%'
                 rights: all
-              - name: nova
+              - name: ${_param:mysql_nova_username}
                 password: ${_param:mysql_nova_password}
                 host: ${_param:single_address}
                 rights: all
@@ -23,11 +23,11 @@
             nova_upgrade_cell0:
               encoding: utf8
               users:
-              - name: nova
+              - name: ${_param:mysql_nova_username}
                 password: ${_param:mysql_nova_password}
                 host: '%'
                 rights: all
-              - name: nova
+              - name: ${_param:mysql_nova_username}
                 password: ${_param:mysql_nova_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/sahara.yml b/mysql/client/database_upgrade/sahara.yml
index 73618d0..414b3dc 100644
--- a/mysql/client/database_upgrade/sahara.yml
+++ b/mysql/client/database_upgrade/sahara.yml
@@ -7,11 +7,11 @@
             sahara_upgrade:
               encoding: utf8
               users:
-              - name: sahara
+              - name: ${_param:mysql_sahara_username}
                 password: ${_param:mysql_sahara_password}
                 host: '%'
                 rights: all
-              - name: sahara
+              - name: ${_param:mysql_sahara_username}
                 password: ${_param:mysql_sahara_password}
                 host: ${_param:single_address}
                 rights: all