diff --git a/galera/server/database/aodh.yml b/galera/server/database/aodh.yml
index c7cdfdc..d71a0ef 100644
--- a/galera/server/database/aodh.yml
+++ b/galera/server/database/aodh.yml
@@ -7,12 +7,12 @@
         aodh:
           encoding: utf8
           users:
-          - name: aodh
+          - name: ${_param:mysql_aodh_username}
             password: ${_param:mysql_aodh_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_aodh_ssl_option}
-          - name: aodh
+          - name: ${_param:mysql_aodh_username}
             password: ${_param:mysql_aodh_password}
             host: ${_param:cluster_vip_address}
             rights: all
diff --git a/galera/server/database/barbican.yml b/galera/server/database/barbican.yml
index a292660..21bd732 100644
--- a/galera/server/database/barbican.yml
+++ b/galera/server/database/barbican.yml
@@ -7,12 +7,12 @@
         barbican:
           encoding: utf8
           users:
-          - name: barbican
+          - name: ${_param:mysql_barbican_username}
             password: ${_param:mysql_barbican_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_barbican_ssl_option}
-          - name: barbican
+          - name: ${_param:mysql_barbican_username}
             password: ${_param:mysql_barbican_password}
             host: ${_param:cluster_vip_address}
             rights: all
diff --git a/galera/server/database/ceilometer.yml b/galera/server/database/ceilometer.yml
index 08a7f8b..586aae3 100644
--- a/galera/server/database/ceilometer.yml
+++ b/galera/server/database/ceilometer.yml
@@ -7,12 +7,12 @@
         ceilometer:
           encoding: utf8
           users:
-          - name: ceilometer
+          - name: ${_param:mysql_ceilometer_username}
             password: ${_param:mysql_ceilometer_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_ceilometer_ssl_option}
-          - name: ceilometer
+          - name: ${_param:mysql_ceilometer_username}
             password: ${_param:mysql_ceilometer_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/cinder.yml b/galera/server/database/cinder.yml
index 6478cb8..f1ae9a3 100644
--- a/galera/server/database/cinder.yml
+++ b/galera/server/database/cinder.yml
@@ -7,12 +7,12 @@
         cinder:
           encoding: utf8
           users:
-          - name: cinder
+          - name: ${_param:mysql_cinder_username}
             password: ${_param:mysql_cinder_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_cinder_ssl_option}
-          - name: cinder
+          - name: ${_param:mysql_cinder_username}
             password: ${_param:mysql_cinder_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/designate.yml b/galera/server/database/designate.yml
index 43a76f9..fef27ab 100644
--- a/galera/server/database/designate.yml
+++ b/galera/server/database/designate.yml
@@ -7,12 +7,12 @@
         designate:
           encoding: utf8
           users:
-          - name: designate
+          - name: ${_param:mysql_designate_username}
             password: ${_param:mysql_designate_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_designate_ssl_option}
-          - name: designate
+          - name: ${_param:mysql_designate_username}
             password: ${_param:mysql_designate_password}
             host: ${_param:cluster_vip_address}
             rights: all
@@ -20,12 +20,12 @@
         designate_pool_manager:
           encoding: utf8
           users:
-          - name: designate
+          - name: ${_param:mysql_designate_username}
             password: ${_param:mysql_designate_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_designate_ssl_option}
-          - name: designate
+          - name: ${_param:mysql_designate_username}
             password: ${_param:mysql_designate_password}
             host: ${_param:cluster_vip_address}
             rights: all
diff --git a/galera/server/database/glance.yml b/galera/server/database/glance.yml
index 7af81d8..0ca9f6b 100644
--- a/galera/server/database/glance.yml
+++ b/galera/server/database/glance.yml
@@ -7,12 +7,12 @@
         glance:
           encoding: utf8
           users:
-          - name: glance
+          - name: ${_param:mysql_glance_username}
             password: ${_param:mysql_glance_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_glance_ssl_option}
-          - name: glance
+          - name: ${_param:mysql_glance_username}
             password: ${_param:mysql_glance_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/gnocchi.yml b/galera/server/database/gnocchi.yml
index 1ee36da..71c468e 100644
--- a/galera/server/database/gnocchi.yml
+++ b/galera/server/database/gnocchi.yml
@@ -7,12 +7,12 @@
         gnocchi:
           encoding: utf8
           users:
-          - name: gnocchi
+          - name: ${_param:mysql_gnocchi_username}
             password: ${_param:mysql_gnocchi_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_gnocchi_ssl_option}
-          - name: gnocchi
+          - name: ${_param:mysql_gnocchi_username}
             password: ${_param:mysql_gnocchi_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/grafana.yml b/galera/server/database/grafana.yml
index 3bfee87..3afb436 100644
--- a/galera/server/database/grafana.yml
+++ b/galera/server/database/grafana.yml
@@ -7,12 +7,12 @@
         grafana:
           encoding: utf8
           users:
-          - name: grafana
+          - name: ${_param:mysql_grafana_username}
             password: ${_param:mysql_grafana_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_grafana_ssl_option}
-          - name: grafana
+          - name: ${_param:mysql_grafana_username}
             password: ${_param:mysql_grafana_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/graphite.yml b/galera/server/database/graphite.yml
index 595c16b..fb0582c 100644
--- a/galera/server/database/graphite.yml
+++ b/galera/server/database/graphite.yml
@@ -7,7 +7,7 @@
         graphite:
           encoding: 'utf8'
           users:
-          - name: 'graphite'
+          - name: '${_param:mysql_graphite_username}'
             password: '${_param:mysql_graphite_password}'
             host: '%'
             rights: 'all'
diff --git a/galera/server/database/heat.yml b/galera/server/database/heat.yml
index 31b3968..a17db4b 100644
--- a/galera/server/database/heat.yml
+++ b/galera/server/database/heat.yml
@@ -7,12 +7,12 @@
         heat:
           encoding: utf8
           users:
-          - name: heat
+          - name: ${_param:mysql_heat_username}
             password: ${_param:mysql_heat_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_heat_ssl_option}
-          - name: heat
+          - name: ${_param:mysql_heat_username}
             password: ${_param:mysql_heat_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/ironic.yml b/galera/server/database/ironic.yml
index a478aeb..10ea447 100644
--- a/galera/server/database/ironic.yml
+++ b/galera/server/database/ironic.yml
@@ -7,12 +7,12 @@
         ironic:
           encoding: utf8
           users:
-          - name: ironic
+          - name: ${_param:mysql_ironic_username}
             password: ${_param:mysql_ironic_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_ironic_ssl_option}
-          - name: ironic
+          - name: ${_param:mysql_ironic_username}
             password: ${_param:mysql_ironic_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/keystone.yml b/galera/server/database/keystone.yml
index d6483cd..2dc90ff 100644
--- a/galera/server/database/keystone.yml
+++ b/galera/server/database/keystone.yml
@@ -7,12 +7,12 @@
         keystone:
           encoding: utf8
           users:
-          - name: keystone
+          - name: ${_param:mysql_keystone_username}
             password: ${_param:mysql_keystone_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_keystone_ssl_option}
-          - name: keystone
+          - name: ${_param:mysql_keystone_username}
             password: ${_param:mysql_keystone_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/manila.yml b/galera/server/database/manila.yml
index d233ce9..dc6c415 100644
--- a/galera/server/database/manila.yml
+++ b/galera/server/database/manila.yml
@@ -7,12 +7,12 @@
         manila:
           encoding: utf8
           users:
-          - name: manila
+          - name: ${_param:mysql_manila_username}
             password: ${_param:mysql_manila_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_manila_ssl_option}
-          - name: manila
+          - name: ${_param:mysql_manila_username}
             password: ${_param:mysql_manila_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/neutron.yml b/galera/server/database/neutron.yml
index b5ee606..772a57d 100644
--- a/galera/server/database/neutron.yml
+++ b/galera/server/database/neutron.yml
@@ -7,12 +7,12 @@
         neutron:
           encoding: 'utf8'
           users:
-          - name: 'neutron'
+          - name: '${_param:mysql_neutron_username}'
             password: '${_param:mysql_neutron_password}'
             host: '%'
             rights: 'all'
             ssl_option: ${_param:mysql_neutron_ssl_option}
-          - name: 'neutron'
+          - name: '${_param:mysql_neutron_username}'
             password: '${_param:mysql_neutron_password}'
             host: '${_param:cluster_local_address}'
             rights: 'all'
diff --git a/galera/server/database/nova.yml b/galera/server/database/nova.yml
index d2ffc4a..44bfc95 100644
--- a/galera/server/database/nova.yml
+++ b/galera/server/database/nova.yml
@@ -7,12 +7,12 @@
         nova:
           encoding: utf8
           users:
-          - name: nova
+          - name: ${_param:mysql_nova_username}
             password: ${_param:mysql_nova_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_nova_ssl_option}
-          - name: nova
+          - name: ${_param:mysql_nova_username}
             password: ${_param:mysql_nova_password}
             host: ${_param:cluster_local_address}
             rights: all
@@ -20,12 +20,12 @@
         nova_api:
           encoding: utf8
           users:
-          - name: nova
+          - name: ${_param:mysql_nova_username}
             password: ${_param:mysql_nova_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_nova_ssl_option}
-          - name: nova
+          - name: ${_param:mysql_nova_username}
             password: ${_param:mysql_nova_password}
             host: ${_param:cluster_local_address}
             rights: all
@@ -33,12 +33,12 @@
         nova_cell0:
           encoding: utf8
           users:
-          - name: nova
+          - name: ${_param:mysql_nova_username}
             password: ${_param:mysql_nova_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_nova_ssl_option}
-          - name: nova
+          - name: ${_param:mysql_nova_username}
             password: ${_param:mysql_nova_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/octavia.yml b/galera/server/database/octavia.yml
index 7b4eaaf..893a738 100644
--- a/galera/server/database/octavia.yml
+++ b/galera/server/database/octavia.yml
@@ -7,12 +7,12 @@
         octavia:
           encoding: 'utf8'
           users:
-          - name: 'octavia'
+          - name: '${_param:mysql_octavia_username}'
             password: '${_param:mysql_octavia_password}'
             host: '%'
             rights: 'all'
             ssl_option: ${_param:mysql_octavia_ssl_option}
-          - name: 'octavia'
+          - name: '${_param:mysql_octavia_username}'
             password: '${_param:mysql_octavia_password}'
             host: '${_param:cluster_local_address}'
             rights: 'all'
diff --git a/galera/server/database/panko.yml b/galera/server/database/panko.yml
index c4c455a..3e00e5a 100644
--- a/galera/server/database/panko.yml
+++ b/galera/server/database/panko.yml
@@ -7,12 +7,12 @@
         panko:
           encoding: utf8
           users:
-          - name: panko
+          - name: ${_param:mysql_panko_username}
             password: ${_param:mysql_panko_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_panko_ssl_option}
-          - name: panko
+          - name: ${_param:mysql_panko_username}
             password: ${_param:mysql_panko_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/tacker.yml b/galera/server/database/tacker.yml
index 9cd76b5..d181450 100644
--- a/galera/server/database/tacker.yml
+++ b/galera/server/database/tacker.yml
@@ -7,12 +7,12 @@
         tacker:
           encoding: utf8
           users:
-          - name: tacker
+          - name: ${_param:mysql_tacker_username}
             password: ${_param:mysql_tacker_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_tacker_ssl_option}
-          - name: tacker
+          - name: ${_param:mysql_tacker_username}
             password: ${_param:mysql_tacker_password}
             host: ${_param:cluster_local_address}
             rights: all