diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index 6bb4e71..c24adf7 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -17,7 +17,7 @@
         host: ${_param:keystone_service_host}
         port: 35357
         tenant: service
-        user: ceilometer
+        user: ${_param:keystone_ceilometer_username}
         password: ${_param:keystone_ceilometer_password}
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}
diff --git a/ceilometer/agent/single.yml b/ceilometer/agent/single.yml
index 037bb4e..0bf079f 100644
--- a/ceilometer/agent/single.yml
+++ b/ceilometer/agent/single.yml
@@ -9,6 +9,8 @@
         ssl:
           enabled: ${_param:ceilometer_agent_ssl_enabled}
       identity:
+        user: ${_param:keystone_ceilometer_username}
+        password: ${_param:keystone_ceilometer_password}
         protocol: ${_param:internal_protocol}
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
diff --git a/ceilometer/agent/telemetry/cluster.yml b/ceilometer/agent/telemetry/cluster.yml
index 26f9a68..8f9c996 100644
--- a/ceilometer/agent/telemetry/cluster.yml
+++ b/ceilometer/agent/telemetry/cluster.yml
@@ -17,7 +17,7 @@
         host: ${_param:keystone_service_host}
         port: 35357
         tenant: service
-        user: ceilometer
+        user: ${_param:keystone_ceilometer_username}
         password: ${_param:keystone_ceilometer_password}
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}