diff --git a/heka/_common.sls b/heka/_common.sls
index 0da7736..2e7205d 100644
--- a/heka/_common.sls
+++ b/heka/_common.sls
@@ -8,6 +8,15 @@
   file.recurse:
   - source: salt://heka/files/lua
 
+/usr/share/lma_collector/common/extra_fields.lua:
+  file.managed:
+  - source: salt://heka/files/extra_fields.lua
+  - user: root
+  - mode: 644
+  - defaults:
+      extra_fields: {{ server.extra_fields }}
+  - template: jinja
+
 heka_user:
   user.present:
   - name: heka
diff --git a/heka/files/lua/common/extra_fields.lua b/heka/files/extra_fields.lua
similarity index 82%
rename from heka/files/lua/common/extra_fields.lua
rename to heka/files/extra_fields.lua
index d75fdc7..e56d509 100644
--- a/heka/files/lua/common/extra_fields.lua
+++ b/heka/files/extra_fields.lua
@@ -15,6 +15,10 @@
 setfenv(1, M) -- Remove external access to contain everything in the module
 
 -- list of fields that are added to Heka messages by the collector
-tags = {}
+tags = {
+{%- for key, value in extra_fields.iteritems() %}
+  ['{{ key | replace ("'", "\\'") }}'] = '{{ value | replace ("'", "\\'") }}',
+{%- endfor %}
+}
 
 return M
diff --git a/heka/map.jinja b/heka/map.jinja
index c4e3848..6f9f0b9 100644
--- a/heka/map.jinja
+++ b/heka/map.jinja
@@ -14,6 +14,8 @@
   splitter: {}
   encoder: {}
   decoder: {}
+  extra_fields:
+    environment_label: {{ grains.domain }}
 RedHat:
   groups:
   - adm