diff --git a/nagios/server/init.yml b/nagios/server/init.yml
index 49f4943..e495915 100644
--- a/nagios/server/init.yml
+++ b/nagios/server/init.yml
@@ -36,6 +36,10 @@
         smtp:
           host: ${_param:nagios_notification_smtp_server}
           from: ${_param:nagios_notification_from}
+          service_subject: >-
+                ** $NOTIFICATIONTYPE$ Env:$_HOSTENV$ Service: $HOSTDISPLAYNAME$/$SERVICEDESC$ is $SERVICESTATE$ **
+          host_subject: >-
+                ** $NOTIFICATIONTYPE$ Env:$_HOSTENV$ Host: $HOSTDISPLAYNAME$ is $HOSTSTATE$ **
       dynamic:
         enabled: true
         grain_hostname: 'host'
@@ -110,6 +114,7 @@
             notification_period: 24x7
             notification_options: d,u,r
             contact_groups: Operator
+            _env: ${_param:stacklight_environment}
             register: 0
         services:
           generic_service_tpl: