diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml b/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
index ba57a98..54e04c7 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
@@ -5,7 +5,6 @@
 - system.linux.system.repo.saltstack.xenial
 - system.nova.compute.cluster
 - system.opencontrail.compute.cluster
-- system.heka.alarm.openstack_compute
 - system.opencontrail.client.cluster
 - system.opencontrail.client.resource.virtual_router
 - service.opencontrail.compute.cluster
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
index a93e1eb..421c1a7 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
@@ -12,6 +12,7 @@
 - system.keystone.server.cluster
 - system.glusterfs.server.volume.glance
 - system.glusterfs.server.volume.keystone
+- system.glusterfs.server.volume.prometheus
 - system.glusterfs.server.cluster
 - system.glusterfs.client.cluster
 - system.glusterfs.client.volume.glance
@@ -22,9 +23,7 @@
 - system.cinder.control.cluster
 - system.heat.server.cluster
 - system.ceilometer.server.cluster
-- system.ceilometer.server.backend.influxdb
 - system.aodh.server.cluster
-- system.heka.ceilometer_collector.single
 - system.galera.server.cluster
 - system.galera.server.database.aodh
 - system.galera.server.database.ceilometer
@@ -34,7 +33,6 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
-- system.heka.alarm.openstack_control
 - cluster.virtual-mcp11-contrail
 parameters:
   _param: