diff --git a/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-503.j2 b/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-503.j2
index 4208141..92b6822 100644
--- a/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-503.j2
+++ b/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-503.j2
@@ -1,10 +1,10 @@
 {% if SANDBOX_USERNAME is defined %}
-{% set server_name = SANDBOX_USERNAME %}
+{% set server_name = SANDBOX_USERNAME + '-nginx-503' %}
 {% else %}
-{% set server_name = COMMON_ENVIRONMENT|default('unknown-env') + '-' + COMMON_DEPLOYMENT|default('unknown-deployment') + '-HOSTNAME' %}
+{% set server_name = COMMON_ENVIRONMENT|default('unknown-env') + '-' + COMMON_DEPLOYMENT|default('unknown-deployment') + '-nginx-503' + '-HOSTNAME' %}
 {% endif %}
 
-  {{ server_name }}-nginx-503:
+  {{ server_name }}:
     # Full path to the the log file
     log_path: {{ nginx_log_dir|default('/edx/var/log/nginx') }}/error.log
     # Returns the number of matches for this term. Use Linux Regex formatting.
diff --git a/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-certs-errors.j2 b/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-certs-errors.j2
index cec3ca4..6fdb9ac 100644
--- a/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-certs-errors.j2
+++ b/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-certs-errors.j2
@@ -1,10 +1,10 @@
 {% if SANDBOX_USERNAME is defined %}
-{% set server_name = SANDBOX_USERNAME %}
+{% set server_name = SANDBOX_USERNAME + '-certs-errors' %}
 {% else %}
-{% set server_name = COMMON_ENVIRONMENT|default('unknown-env') + '-' + COMMON_DEPLOYMENT|default('unknown-deployment') + '-HOSTNAME'%}
+{% set server_name = COMMON_ENVIRONMENT|default('unknown-env') + '-' + COMMON_DEPLOYMENT|default('unknown-deployment') + '-certs-errors' + '-HOSTNAME'%}
 {% endif %}
 
-  {{ server_name }}-certs-errors:
+  {{ server_name }}:
     # Full path to the the log file
     log_path: {{ COMMON_LOG_DIR|default('/edx/var/log') }}/certs/edx.log
     # Returns the number of matches for this term. Use Linux Regex formatting.
diff --git a/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-cms-errors.j2 b/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-cms-errors.j2
index 4e9139d..5427139 100644
--- a/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-cms-errors.j2
+++ b/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-cms-errors.j2
@@ -1,10 +1,10 @@
 {% if SANDBOX_USERNAME is defined %}
-{% set server_name = SANDBOX_USERNAME %}
+{% set server_name = SANDBOX_USERNAME + '-cms-errors' %}
 {% else %}
-{% set server_name = COMMON_ENVIRONMENT|default('unknown-env') + '-' + COMMON_DEPLOYMENT|default('unknown-deployment') + '-HOSTNAME' %}
+{% set server_name = COMMON_ENVIRONMENT|default('unknown-env') + '-' + COMMON_DEPLOYMENT|default('unknown-deployment') + '-cms-errors' + '-HOSTNAME' %}
 {% endif %}
 
-  {{ server_name }}-cms-errors:
+  {{ server_name }}:
     # Full path to the the log file
     log_path: {{ COMMON_LOG_DIR|default('/edx/var/log') }}/cms/edx.log
     # Returns the number of matches for this term. Use Linux Regex formatting.
diff --git a/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-lms-errors.j2 b/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-lms-errors.j2
index 38ee8d4..5c01535 100644
--- a/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-lms-errors.j2
+++ b/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-lms-errors.j2
@@ -1,10 +1,10 @@
 {% if SANDBOX_USERNAME is defined %}
-{% set server_name = SANDBOX_USERNAME %}
+{% set server_name = SANDBOX_USERNAME + '-lms-errors' %}
 {% else %}
-{% set server_name = COMMON_ENVIRONMENT|default('unknown-env') + '-' + COMMON_DEPLOYMENT|default('unknown-deployment') + '-HOSTNAME' %}
+{% set server_name = COMMON_ENVIRONMENT|default('unknown-env') + '-' + COMMON_DEPLOYMENT|default('unknown-deployment') + '-lms-errors' + '-HOSTNAME' %}
 {% endif %}
 
-  {{ server_name }}-lms-errors:
+  {{ server_name }}:
     # Full path to the the log file
     log_path: {{ COMMON_LOG_DIR|default('/edx/var/log') }}/lms/edx.log
     # Returns the number of matches for this term. Use Linux Regex formatting.
diff --git a/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-xqueue-errors.j2 b/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-xqueue-errors.j2
index 2414681..8e5165f 100644
--- a/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-xqueue-errors.j2
+++ b/playbooks/roles/newrelic/templates/opt/newrelic_platform_plugins/newrelic_logwatcher_agent/config/logwatch-xqueue-errors.j2
@@ -1,10 +1,10 @@
 {% if SANDBOX_USERNAME is defined %}
-{% set server_name = SANDBOX_USERNAME %}
+{% set server_name = SANDBOX_USERNAME + '-xqueue-errors' %}
 {% else %}
-{% set server_name = COMMON_ENVIRONMENT|default('unknown-env') + '-' + COMMON_DEPLOYMENT|default('unknown-deployment') + '-HOSTNAME' %}
+{% set server_name = COMMON_ENVIRONMENT|default('unknown-env') + '-' + COMMON_DEPLOYMENT|default('unknown-deployment') + '-xqueue-errors' + '-HOSTNAME' %}
 {% endif %}
 
-  {{ server_name }}-xqueue-errors:
+  {{ server_name }}:
     # Full path to the the log file
     log_path: {{ COMMON_LOG_DIR|default('/edx/var/log') }}/xqueue/edx.log
     # Returns the number of matches for this term. Use Linux Regex formatting.