diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
index 18c3613e0b..dd66a1e344 100644
--- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2
+++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
@@ -72,6 +72,14 @@ define service {
   use                   websitetemplate
 }
 
+define service {
+  hostgroup_name        proxies
+  service_description   http-koschei
+  check_command         check_website_ssl!koschei.fedoraproject.org!/!Package summary
+  max_check_attempts    8
+  use                   websitetemplate
+}
+
 define service {
   hostgroup_name        proxies
   service_description   http-moby-registry
@@ -235,14 +243,6 @@ define service {
   event_handler         restart_httpd
 }
 
-define service {
-  hostgroup_name        koschei_web
-  service_description   http-koschei-internal
-  check_command         check_website!localhost!/koschei/!Package summary
-  max_check_attempts    8
-  use                   internalwebsitetemplate
-}
-
 define service {
   host_name             mailman01.phx2.fedoraproject.org
   service_description   http-mailman01.phx2.fedoraproject.org-internal