diff --git a/nova/compute/cluster.yml b/nova/compute/cluster.yml
index ba9132c..94e4157 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -32,14 +32,14 @@
         host: ${_param:openstack_database_address}
         port: 3306
         name: nova
-        user: nova
+        user: ${_param:mysql_nova_username}
         password: ${_param:mysql_nova_password}
       identity:
         engine: keystone
         region: ${_param:openstack_region}
         host: ${_param:cluster_vip_address}
         port: 35357
-        user: nova
+        user: ${_param:keystone_nova_username}
         password: ${_param:keystone_nova_password}
         tenant: service
         protocol: ${_param:cluster_internal_protocol}
@@ -74,7 +74,7 @@
         region: ${_param:openstack_region}
         host: ${_param:neutron_service_host}
         port: 9696
-        user: neutron
+        user: ${_param:keystone_neutron_username}
         tenant: service
         password: ${_param:keystone_neutron_password}
         protocol: ${_param:cluster_internal_protocol}
diff --git a/nova/compute/single.yml b/nova/compute/single.yml
index 2e65d06..287442e 100644
--- a/nova/compute/single.yml
+++ b/nova/compute/single.yml
@@ -31,13 +31,13 @@
         host: ${_param:control_address}
         port: 3306
         name: nova
-        user: nova
+        user: ${_param:mysql_nova_username}
         password: ${_param:mysql_nova_password}
       identity:
         engine: keystone
         host: ${_param:control_address}
         port: 35357
-        user: nova
+        user: ${_param:keystone_nova_username}
         password: ${_param:keystone_nova_password}
         tenant: service
         protocol: ${_param:cluster_internal_protocol}
diff --git a/nova/compute_ironic/cluster.yml b/nova/compute_ironic/cluster.yml
index bed113f..b921306 100644
--- a/nova/compute_ironic/cluster.yml
+++ b/nova/compute_ironic/cluster.yml
@@ -18,14 +18,14 @@
         host: ${_param:openstack_database_address}
         port: 3306
         name: nova
-        user: nova
+        user: ${_param:mysql_nova_username}
         password: ${_param:mysql_nova_password}
       identity:
         engine: keystone
         region: ${_param:openstack_region}
         host: ${_param:cluster_vip_address}
         port: 35357
-        user: nova
+        user: ${_param:keystone_nova_username}
         password: ${_param:keystone_nova_password}
         tenant: service
         protocol: ${_param:cluster_internal_protocol}
@@ -46,7 +46,7 @@
         region: ${_param:openstack_region}
         host: ${_param:neutron_service_host}
         port: 9696
-        user: neutron
+        user: ${_param:keystone_neutron_username}
         tenant: service
         password: ${_param:keystone_neutron_password}
         protocol: ${_param:cluster_internal_protocol}
@@ -56,7 +56,7 @@
         region: ${_param:openstack_region}
         host: ${_param:ironic_service_host}
         port: 6385
-        user: ironic
+        user: ${_param:keystone_ironic_username}
         tenant: service
         password: ${_param:keystone_ironic_password}
         auth_type: password
diff --git a/nova/compute_ironic/single.yml b/nova/compute_ironic/single.yml
index 6534e43..15c8190 100644
--- a/nova/compute_ironic/single.yml
+++ b/nova/compute_ironic/single.yml
@@ -18,14 +18,14 @@
         host: ${_param:control_address}
         port: 3306
         name: nova
-        user: nova
+        user: ${_param:mysql_nova_username}
         password: ${_param:mysql_nova_password}
       identity:
         engine: keystone
         region: ${_param:openstack_region}
         host: ${_param:control_address}
         port: 35357
-        user: nova
+        user: ${_param:keystone_nova_username}
         password: ${_param:keystone_nova_password}
         tenant: service
         protocol: ${_param:cluster_internal_protocol}
@@ -43,7 +43,7 @@
         region: ${_param:openstack_region}
         host: ${_param:control_address}
         port: 9696
-        user: neutron
+        user: ${_param:keystone_neutron_username}
         tenant: service
         password: ${_param:keystone_neutron_password}
         protocol: ${_param:cluster_internal_protocol}
@@ -53,7 +53,7 @@
         region: ${_param:openstack_region}
         host: ${_param:control_address}
         port: 6385
-        user: ironic
+        user: ${_param:keystone_ironic_username}
         tenant: service
         password: ${_param:keystone_ironic_password}
         protocol: ${_param:cluster_internal_protocol}
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index 2527b33..e7f76fa 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -44,7 +44,7 @@
         host: ${_param:openstack_database_address}
         port: 3306
         name: nova
-        user: nova
+        user: ${_param:mysql_nova_username}
         password: ${_param:mysql_nova_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
@@ -58,7 +58,7 @@
         region: ${_param:openstack_region}
         host: ${_param:cluster_vip_address}
         port: 35357
-        user: nova
+        user: ${_param:keystone_nova_username}
         password: ${_param:keystone_nova_password}
         tenant: service
         protocol: ${_param:cluster_internal_protocol}
@@ -96,7 +96,7 @@
         engine: neutron
         region: ${_param:openstack_region}
         host: ${_param:neutron_service_host}
-        user: neutron
+        user: ${_param:keystone_neutron_username}
         password: ${_param:keystone_neutron_password}
         port: 9696
         mtu: 1500