diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/.env b/classes/cluster/virtual-mcp-pike-dvr-ssl/.env
index ebce5d7..d593f62 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/.env
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd logrotate auditd)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd logrotate auditd gnocchi)
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
index 985f198..34fd9b2 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
@@ -24,6 +24,8 @@
 - system.keystone.client.service.ceilometer
 - system.keystone.client.service.panko
 - system.keystone.client.service.gnocchi
+- system.gnocchi.client
+- system.gnocchi.client.v1.archive_policy.default
 - system.reclass.storage.system.openstack_dns_cluster
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.openstack_compute_multi
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
index a1a1418..13b3a19 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
@@ -9,7 +9,7 @@
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
 - 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
 - system.nova.compute.libvirt.ssl
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
index 58e8dfa..6279073 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
@@ -14,17 +14,16 @@
 - service.redis.server.single
 - system.nginx.server.single
 - system.nginx.server.proxy.openstack.aodh
-- system.nginx.server.proxy.openstack.ceilometer
 - system.gnocchi.server.cluster
 - 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-ssl
 parameters:
   _param:
@@ -36,7 +35,6 @@
     cluster_local_address: ${_param:single_address}
     nginx_proxy_openstack_api_host: ${_param:openstack_telemetry_address}
     nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
-    nginx_proxy_openstack_ceilometer_host: 127.0.0.1
     nginx_proxy_openstack_aodh_host: 127.0.0.1
     nginx_proxy_ssl:
       enabled: true
@@ -166,8 +164,6 @@
       listen:
         panko_api:
           type: ~
-        ceilometer_api:
-          type: ~
         gnocchi_api:
           type: ~
         aodh-api: