diff --git a/keystone/client/service/aodh.yml b/keystone/client/service/aodh.yml
index 3d2dae0..704ed1b 100644
--- a/keystone/client/service/aodh.yml
+++ b/keystone/client/service/aodh.yml
@@ -12,6 +12,7 @@
             service:
               user:
                 aodh:
+                  name: ${_param:keystone_aodh_username}
                   is_admin: true
                   password: ${_param:keystone_aodh_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/barbican.yml b/keystone/client/service/barbican.yml
index 1a65afd..23bda00 100644
--- a/keystone/client/service/barbican.yml
+++ b/keystone/client/service/barbican.yml
@@ -14,6 +14,7 @@
             service:
               user:
                 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/service/billometer.yml b/keystone/client/service/billometer.yml
index 14c570e..002ca9b 100644
--- a/keystone/client/service/billometer.yml
+++ b/keystone/client/service/billometer.yml
@@ -11,6 +11,7 @@
             service:
               user:
                 billometer:
+                  name: ${_param:keystone_billometer_username}
                   is_admin: true
                   password: ${_param:keystone_billometer_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/ceilometer.yml b/keystone/client/service/ceilometer.yml
index 4a21d9c..ff52e6c 100644
--- a/keystone/client/service/ceilometer.yml
+++ b/keystone/client/service/ceilometer.yml
@@ -14,6 +14,7 @@
             service:
               user:
                 ceilometer:
+                  name: ${_param:keystone_ceilometer_username}
                   is_admin: true
                   password: ${_param:keystone_ceilometer_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/cinder.yml b/keystone/client/service/cinder.yml
index ec0b2ca..c36fef2 100644
--- a/keystone/client/service/cinder.yml
+++ b/keystone/client/service/cinder.yml
@@ -11,6 +11,7 @@
             service:
               user:
                 cinder:
+                  name: ${_param:keystone_cinder_username}
                   is_admin: true
                   password: ${_param:keystone_cinder_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/cinder2.yml b/keystone/client/service/cinder2.yml
index fd8cbfc..0115d1b 100644
--- a/keystone/client/service/cinder2.yml
+++ b/keystone/client/service/cinder2.yml
@@ -11,6 +11,7 @@
             service:
               user:
                 cinder:
+                  name: ${_param:keystone_cinder_username}
                   is_admin: true
                   password: ${_param:keystone_cinder_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/cinder3.yml b/keystone/client/service/cinder3.yml
index 6280a7b..cd0df24 100644
--- a/keystone/client/service/cinder3.yml
+++ b/keystone/client/service/cinder3.yml
@@ -11,6 +11,7 @@
             service:
               user:
                 cinder:
+                  name: ${_param:keystone_cinder_username}
                   is_admin: true
                   password: ${_param:keystone_cinder_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/congress.yml b/keystone/client/service/congress.yml
index e0a6754..6c51c33 100644
--- a/keystone/client/service/congress.yml
+++ b/keystone/client/service/congress.yml
@@ -11,6 +11,7 @@
             service:
               user:
                 congress:
+                  name: ${_param:keystone_congress_username}
                   is_admin: true
                   password: ${_param:keystone_congress_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/designate.yml b/keystone/client/service/designate.yml
index 80f3761..b3756b8 100644
--- a/keystone/client/service/designate.yml
+++ b/keystone/client/service/designate.yml
@@ -11,6 +11,7 @@
             service:
               user:
                 designate:
+                  name: ${_param:keystone_designate_username}
                   is_admin: true
                   password: ${_param:keystone_designate_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/glance.yml b/keystone/client/service/glance.yml
index 69b5d8b..67ced92 100644
--- a/keystone/client/service/glance.yml
+++ b/keystone/client/service/glance.yml
@@ -11,6 +11,7 @@
             service:
               user:
                 glance:
+                  name: ${_param:keystone_glance_username}
                   is_admin: true
                   password: ${_param:keystone_glance_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/glare.yml b/keystone/client/service/glare.yml
index 22d619f..8bd8c4c 100644
--- a/keystone/client/service/glare.yml
+++ b/keystone/client/service/glare.yml
@@ -9,6 +9,7 @@
             service:
               user:
                 glance:
+                  name: ${_param:keystone_glance_username}
                   is_admin: true
                   password: ${_param:keystone_glance_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/gnocchi.yml b/keystone/client/service/gnocchi.yml
index 2336a8c..fa38f05 100644
--- a/keystone/client/service/gnocchi.yml
+++ b/keystone/client/service/gnocchi.yml
@@ -14,6 +14,7 @@
             service:
               user:
                 gnocchi:
+                  name: ${_param:keystone_gnocchi_username}
                   is_admin: true
                   password: ${_param:keystone_gnocchi_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/heat.yml b/keystone/client/service/heat.yml
index 9c17b06..6d8a8f0 100644
--- a/keystone/client/service/heat.yml
+++ b/keystone/client/service/heat.yml
@@ -14,6 +14,7 @@
             service:
               user:
                 heat:
+                  name: ${_param:keystone_heat_username}
                   is_admin: true
                   password: ${_param:keystone_heat_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/ironic.yml b/keystone/client/service/ironic.yml
index e350284..ce449c2 100644
--- a/keystone/client/service/ironic.yml
+++ b/keystone/client/service/ironic.yml
@@ -12,6 +12,7 @@
             service:
               user:
                 ironic:
+                  name: ${_param:keystone_ironic_username}
                   is_admin: true
                   password: ${_param:keystone_ironic_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/manila.yml b/keystone/client/service/manila.yml
index 5cc66d2..8f83e18 100644
--- a/keystone/client/service/manila.yml
+++ b/keystone/client/service/manila.yml
@@ -11,6 +11,7 @@
             service:
               user:
                 manila:
+                  name: ${_param:keystone_manila_username}
                   is_admin: true
                   password: ${_param:keystone_manila_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/manila2.yml b/keystone/client/service/manila2.yml
index 8cccc24..2be0481 100644
--- a/keystone/client/service/manila2.yml
+++ b/keystone/client/service/manila2.yml
@@ -11,6 +11,7 @@
             service:
               user:
                 manila:
+                  name: ${_param:keystone_manila_username}
                   is_admin: true
                   password: ${_param:keystone_manila_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/murano.yml b/keystone/client/service/murano.yml
index 1652ac2..9e01c74 100644
--- a/keystone/client/service/murano.yml
+++ b/keystone/client/service/murano.yml
@@ -9,6 +9,7 @@
             service:
               user:
                 murano:
+                  name: ${_param:keystone_murano_username}
                   is_admin: true
                   password: ${_param:keystone_murano_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/neutron.yml b/keystone/client/service/neutron.yml
index 59e4b33..86102a2 100644
--- a/keystone/client/service/neutron.yml
+++ b/keystone/client/service/neutron.yml
@@ -11,6 +11,7 @@
             service:
               user:
                 neutron:
+                  name: ${_param:keystone_neutron_username}
                   is_admin: true
                   password: ${_param:keystone_neutron_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/nova.yml b/keystone/client/service/nova.yml
index 22bbfc9..ddb5ff8 100644
--- a/keystone/client/service/nova.yml
+++ b/keystone/client/service/nova.yml
@@ -11,6 +11,7 @@
             service:
               user:
                 nova:
+                  name: ${_param:keystone_nova_username}
                   is_admin: true
                   password: ${_param:keystone_nova_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/nova21.yml b/keystone/client/service/nova21.yml
index 27a0580..9de386e 100644
--- a/keystone/client/service/nova21.yml
+++ b/keystone/client/service/nova21.yml
@@ -11,6 +11,7 @@
             service:
               user:
                 nova:
+                  name: ${_param:keystone_nova_username}
                   is_admin: true
                   password: ${_param:keystone_nova_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/octavia.yml b/keystone/client/service/octavia.yml
index c5ca83f..b6dab99 100644
--- a/keystone/client/service/octavia.yml
+++ b/keystone/client/service/octavia.yml
@@ -15,6 +15,7 @@
             service:
               user:
                 octavia:
+                  name: ${_param:keystone_octavia_username}
                   is_admin: true
                   password: ${_param:keystone_octavia_password}
                   email: ${_param:admin_email}
@@ -39,7 +40,7 @@
                 admin_path: '/'
         octavia_identity:
           admin:
-            user: octavia
+            user: ${_param:keystone_octavia_username}
             password: ${_param:keystone_octavia_password}
             project: service
             host: ${_param:keystone_service_host}
diff --git a/keystone/client/service/panko.yml b/keystone/client/service/panko.yml
index 43897be..46939ca 100644
--- a/keystone/client/service/panko.yml
+++ b/keystone/client/service/panko.yml
@@ -12,6 +12,7 @@
             service:
               user:
                 panko:
+                  name: ${_param:keystone_panko_username}
                   is_admin: true
                   password: ${_param:keystone_panko_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/radosgw-s3.yml b/keystone/client/service/radosgw-s3.yml
index bcf596f..464ffb2 100644
--- a/keystone/client/service/radosgw-s3.yml
+++ b/keystone/client/service/radosgw-s3.yml
@@ -12,6 +12,7 @@
             service:
               user:
                 swift:
+                  name: ${_param:keystone_swift_username}
                   is_admin: true
                   password: ${_param:keystone_swift_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/radosgw-swift.yml b/keystone/client/service/radosgw-swift.yml
index c8b6569..df88eb3 100644
--- a/keystone/client/service/radosgw-swift.yml
+++ b/keystone/client/service/radosgw-swift.yml
@@ -14,6 +14,7 @@
             service:
               user:
                 swift:
+                  name: ${_param:keystone_swift_username}
                   is_admin: true
                   password: ${_param:keystone_swift_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/sahara.yml b/keystone/client/service/sahara.yml
index 8d88168..2ae7e42 100644
--- a/keystone/client/service/sahara.yml
+++ b/keystone/client/service/sahara.yml
@@ -9,6 +9,7 @@
             service:
               user:
                 sahara:
+                  name: ${_param:keystone_sahara_username}
                   is_admin: true
                   password: ${_param:keystone_sahara_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/swift-s3.yml b/keystone/client/service/swift-s3.yml
index 36050a4..5df5db8 100644
--- a/keystone/client/service/swift-s3.yml
+++ b/keystone/client/service/swift-s3.yml
@@ -9,6 +9,7 @@
             service:
               user:
                 swift:
+                  name: ${_param:keystone_swift_username}
                   is_admin: true
                   password: ${_param:keystone_swift_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/swift.yml b/keystone/client/service/swift.yml
index ddcaf26..5398f40 100644
--- a/keystone/client/service/swift.yml
+++ b/keystone/client/service/swift.yml
@@ -9,6 +9,7 @@
             service:
               user:
                 swift:
+                  name: ${_param:keystone_swift_username}
                   is_admin: true
                   password: ${_param:keystone_swift_password}
                   email: ${_param:admin_email}
diff --git a/keystone/client/service/tacker.yml b/keystone/client/service/tacker.yml
index e1c7019..69fbc62 100644
--- a/keystone/client/service/tacker.yml
+++ b/keystone/client/service/tacker.yml
@@ -10,6 +10,7 @@
             service:
               user:
                 tacker:
+                  name: ${_param:keystone_tacker_username}
                   is_admin: true
                   password: ${_param:keystone_tacker_password}
                   email: ${_param:admin_email}