diff --git a/nova/meta/heka.yml b/nova/meta/heka.yml
index 214ab54..a55b809 100644
--- a/nova/meta/heka.yml
+++ b/nova/meta/heka.yml
@@ -238,6 +238,7 @@
       - nova_fs
       dimension:
         service: nova-compute
+        nagios_host: 01-service-clusters
     nova_logs_compute:
       policy: highest_severity
       group_by: hostname
@@ -247,6 +248,7 @@
       - nova_logs_compute
       dimension:
         service: nova-compute
+        nagios_host: 01-service-clusters
     nova_logs:
       policy: highest_severity
       group_by: hostname
@@ -256,6 +258,7 @@
       - nova_logs
       dimension:
         service: nova-control
+        nagios_host: 01-service-clusters
     nova_api_endpoint:
       policy: availability_of_members
       group_by: hostname
@@ -265,6 +268,7 @@
       - nova_api_endpoint
       dimension:
         service: nova-control
+        nagios_host: 01-service-clusters
     nova_api_check:
       policy: highest_severity
       match:
@@ -273,6 +277,7 @@
       - nova_api_check
       dimension:
         service: nova-control
+        nagios_host: 01-service-clusters
     {%- for nova_service in ('cert', 'consoleauth', 'compute', 'conductor', 'scheduler') %}
     nova_{{ nova_service }}:
       policy: highest_severity
@@ -282,6 +287,7 @@
       - nova_{{ nova_service }}
       dimension:
         service: nova-control
+        nagios_host: 01-service-clusters
     {%- endfor %}
     nova_free_vcpu:
       policy: highest_severity
@@ -291,6 +297,7 @@
       - nova_free_vcpu
       dimension:
         service: nova-compute
+        nagios_host: 01-service-clusters
     nova_free_memory:
       policy: highest_severity
       match:
@@ -299,6 +306,7 @@
       - nova_free_memory
       dimension:
         service: nova-compute
+        nagios_host: 01-service-clusters
     nova_control:
       policy: highest_severity
       match:
@@ -312,6 +320,7 @@
       {%- endfor %}
       dimension:
         cluster_name: nova-control
+        nagios_host: 00-top-clusters
     nova_compute:
       policy: highest_severity
       match:
@@ -323,3 +332,4 @@
       - nova_free_memory
       dimension:
         cluster_name: nova-compute
+        nagios_host: 00-top-clusters