diff --git a/roles/nagios_server/files/nagios/services/disk.cfg b/roles/nagios_server/files/nagios/services/disk.cfg
index b1d8ad1b02..f425e8e953 100644
--- a/roles/nagios_server/files/nagios/services/disk.cfg
+++ b/roles/nagios_server/files/nagios/services/disk.cfg
@@ -1,6 +1,6 @@
 define service {
   hostgroup_name	virtservers
-  service_description   Disk Space /
+  service_description   Disk_Space_/
   check_command		check_by_nrpe!check_disk_/
   use                   disktemplate
 }
diff --git a/roles/nagios_server/templates/nagios/hostgroups/kvmHosts.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/kvmHosts.cfg.j2
new file mode 100644
index 0000000000..fbfbbf8bb9
--- /dev/null
+++ b/roles/nagios_server/templates/nagios/hostgroups/kvmHosts.cfg.j2
@@ -0,0 +1,11 @@
+###############
+# KVM Servers
+###############
+
+define hostgroup {
+        hostgroup_name  virtservers
+        alias           Virtual ServiceGroup
+        members         {% for host in groups['virtservers'] %} {{host}}, Disk space /, {{host}}, Total Processes, {{host}}, Check Raid, {{host}}, Swap, {{host}}, SSH,{% endif %}{% endfor %}
+
+}
+
diff --git a/roles/nagios_server/templates/nagios/servicegroups/retrace.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/retrace.cfg.j2
similarity index 79%
rename from roles/nagios_server/templates/nagios/servicegroups/retrace.cfg.j2
rename to roles/nagios_server/templates/nagios/hostgroups/retrace.cfg.j2
index 5d28486a2e..6fdf9dcd2f 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/retrace.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/retrace.cfg.j2
@@ -1,5 +1,5 @@
-define servicegroup {
-    servicegroup_name   retrace
+define hostgroup {
+    hostgroup_name   retrace
     alias               Retrace Hosts
     members         {% for host in groups['retrace'] %}{{host}}, Disk space /,{{host}},Total Processes,{{host}}, Check Raid, {{host}}, Swap, {{host}}, SSH, {% endfor %}
 
diff --git a/roles/nagios_server/templates/nagios/servicegroups/kvmHosts.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/kvmHosts.cfg.j2
deleted file mode 100644
index 173d5aaba3..0000000000
--- a/roles/nagios_server/templates/nagios/servicegroups/kvmHosts.cfg.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-###############
-# KVM Servers
-###############
-
-define hostgroup {
-        hostgroup_name  phx-virt
-        alias           PHX Virtual ServiceGroup
-        members         {% for host in groups['virtservers'] %}{% if hostvars[host].datacenter == 'phx2'%} {{host}}, Disk space /, {{host}}, Total Processes, {{host}}, Check Raid, {{host}}, Swap, {{host}}, SSH,{% endif %}{% endfor %}
-
-}
-
-define hostgroup {
-        hostgroup_name  remote-virt
-        alias           PHX Virtual ServiceGroup
-        members         {% for host in groups['virtservers'] %}{% if hostvars[host].datacenter != 'phx2'%} {{host}}, Disk space /, {{host}}, Total Processes, {{host}}, Check Raid, {{host}}, Swap, {{host}}, SSH,{% endif %}{% endfor %}
-
-}
-