diff --git a/roles/nagios_server/files/nagios/services/copr.cfg b/roles/nagios_server/files/nagios/services/copr.cfg
index 2f1f09824b..0ee275050e 100644
--- a/roles/nagios_server/files/nagios/services/copr.cfg
+++ b/roles/nagios_server/files/nagios/services/copr.cfg
@@ -1,5 +1,5 @@
 define service {
-    hostgroup_name         copr-back
+    hostgroup_name         copr_back
     service_description    Check Copr backend consecutive build failures
     check_command          check_by_nrpe!check_copr_backend_failed
     use                    defaulttemplate
diff --git a/roles/nagios_server/files/nagios/services/disk.cfg b/roles/nagios_server/files/nagios/services/disk.cfg
index 7475dbe061..4f80fc6995 100644
--- a/roles/nagios_server/files/nagios/services/disk.cfg
+++ b/roles/nagios_server/files/nagios/services/disk.cfg
@@ -83,7 +83,7 @@ define service {
 }
 
 define service {
-  hostgroup_name        moby-registry
+  hostgroup_name        moby_registry
   service_description   Disk space /var/lib/registry
   check_command         check_by_nrpe!check_disk_/var/lib/registry
   use                   disktemplate