diff --git a/classes/cluster/virtual-offline-ssl/infra/config.yml b/classes/cluster/virtual-offline-ssl/infra/config.yml
index da13d9f..013ef8b 100644
--- a/classes/cluster/virtual-offline-ssl/infra/config.yml
+++ b/classes/cluster/virtual-offline-ssl/infra/config.yml
@@ -25,6 +25,8 @@
 - system.keystone.client.service.panko
 - system.keystone.client.service.gnocchi
 - system.keystone.client.service.barbican
+- system.gnocchi.client
+- system.gnocchi.client.v1.archive_policy.default
 - system.manila.client
 - system.reclass.storage.system.openstack_dns_cluster
 - system.reclass.storage.system.openstack_control_cluster
diff --git a/classes/cluster/virtual-offline-ssl/openstack/compute.yml b/classes/cluster/virtual-offline-ssl/openstack/compute.yml
index 93bf876..dc75093 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/compute.yml
@@ -8,7 +8,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
 - service.cinder.volume.single
 - system.cinder.volume.backend.lvm
@@ -35,6 +35,10 @@
     compute_hugepages_count: 2048
     compute_hugepages_mount: /mnt/hugepages_2M
     loopback_device_size: 20
+  ceilometer:
+    agent:
+      identity:
+        protocol: https
   nova:
     compute:
       vncproxy_url: http://${_param:cluster_vip_address}:6080
diff --git a/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml b/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml
index 1c36e8b..e2b5d3a 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml
@@ -16,17 +16,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-offline-ssl
 parameters:
   _param:
@@ -38,7 +37,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
@@ -152,8 +150,6 @@
       listen:
         panko_api:
           type: ~
-        ceilometer_api:
-          type: ~
         gnocchi_api:
           type: ~
         aodh-api: