diff --git a/heat/meta/heka.yml b/heat/meta/heka.yml
index e5c2c8a..431b693 100644
--- a/heat/meta/heka.yml
+++ b/heat/meta/heka.yml
@@ -106,13 +106,13 @@
         function: last
   alarm:
     heat_api_check:
-      alerting: true
+      alerting: enabled
       triggers:
       - heat_api_check_failed
       dimension:
         service: heat-api-check
     heat_cfn_api_check:
-      alerting: true
+      alerting: enabled
       triggers:
       - heat_cfn_api_check_failed
       dimension:
@@ -121,6 +121,7 @@
   alarm_cluster:
     heat_logs:
       policy: highest_severity
+      alerting: enabled
       group_by: hostname
       match:
         service: heat-logs
@@ -128,8 +129,10 @@
       - heat_logs
       dimension:
         service: heat
+        nagios_host: 01-service-clusters
     heat_api_endpoint:
       policy: availability_of_members
+      alerting: enabled
       group_by: hostname
       match:
         service: heat-api-endpoint
@@ -137,8 +140,10 @@
       - heat_api_endpoint
       dimension:
         service: heat
+        nagios_host: 01-service-clusters
     heat_cfn_api_endpoint:
       policy: availability_of_members
+      alerting: enabled
       group_by: hostname
       match:
         service: heat-cfn-api-endpoint
@@ -146,24 +151,30 @@
       - heat_cfn_api_endpoint
       dimension:
         service: heat
+        nagios_host: 01-service-clusters
     heat_api_check:
       policy: highest_severity
+      alerting: enabled
       match:
         service: heat-api-check
       members:
       - heat_api_check
       dimension:
         service: heat
+        nagios_host: 01-service-clusters
     heat_cfn_api_check:
       policy: highest_severity
+      alerting: enabled
       match:
         service: heat-cfn-api-check
       members:
       - heat_cfn_api_check
       dimension:
         service: heat
+        nagios_host: 01-service-clusters
     heat:
       policy: highest_severity
+      alerting: enabled_with_notification
       match:
         service: heat
       members:
@@ -174,4 +185,5 @@
       - heat_cfn_api_check
       dimension:
         cluster_name: heat
+        nagios_host: 00-top-clusters
 {%- endif %}