diff --git a/roles/nagios_server/files/nagios/services/smtp-mm.cfg b/roles/nagios_server/files/nagios/services/smtp-mm.cfg
index 4935b27f89..69978a1475 100644
--- a/roles/nagios_server/files/nagios/services/smtp-mm.cfg
+++ b/roles/nagios_server/files/nagios/services/smtp-mm.cfg
@@ -1,5 +1,5 @@
 define service {
-  hostgroup_name		smtp-mm
+  hostgroup_name		smtp_mm
   service_description		smtp-mm
   check_command			check_smtp
   use				defaulttemplate
diff --git a/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2
index bce9967c24..9a284fa0af 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2
@@ -6,7 +6,7 @@ define hostgroup {
 }
 
 define hostgroup {
-        hostgroup_name  smtp-mm
+        hostgroup_name  smtp_mm
         alias           SMTP MailMan Servers
         members         {% for host in groups["smtp_mm"]|sort %} {{ hostvars[host]["inventory_hostname_short"] }}.fedoraproject.org {% if not loop.last %}, {% endif %} {% endfor %}