diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml
index c42ea46cca..305c239dda 100644
--- a/ceilometer/values.yaml
+++ b/ceilometer/values.yaml
@@ -1779,7 +1779,7 @@ endpoints:
       test:
         role: admin
         region_name: RegionOne
-        username: test
+        username: ceilometer-test
         password: password
         project_name: test
         user_domain_name: service
diff --git a/cinder/values.yaml b/cinder/values.yaml
index ff571fa063..1553e9f75c 100644
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -1169,7 +1169,7 @@ endpoints:
       test:
         role: admin
         region_name: RegionOne
-        username: test
+        username: cinder-test
         password: password
         project_name: test
         user_domain_name: service
diff --git a/glance/values.yaml b/glance/values.yaml
index 2f2496bbe9..aa7be8f9e0 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -632,7 +632,7 @@ endpoints:
       test:
         role: admin
         region_name: RegionOne
-        username: test
+        username: glance-test
         password: password
         project_name: test
         user_domain_name: service
diff --git a/heat/values.yaml b/heat/values.yaml
index dc0c82100b..f1a8e08844 100644
--- a/heat/values.yaml
+++ b/heat/values.yaml
@@ -846,7 +846,7 @@ endpoints:
       test:
         role: admin
         region_name: RegionOne
-        username: test
+        username: heat-test
         password: password
         project_name: test
         user_domain_name: service
diff --git a/keystone/values.yaml b/keystone/values.yaml
index e624ebb387..7423ada229 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -1152,7 +1152,7 @@ endpoints:
       test:
         role: admin
         region_name: RegionOne
-        username: test
+        username: keystone-test
         password: password
         project_name: test
         user_domain_name: default
diff --git a/mistral/values.yaml b/mistral/values.yaml
index c5367e8c9b..2c83697b0f 100644
--- a/mistral/values.yaml
+++ b/mistral/values.yaml
@@ -230,7 +230,7 @@ endpoints:
       test:
         role: admin
         region_name: RegionOne
-        username: test
+        username: mistral-test
         password: password
         project_name: test
         user_domain_name: service
diff --git a/neutron/values.yaml b/neutron/values.yaml
index 6437208db1..fcbdee47b4 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -1839,7 +1839,7 @@ endpoints:
       test:
         role: admin
         region_name: RegionOne
-        username: test
+        username: neutron-test
         password: password
         project_name: test
         user_domain_name: service
diff --git a/nova/values.yaml b/nova/values.yaml
index 2ae52a61cb..b6f701f859 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -1925,7 +1925,7 @@ endpoints:
       test:
         role: admin
         region_name: RegionOne
-        username: test
+        username: nova-test
         password: password
         project_name: test
         user_domain_name: service
diff --git a/senlin/values.yaml b/senlin/values.yaml
index ecf0f69855..ecf3736fa4 100644
--- a/senlin/values.yaml
+++ b/senlin/values.yaml
@@ -397,7 +397,7 @@ endpoints:
       test:
         role: admin
         region_name: RegionOne
-        username: test
+        username: senlin-test
         password: password
         project_name: test
         user_domain_name: service