diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index abf1411919..156ab32cff 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -394,6 +394,16 @@
   - nagios_config
   notify: restart nagios
 
+- name: Template over services
+  template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root
+  with_items:
+    - copr.cfg
+  when: env == "production"
+  tags:
+  - nagios_server
+  - nagios_config
+  notify: restart nagios
+
 - name: Template over services (both)
   template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root
   with_items:
diff --git a/roles/nagios_server/templates/nagios/services/copr.cfg.j2 b/roles/nagios_server/templates/nagios/services/copr.cfg.j2
new file mode 100644
index 0000000000..3c2bb96af2
--- /dev/null
+++ b/roles/nagios_server/templates/nagios/services/copr.cfg.j2
@@ -0,0 +1,23 @@
+define service {
+  hostgroup_name        copr_dist_git_aws
+  service_description   http-copr-be.aws.fedoraproject.org
+  check_command         check_https!copr-be.aws.fedoraproject.org
+  max_check_attempts    8
+  use                   websitetemplate
+}
+
+define service {
+  hostgroup_name        copr_front_aws
+  service_description   http-copr-dist-git.fedorainfracloud.org
+  check_command         check_website_ssl!copr-dist-git.fedorainfracloud.org!/cgit/!Git repository browser
+  max_check_attempts    8
+  use                   websitetemplate
+}
+
+define service {
+  hostgroup_name        copr_back_aws
+  service_description   http-copr.fedorainfracloud.org
+  check_command         check_website_ssl!copr.fedorainfracloud.org!Copr hosts
+  max_check_attempts    8
+  use                   websitetemplate
+}
\ No newline at end of file
diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
index f95bdfac6e..57148ecdf7 100644
--- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2
+++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
@@ -359,27 +359,3 @@ define service {
   max_check_attempts    8
   use                   websitetemplate
 }
-
-define service {
-  host_name             copr-dist-git.aws.fedoraproject.org
-  service_description   http-copr-be.aws.fedoraproject.org
-  check_command         check_https!copr-be.aws.fedoraproject.org
-  max_check_attempts    8
-  use                   websitetemplate
-}
-
-define service {
-  host_name             copr-fe.aws.fedoraproject.org
-  service_description   http-copr-dist-git.fedorainfracloud.org
-  check_command         check_website_ssl!copr-dist-git.fedorainfracloud.org!/cgit/!Git repository browser
-  max_check_attempts    8
-  use                   websitetemplate
-}
-
-define service {
-  host_name             copr-be.aws.fedoraproject.org
-  service_description   http-copr.fedorainfracloud.org
-  check_command         check_website_ssl!copr.fedorainfracloud.org!Copr hosts
-  max_check_attempts    8
-  use                   websitetemplate
-}