diff --git a/heka/aggregator/cluster.yml b/heka/aggregator/cluster.yml
index e2ee129..455dbb1 100644
--- a/heka/aggregator/cluster.yml
+++ b/heka/aggregator/cluster.yml
@@ -1,5 +1,6 @@
 classes:
 - service.heka.aggregator.cluster
+- system.heka.server
 parameters:
   _param:
     nagios_default_host_alarm_clusters: 00-clusters
diff --git a/heka/aggregator/single.yml b/heka/aggregator/single.yml
index c252bd6..4b1c71f 100644
--- a/heka/aggregator/single.yml
+++ b/heka/aggregator/single.yml
@@ -1,5 +1,6 @@
 classes:
 - service.heka.aggregator.single
+- system.heka.server
 parameters:
   _param:
     nagios_default_host_alarm_clusters: 00-clusters
diff --git a/heka/log_collector/single.yml b/heka/log_collector/single.yml
index 73463e4..c8eb86d 100644
--- a/heka/log_collector/single.yml
+++ b/heka/log_collector/single.yml
@@ -1,5 +1,6 @@
 classes:
 - service.heka.log_collector.single
+- system.heka.server
 parameters:
   heka:
     log_collector:
diff --git a/heka/metric_collector/single.yml b/heka/metric_collector/single.yml
index 960d271..443a4e9 100644
--- a/heka/metric_collector/single.yml
+++ b/heka/metric_collector/single.yml
@@ -1,5 +1,6 @@
 classes:
 - service.heka.metric_collector.single
+- system.heka.server
 parameters:
   heka:
     metric_collector:
diff --git a/heka/remote_collector/cluster.yml b/heka/remote_collector/cluster.yml
index 13dffe0..3da60c1 100644
--- a/heka/remote_collector/cluster.yml
+++ b/heka/remote_collector/cluster.yml
@@ -1,5 +1,6 @@
 classes:
 - service.heka.remote_collector.cluster
+- system.heka.server
 parameters:
   heka:
     remote_collector:
diff --git a/heka/remote_collector/single.yml b/heka/remote_collector/single.yml
index 7f8037c..9511fd6 100644
--- a/heka/remote_collector/single.yml
+++ b/heka/remote_collector/single.yml
@@ -1,5 +1,6 @@
 classes:
 - service.heka.remote_collector.single
+- system.heka.server
 parameters:
   heka:
     remote_collector:
diff --git a/heka/server.yml b/heka/server.yml
new file mode 100644
index 0000000..5141e40
--- /dev/null
+++ b/heka/server.yml
@@ -0,0 +1,8 @@
+parameters:
+  _param:
+    stacklight_environment: ${_param:cluster_domain}
+  heka:
+    server:
+      extra_fields:
+        environment_label: ${_param:stacklight_environment}
+
diff --git a/nagios/server/init.yml b/nagios/server/init.yml
index b5fea3b..da4dcc4 100644
--- a/nagios/server/init.yml
+++ b/nagios/server/init.yml
@@ -3,6 +3,7 @@
     nagios_notification_email: root@localhost
     nagios_host_dimension_key: nagios_host
     nagios_default_host_alarm_clusters: 00-clusters
+    stacklight_environment: ${_param:cluster_domain}
   nagios :
     server:
       enabled: true
@@ -39,6 +40,7 @@
       dynamic:
         enabled: true
         grain_hostname: 'host'
+        hostname_suffix: ${_param:stacklight_environment}
         hostgroups:
           - target: '*'
             name: All