diff --git a/keystone/client/v3/service/aodh.yml b/keystone/client/v3/service/aodh.yml
index a4f217c..af9b9b2 100644
--- a/keystone/client/v3/service/aodh.yml
+++ b/keystone/client/v3/service/aodh.yml
@@ -9,6 +9,7 @@
           cloud_name: 'admin_identity'
           users:
             aodh:
+              name: ${_param:keystone_aodh_username}
               password: ${_param:keystone_aodh_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/barbican.yml b/keystone/client/v3/service/barbican.yml
index f008abc..9708bdc 100644
--- a/keystone/client/v3/service/barbican.yml
+++ b/keystone/client/v3/service/barbican.yml
@@ -14,6 +14,7 @@
               enabled: true
           users:
             barbican:
+              name: ${_param:keystone_barbican_username}
               password: ${_param:keystone_barbican_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/billometer.yml b/keystone/client/v3/service/billometer.yml
index 9e115eb..6ab12ed 100644
--- a/keystone/client/v3/service/billometer.yml
+++ b/keystone/client/v3/service/billometer.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             billometer:
+              name: ${_param:keystone_billometer_username}
               password: ${_param:keystone_billometer_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/ceilometer.yml b/keystone/client/v3/service/ceilometer.yml
index 9129773..89a0c40 100644
--- a/keystone/client/v3/service/ceilometer.yml
+++ b/keystone/client/v3/service/ceilometer.yml
@@ -8,6 +8,7 @@
         v3:
           users:
             ceilometer:
+              name: ${_param:keystone_ceilometer_username}
               password: ${_param:keystone_ceilometer_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/cinder.yml b/keystone/client/v3/service/cinder.yml
index 1dd279a..b94b713 100644
--- a/keystone/client/v3/service/cinder.yml
+++ b/keystone/client/v3/service/cinder.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             cinder:
+              name: ${_param:keystone_cinder_username}
               password: ${_param:keystone_cinder_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/cinder2.yml b/keystone/client/v3/service/cinder2.yml
index 4d49d2b..e392a6a 100644
--- a/keystone/client/v3/service/cinder2.yml
+++ b/keystone/client/v3/service/cinder2.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             cinder:
+              name: ${_param:keystone_cinder_username}
               password: ${_param:keystone_cinder_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/cinder3.yml b/keystone/client/v3/service/cinder3.yml
index a4465ac..1ded99a 100644
--- a/keystone/client/v3/service/cinder3.yml
+++ b/keystone/client/v3/service/cinder3.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             cinder:
+              name: ${_param:keystone_cinder_username}
               password: ${_param:keystone_cinder_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/congress.yml b/keystone/client/v3/service/congress.yml
index 0d34181..936f71c 100644
--- a/keystone/client/v3/service/congress.yml
+++ b/keystone/client/v3/service/congress.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             congress:
+              name: ${_param:keystone_congress_username}
               password: ${_param:keystone_congress_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/designate.yml b/keystone/client/v3/service/designate.yml
index 271ea22..544a172 100644
--- a/keystone/client/v3/service/designate.yml
+++ b/keystone/client/v3/service/designate.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             designate:
+              name: ${_param:keystone_designate_username}
               password: ${_param:keystone_designate_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/glance.yml b/keystone/client/v3/service/glance.yml
index 0e01709..3abc3c8 100644
--- a/keystone/client/v3/service/glance.yml
+++ b/keystone/client/v3/service/glance.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             glance:
+              name: ${_param:keystone_glance_username}
               password: ${_param:keystone_glance_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/gnocchi.yml b/keystone/client/v3/service/gnocchi.yml
index 63241db..da3dfa7 100644
--- a/keystone/client/v3/service/gnocchi.yml
+++ b/keystone/client/v3/service/gnocchi.yml
@@ -8,6 +8,7 @@
         v3:
           users:
             gnocchi:
+              name: ${_param:keystone_gnocchi_username}
               password: ${_param:keystone_gnocchi_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/heat.yml b/keystone/client/v3/service/heat.yml
index 54c8f0b..2163292 100644
--- a/keystone/client/v3/service/heat.yml
+++ b/keystone/client/v3/service/heat.yml
@@ -14,6 +14,7 @@
               enabled: true
           users:
             heat:
+              name: ${_param:keystone_heat_username}
               password: ${_param:keystone_heat_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/ironic.yml b/keystone/client/v3/service/ironic.yml
index bd2795b..5dc431e 100644
--- a/keystone/client/v3/service/ironic.yml
+++ b/keystone/client/v3/service/ironic.yml
@@ -8,6 +8,7 @@
         v3:
           users:
             ironic:
+              name: ${_param:keystone_ironic_username}
               password: ${_param:keystone_ironic_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/manila.yml b/keystone/client/v3/service/manila.yml
index bb90159..6519b84 100644
--- a/keystone/client/v3/service/manila.yml
+++ b/keystone/client/v3/service/manila.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             manila:
+              name: ${_param:keystone_manila_username}
               password: ${_param:keystone_manila_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/manila2.yml b/keystone/client/v3/service/manila2.yml
index f5771ad..1ccf704 100644
--- a/keystone/client/v3/service/manila2.yml
+++ b/keystone/client/v3/service/manila2.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             manila:
+              name: ${_param:keystone_manila_username}
               password: ${_param:keystone_manila_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/neutron.yml b/keystone/client/v3/service/neutron.yml
index 6af16f9..1d6dae8 100644
--- a/keystone/client/v3/service/neutron.yml
+++ b/keystone/client/v3/service/neutron.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             neutron:
+              name: ${_param:keystone_neutron_username}
               password: ${_param:keystone_neutron_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/nova.yml b/keystone/client/v3/service/nova.yml
index d0c7366..2015900 100644
--- a/keystone/client/v3/service/nova.yml
+++ b/keystone/client/v3/service/nova.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             nova:
+              name: ${_param:keystone_nova_username}
               password: ${_param:keystone_nova_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/nova21.yml b/keystone/client/v3/service/nova21.yml
index 85bd29f..6ed684b 100644
--- a/keystone/client/v3/service/nova21.yml
+++ b/keystone/client/v3/service/nova21.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             nova:
+              name: ${_param:keystone_nova_username}
               password: ${_param:keystone_nova_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/octavia.yml b/keystone/client/v3/service/octavia.yml
index 54c8bc9..035dbfb 100644
--- a/keystone/client/v3/service/octavia.yml
+++ b/keystone/client/v3/service/octavia.yml
@@ -24,6 +24,7 @@
               enabled: true
           users:
             octavia:
+              name: ${_param:keystone_octavia_username}
               password: ${_param:keystone_octavia_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/panko.yml b/keystone/client/v3/service/panko.yml
index 226f601..1620d91 100644
--- a/keystone/client/v3/service/panko.yml
+++ b/keystone/client/v3/service/panko.yml
@@ -8,6 +8,7 @@
         v3:
           users:
             panko:
+              name: ${_param:keystone_panko_username}
               password: ${_param:keystone_panko_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/radosgw-s3.yml b/keystone/client/v3/service/radosgw-s3.yml
index 1a7ae3c..0da4b0b 100644
--- a/keystone/client/v3/service/radosgw-s3.yml
+++ b/keystone/client/v3/service/radosgw-s3.yml
@@ -8,6 +8,7 @@
         v3:
           users:
             swift:
+              name: ${_param:keystone_swift_username}
               password: ${_param:keystone_swift_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/radosgw-swift.yml b/keystone/client/v3/service/radosgw-swift.yml
index 2e78bb9..cf1290d 100644
--- a/keystone/client/v3/service/radosgw-swift.yml
+++ b/keystone/client/v3/service/radosgw-swift.yml
@@ -12,6 +12,7 @@
               enabled: true
           users:
             swift:
+              name: ${_param:keystone_swift_username}
               password: ${_param:keystone_swift_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/tacker.yml b/keystone/client/v3/service/tacker.yml
index bddca05..4d4396e 100644
--- a/keystone/client/v3/service/tacker.yml
+++ b/keystone/client/v3/service/tacker.yml
@@ -8,6 +8,7 @@
         v3:
           users:
             tacker:
+              name: ${_param:keystone_tacker_username}
               password: ${_param:keystone_tacker_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}