diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 7613b71..e2b57ef 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -315,6 +315,16 @@
     if (salt.testTarget(master, 'I@barbican:client')) {
         salt.enforceState(master, 'I@barbican:client', 'barbican.client', true)
     }
+
+    // Install ceilometer server
+    if (salt.testTarget(master, 'I@ceilometer:server')) {
+        salt.enforceState(master, 'I@ceilometer:server', 'ceilometer', true)
+    }
+
+    // Install aodh server
+    if (salt.testTarget(master, 'I@aodh:server')) {
+        salt.enforceState(master, 'I@aodh:server', 'aodh', true)
+    }
 }
 
 
@@ -599,6 +609,12 @@
 
     salt.enforceState(master, 'I@heka:log_collector', 'heka.log_collector')
 
+    // Install heka ceilometer collector
+    if (salt.testTarget(master, 'I@heka:ceilometer_collector:enabled')) {
+        salt.enforceState(master, 'I@heka:ceilometer_collector:enabled', 'heka.ceilometer_collector', true)
+        salt.runSaltProcessStep(master, 'I@heka:ceilometer_collector:enabled', 'service.restart', ['ceilometer_collector'], null, true)
+    }
+
     // Install galera
     if (common.checkContains('STACK_INSTALL', 'k8s')) {
         withEnv(['ASK_ON_ERROR=false']){