diff --git a/metadata.yaml b/metadata.yaml
index 6900041..8ff00ab 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -1,16 +1,17 @@
 name: ceilometer-agent
 subordinate: true
 summary: Subordinate charm for deploying Ceilometer compute agent
-maintainer: Yolanda Robla <yolanda.robla@canonical.com>
+maintainer: OpenStack Charmers <openstack-charmers@lists.ubuntu.com>
 description: |
- Ceilometer project aims to become the infrastructure to collect measurements 
- within OpenStack so that no two agents would need to be written to collect 
- the same data. It's primary targets are monitoring and metering, but the 
- framework should be easily expandable to collect for other needs. To that 
- effect, Ceilometer should be able to share collected data with a variety of consumers.
+ Ceilometer project aims to become the infrastructure to collect measurements
+ within OpenStack so that no two agents would need to be written to collect
+ the same data. It's primary targets are monitoring and metering, but the
+ framework should be easily expandable to collect for other needs. To that
+ effect, Ceilometer should be able to share collected data with a variety of
+ consumers.
  .
- This charm should be used in conjunction with the ceilometer and nova charm to collect
- Openstack measures.
+ This charm should be used in conjunction with the ceilometer and nova-compute
+ charms to collect OpenStack measurements.
 tags:
   - openstack
   - telemetry