diff --git a/metadata/service/server/cluster.yml b/metadata/service/server/cluster.yml
index 10fc2b6..05ef9b1 100644
--- a/metadata/service/server/cluster.yml
+++ b/metadata/service/server/cluster.yml
@@ -6,5 +6,36 @@
   aodh:
     server:
       enabled: true
+      version: ${_param:aodh_version}
+      cluster: true
+      ttl: 86400
+      debug: false
+      verbose: true
+      database:
+        engine: "mysql+pymysql"
+        host: ${_param:cluster_vip_address}
+        port: 3306
+        name: aodh
+        user: aodh
+        password: ${_param:mysql_aodh_password}
       bind:
-        address: 0.0.0.0
+        host: ${_param:cluster_local_address}
+        port: 8042
+      identity:
+        engine: keystone
+        host: ${_param:cluster_vip_address}
+        port: 35357
+        tenant: service
+        user: aodh
+        password: ${_param:keystone_aodh_password}
+      message_queue:
+        engine: rabbitmq
+        host: ${_param:cluster_vip_address}
+        port: 5672
+        user: openstack
+        password: ${_param:rabbitmq_openstack_password}
+        virtual_host: '/openstack'
+        # Workaround for https://bugs.launchpad.net/ceilometer/+bug/1337715
+        rpc_thread_pool_size: 5
+      notifications:
+        store_events: true
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 10fc2b6..7b5e146 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -6,5 +6,33 @@
   aodh:
     server:
       enabled: true
+      version: ${_param:aodh_version}
+      ttl: 86400
+      database:
+        engine: "mysql+pymysql"
+        host: ${_param:single_address}
+        port: 3306
+        name: aodh
+        user: aodh
+        password: ${_param:mysql_nova_password}
       bind:
-        address: 0.0.0.0
+        host: ${_param:single_address}
+        port: 8042
+      identity:
+        engine: keystone
+        host: ${_param:single_address}
+        port: 35357
+        tenant: service
+        user: aodh
+        password: ${_param:keystone_aodh_password}
+      message_queue:
+        engine: rabbit
+        host: ${_param:single_address}
+        port: 5672
+        user: openstack
+        password: ${_param:rabbitmq_openstack_password}
+        virtual_host: '/openstack'
+        # Workaround for https://bugs.launchpad.net/ceilometer/+bug/1337715
+        rpc_thread_pool_size: 5
+      notifications:
+        store_events: true
\ No newline at end of file