diff --git a/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg b/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg
index 3128a735ec..fd415e3a12 100644
--- a/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg
+++ b/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg
@@ -1,7 +1,7 @@
 define servicegroup {
     servicegroup_name   bodhi
     alias               Bodhi
-    members             proxy01-wildcard,bodhi,proxy02-wildcard,bodhi,proxy03-fpo,bodhi,proxy04-fpo,bodhi,proxy06-fpo,bodhi,proxy07-wildcard,bodhi,proxy08-wildcard,bodhi,proxy09-wildcard,bodhi,proxy05-fpo,bodhi,proxy10-fpo,bodhi,proxy11-fpo,bodhi,bodhi01,bodhi-internal,bodhi02,bodhi-internal
+    members             proxy01-wildcard,bodhi,proxy02-wildcard,bodhi,proxy03-fpo,bodhi,proxy04-fpo,bodhi,proxy06-fpo,bodhi,proxy07-wildcard,bodhi,proxy08-wildcard,bodhi,proxy09-wildcard,bodhi,proxy05-fpo,bodhi,proxy10-fpo,bodhi,proxy11-fpo,bodhi,bodhi03,bodhi-internal,bodhi04,bodhi-internal
 
 }
 
diff --git a/roles/nagios_server/files/nagios/services/websites.cfg b/roles/nagios_server/files/nagios/services/websites.cfg
index 1a04710460..db3235ad40 100644
--- a/roles/nagios_server/files/nagios/services/websites.cfg
+++ b/roles/nagios_server/files/nagios/services/websites.cfg
@@ -74,15 +74,15 @@ define service {
 define service {
   host_name             proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard, proxy05-fpo, proxy10-fpo, proxy11-fpo
   service_description   bodhi
-  check_command         check_website_ssl!admin.fedoraproject.org!/updates/!Latest
+  check_command         check_website_ssl!bodhi.fedoraproject.org!/updates/!Free
   max_check_attempts    8
   use                   websitetemplate
 }
 
 define service {
-  host_name             bodhi01,bodhi02
+  host_name             bodhi03,bodhi04
   service_description   bodhi-internal
-  check_command         check_website!localhost!/updates/!Latest
+  check_command         check_website!localhost!/updates/!Free
   max_check_attempts    8
   use                   internalwebsitetemplate
 }