diff --git a/environments/metrics/ceilometer-write-qdr.yaml b/environments/metrics/ceilometer-write-qdr.yaml
index 4df3059241..1f3e6b4aa7 100644
--- a/environments/metrics/ceilometer-write-qdr.yaml
+++ b/environments/metrics/ceilometer-write-qdr.yaml
@@ -6,6 +6,7 @@ resource_registry:
   OS::TripleO::Services::CeilometerAgentNotification: ../../docker/services/ceilometer-agent-notification.yaml
   OS::TripleO::Services::CeilometerAgentIpmi: ../../docker/services/ceilometer-agent-ipmi.yaml
   OS::TripleO::Services::ComputeCeilometerAgent: ../../docker/services/ceilometer-agent-compute.yaml
+  OS::TripleO::Services::Redis: ../../docker/services/database/redis.yaml
 
 parameter_defaults:
   CeilometerEnablePanko: false
diff --git a/puppet/services/ceilometer-agent-notification.yaml b/puppet/services/ceilometer-agent-notification.yaml
index 793faa94b1..7a8db287d9 100644
--- a/puppet/services/ceilometer-agent-notification.yaml
+++ b/puppet/services/ceilometer-agent-notification.yaml
@@ -55,13 +55,13 @@ parameters:
   CeilometerQdrEventsConfig:
     default:
       driver: amqp
-      topic: ceilometer/event.sample
+      topic: event
     description: Configuration for notifier publisher for events.
     type: json
   CeilometerQdrMetricsConfig:
     default:
       driver: amqp
-      topic: ceilometer/metering.sample
+      topic: metering
     description: Configuration for notifier publisher for metrics.
     type: json
   ManageEventPipeline: