diff --git a/roles/nagios_server/files/nagios/services/fedmsg.cfg b/roles/nagios_server/files/nagios/services/fedmsg.cfg
index 2c1103715e..9f7832df1b 100644
--- a/roles/nagios_server/files/nagios/services/fedmsg.cfg
+++ b/roles/nagios_server/files/nagios/services/fedmsg.cfg
@@ -89,7 +89,7 @@ define service {
 }
 
 define service {
-  host_name             anitya-frontend01.phx2.fedoraproject.org
+  hostgroup_name       anitya-frontend
   service_description   Check for fedmsg-relay proc
   check_command         check_by_nrpe!check_fedmsg_relay_proc
   use                   defaulttemplate
@@ -384,7 +384,7 @@ define service {
 }
 
 define service {
-  host_name             anitya-frontend01.phx2.fedoraproject.org
+  hostgroup_name       anitya-frontend
   service_description   Check fedmsg consumers and producers relay
   check_command         check_by_nrpe!check_fedmsg_cp_anitya_relay
   use                   defaulttemplate
@@ -496,7 +496,7 @@ define service {
 }
 
 define service {
-  host_name             anitya-frontend01.phx2.fedoraproject.org
+  hostgroup_name       anitya-frontend
   service_description   Check fedmsg-relay consumers exceptions
   check_command         check_by_nrpe!check_fedmsg_cexceptions_anitya_relay
   use                   defaulttemplate
@@ -618,7 +618,7 @@ define service {
 }
 
 define service {
-  host_name             anitya-frontend01.phx2.fedoraproject.org
+  hostgroup_name       anitya-frontend
   service_description   Check fedmsg-relay consumers backlog
   check_command         check_by_nrpe!check_fedmsg_cbacklog_anitya_relay
   use                   defaulttemplate
diff --git a/roles/nagios_server/files/nagios/services/mail_queue.cfg b/roles/nagios_server/files/nagios/services/mail_queue.cfg
index 58e9c5750f..85f79f19b9 100644
--- a/roles/nagios_server/files/nagios/services/mail_queue.cfg
+++ b/roles/nagios_server/files/nagios/services/mail_queue.cfg
@@ -1,7 +1,7 @@
-define service {
-  hostgroup            nomail
-  service_description   mail_queue
-  check_command         check_by_nrpe!check_postfix_queue
-  max_check_attempts    7
-  use                   defaulttemplate
-}
+#define service {
+#  hostgroup            nomail
+#  service_description   mail_queue
+#  check_command         check_by_nrpe!check_postfix_queue
+#  max_check_attempts    7
+#  use                   defaulttemplate
+#}