diff --git a/roles/nagios_server/files/nagios-external/services/websites.cfg b/roles/nagios_server/files/nagios-external/services/websites.cfg
index 3ae9bb1b17..999fed460e 100644
--- a/roles/nagios_server/files/nagios-external/services/websites.cfg
+++ b/roles/nagios_server/files/nagios-external/services/websites.cfg
@@ -145,7 +145,7 @@ define service {
 define service {
   host_name             209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, proxy09.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica
   service_description   mirrors.fedoraproject.org - publiclist
-  check_command         check_website_ssl!admin.fedoraproject.org!/mirrormanager/api/mirroradmins/?name=dl.fedoraproject.org!admins
+  check_command         check_website_publiclist_ssl!admin.fedoraproject.org!/mirrormanager/api/mirroradmins/?name=dl.fedoraproject.org!admins
   use                   websitetemplate
 }
 
diff --git a/roles/nagios_server/files/nagios/services/websites.cfg b/roles/nagios_server/files/nagios/services/websites.cfg
index df2bb014a5..359da9fc23 100644
--- a/roles/nagios_server/files/nagios/services/websites.cfg
+++ b/roles/nagios_server/files/nagios/services/websites.cfg
@@ -46,7 +46,7 @@ define service {
 define service {
   host_name             mm-frontend01,mm-frontend02,mm-frontend01.stg
   service_description   mm-publiclist-internal
-  check_command         check_website!localhost!/mirrormanager/api/mirroradmins/?name=dl.fedoraproject.org
+  check_command         check_website_publiclist!localhost!/mirrormanager/api/mirroradmins/?name=dl.fedoraproject.org
   use                   internalwebsitetemplate
 }
 
diff --git a/roles/nagios_server/templates/nagios-external/checkcommands.cfg b/roles/nagios_server/templates/nagios-external/checkcommands.cfg
index 3c1def8d9e..a01ebe4465 100644
--- a/roles/nagios_server/templates/nagios-external/checkcommands.cfg
+++ b/roles/nagios_server/templates/nagios-external/checkcommands.cfg
@@ -64,6 +64,12 @@ define command{
         command_line    $USER1$/check_pgsql -H $HOSTADDRESS$ -d $ARG1$ -p '{{nagios_db_user_password}}' --logname 'nagiosuser'
 }
 
+# 'check_website_publiclist' command definition
+define command{
+        command_name    check_website_publiclist
+        command_line    $USER1$/check_http -w 40 -c 60 -I $HOSTADDRESS$ -H $ARG1$ -u "$ARG2$" -s "$ARG3$"
+}
+
 # 'check_website' command definition
 define command{
         command_name    check_website
@@ -75,6 +81,11 @@ define command{
         command_line    $USER1$/check_http -w 18 -c 28 --ssl -I $HOSTADDRESS$ -H $ARG1$ -u $ARG2$ -s "$ARG3$"
 }
 
+define command{
+        command_name    check_website_publiclist_ssl
+        command_line    $USER1$/check_http -w 40 -c 60 --ssl -I $HOSTADDRESS$ -H $ARG1$ -u $ARG2$ -s "$ARG3$"
+}
+
 define command{
         command_name    check_remote_website
         command_line    $USER1$/check_http -w 18 -c 28 -H $ARG1$ -u "$ARG2$" -s "$ARG3$"
diff --git a/roles/nagios_server/templates/nagios/checkcommands.cfg b/roles/nagios_server/templates/nagios/checkcommands.cfg
index e604f8e5c8..63fdafcb88 100644
--- a/roles/nagios_server/templates/nagios/checkcommands.cfg
+++ b/roles/nagios_server/templates/nagios/checkcommands.cfg
@@ -85,6 +85,12 @@ define command{
 	command_line	$USER1$/check_pgsql -H $HOSTADDRESS$ -d $ARG1$ -p '{{nagios_db_user_password}}' --logname 'nagiosuser'
 }
 
+# 'check_website_publiclist' command definition
+define command{
+        command_name    check_website_publiclist
+        command_line    $USER1$/check_http -w 60 -c 80 -I $HOSTADDRESS$ -H $ARG1$ -u "$ARG2$" -s "$ARG3$"
+}
+
 # 'check_website' command definition
 define command{
         command_name    check_website