diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
index f9e3878..209fa2e 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
@@ -9,7 +9,7 @@
 - system.cinder.volume.backend.lvm
 - system.linux.storage.loopback
 - system.ceilometer.client.nova_compute
-- system.ceilometer.agent.cluster
+- system.ceilometer.agent.telemetry.cluster
 - system.ceilometer.agent.polling.default
 - system.linux.network.interface.single_ovs_dvr
 - cluster.virtual-mcp-pike-dvr
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml
index cf0be30..34090ce 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml
@@ -15,12 +15,12 @@
 - system.gnocchi.common.storage.incoming.redis
 - system.gnocchi.common.storage.file
 - system.gnocchi.common.coordination.redis
-- system.ceilometer.server.cluster
+- system.ceilometer.server.telemetry.cluster
 - system.ceilometer.server.coordination.redis
 - system.aodh.server.cluster
 - system.aodh.server.coordination.redis
 - system.panko.server.cluster
-- system.ceilometer.server.backend.default
+- system.ceilometer.server.backend.gnocchi
 - cluster.virtual-mcp-pike-dvr
 parameters:
   _param: