diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 615fc1a4f6..e177d8e1b8 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -203,7 +203,6 @@
     - templates.cfg
     - unbound.cfg
     - vpnclients.cfg
-    - websites.cfg
   tags:
   - nagios-config
   - nagios_server
@@ -295,7 +294,7 @@
   tags:
   - nagios_server
 
-- name: Template over services
+- name: Template over services (internal)
   template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root
   with_items:
     - phx2-mgmt.cfg
@@ -304,6 +303,16 @@
   tags:
   - nagios_server
 
+- name: Template over services (both)
+  template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root
+  with_items:
+    - websites.cfg
+  when: env == "production"
+  tags:
+  - nagios_server
+
+
+
 - name: Build out nagios host templates (production)
   template: src=nagios/hosts/{{item}}.j2 dest=/etc/nagios/hosts/{{item}} mode=0644 owner=root group=root
   with_items:
diff --git a/roles/nagios_server/files/nagios/services/websites.cfg b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
similarity index 99%
rename from roles/nagios_server/files/nagios/services/websites.cfg
rename to roles/nagios_server/templates/nagios/services/websites.cfg.j2
index fcd94e6598..ab137a75bf 100644
--- a/roles/nagios_server/files/nagios/services/websites.cfg
+++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
@@ -65,6 +65,33 @@ define service {
   use                   websitetemplate
 }
 
+define service {
+  hostgroup_name        proxies
+  service_description   http-moby-registry
+  check_command         check_website_ssl!registry.fedoraproject.org!/v2/!{}
+  max_check_attempts    8
+  use                   websitetemplate
+}
+
+
+##
+## Individual hosts
+
+define service {
+  host_name             status-fedora2
+  service_description   http-status.fedoraproject.org
+  check_command         check_website!status-fedora2.rhcloud.com!/index.html!All systems go
+  use                   websitetemplate
+}
+
+define service {
+  host_name             magazine2.fedorainfracloud.org
+  service_description   http-magazine
+  use                   websitetemplate
+  check_command         check_website!magazine2.fedorainfracloud.org!/
+}
+
+{% if vars['nagios_location'] == 'internal' %}
 ##
 ## Other Frontend Websites 
 
@@ -138,15 +165,6 @@ define service {
   use                   internalwebsitetemplate
 }
 
-define service {
-  hostgroup_name        proxies
-  service_description   http-moby-registry
-  check_command         check_website_ssl!registry.fedoraproject.org!/v2/!{}
-  max_check_attempts    8
-  use                   websitetemplate
-}
-
-
 define service {
   hostgroup_name        fas
   service_description   http-accounts
@@ -190,13 +208,6 @@ define service {
 }
 
 
-define service {
-  hostgroup_name        koji
-  service_description   http-koji
-  check_command         check_website!koji.fedoraproject.org!/koji/hosts!fedoraproject.org
-  use                   websitetemplate
-}
-
 define service {
   hostgroup_name        mm-frontend
   service_description   http-mm-publiclist-internal
@@ -270,6 +281,8 @@ define service {
   #event_handler         restart_httpd
 }
 
+## Internal services 
+
 define service {
   hostgroup_name        value
   service_description   http-møte
@@ -277,10 +290,12 @@ define service {
   use                   websitetemplate
 }
 
-
-
-##
-## Individual hosts
+define service {
+  hostgroup_name        koji
+  service_description   http-koji
+  check_command         check_website!koji.fedoraproject.org!/koji/hosts!fedoraproject.org
+  use                   websitetemplate
+}
 
 define service {
   hostgroup_name        koji
@@ -289,16 +304,4 @@ define service {
   use                   ppc-secondarytemplate
 }
 
-define service {
-  host_name             status-fedora2
-  service_description   http-status.fedoraproject.org
-  check_command         check_website!status-fedora2.rhcloud.com!/index.html!All systems go
-  use                   websitetemplate
-}
-
-define service {
-  host_name             magazine2.fedorainfracloud.org
-  service_description   http-magazine
-  use                   websitetemplate
-  check_command         check_website!magazine2.fedorainfracloud.org!/
-}
+{% endif %}