diff --git a/roles/nagios_server/files/nagios/hosts/db04.cfg b/roles/nagios_server/files/nagios/hosts/db04.cfg
index 93b2c54512..0bc9ded4d4 100644
--- a/roles/nagios_server/files/nagios/hosts/db04.cfg
+++ b/roles/nagios_server/files/nagios/hosts/db04.cfg
@@ -3,5 +3,5 @@ define host {
   alias                        db04.phx2.fedoraproject.org
   use                          defaulttemplate
   address                      db04.phx2.fedoraproject.org
-  parents		       bvirthost01
+  parents		       bvirthost11
 }
diff --git a/roles/nagios_server/files/nagios/hosts/dhcp01.cfg b/roles/nagios_server/files/nagios/hosts/dhcp01.cfg
index 6f4f4331ab..3b11b1d403 100644
--- a/roles/nagios_server/files/nagios/hosts/dhcp01.cfg
+++ b/roles/nagios_server/files/nagios/hosts/dhcp01.cfg
@@ -3,5 +3,5 @@ define host {
   alias                        dhcp01.phx2.fedoraproject.org
   use                          defaulttemplate
   address                      dhcp01.phx2.fedoraproject.org
-  parents                      bvirthost05
+  parents                      bvirthost09
 }
diff --git a/roles/nagios_server/files/nagios/hosts/fas02.cfg b/roles/nagios_server/files/nagios/hosts/fas02.cfg
index 06defe7355..7af155fd12 100644
--- a/roles/nagios_server/files/nagios/hosts/fas02.cfg
+++ b/roles/nagios_server/files/nagios/hosts/fas02.cfg
@@ -3,5 +3,5 @@ define host {
   alias                        fas02.phx2.fedoraproject.org
   use                          defaulttemplate
   address                      fas02.phx2.fedoraproject.org
-  parents                      virthost02
+  parents                      virthost01
 }
diff --git a/roles/nagios_server/files/nagios/hosts/koji03.cfg b/roles/nagios_server/files/nagios/hosts/koji03.cfg
index 35b85cc070..295b3c6d7b 100644
--- a/roles/nagios_server/files/nagios/hosts/koji03.cfg
+++ b/roles/nagios_server/files/nagios/hosts/koji03.cfg
@@ -3,5 +3,5 @@ define host {
   alias                        koji03.phx2.fedoraproject.org
   use                          defaulttemplate
   address                      koji03.phx2.fedoraproject.org
-  parents                      bvirthost05
+  parents                      bvirthost11
 }
diff --git a/roles/nagios_server/files/nagios/hosts/log02.cfg b/roles/nagios_server/files/nagios/hosts/log02.cfg
index 3f9b02f648..6aaeac8c9d 100644
--- a/roles/nagios_server/files/nagios/hosts/log02.cfg
+++ b/roles/nagios_server/files/nagios/hosts/log02.cfg
@@ -1,7 +1,7 @@
-define host {
-  host_name                    log02
-  alias                        log02.phx2.fedoraproject.org
-  use                          defaulttemplate
-  address                      log02.phx2.fedoraproject.org
-  parents                      virthost02
-}
+#define host {
+#  host_name                    log02
+#  alias                        log02.phx2.fedoraproject.org
+#  use                          defaulttemplate
+#  address                      log02.phx2.fedoraproject.org
+#  parents                      virthost02
+#}
diff --git a/roles/nagios_server/files/nagios/hosts/noc01.cfg b/roles/nagios_server/files/nagios/hosts/noc01.cfg
index e8208e6631..188b792049 100644
--- a/roles/nagios_server/files/nagios/hosts/noc01.cfg
+++ b/roles/nagios_server/files/nagios/hosts/noc01.cfg
@@ -3,5 +3,5 @@ define host {
   alias                        noc01.phx2.fedoraproject.org
   use                          defaulttemplate
   address                      127.0.0.1
-  parents                      virthost02
+  parents                      virthost17
 }
diff --git a/roles/nagios_server/files/nagios/hosts/relepel01.cfg b/roles/nagios_server/files/nagios/hosts/relepel01.cfg
index 226f258437..70cb568031 100644
--- a/roles/nagios_server/files/nagios/hosts/relepel01.cfg
+++ b/roles/nagios_server/files/nagios/hosts/relepel01.cfg
@@ -3,5 +3,5 @@ define host {
   alias                        relepel01.phx2.fedoraproject.org
   use                          defaulttemplate
   address                      relepel01.phx2.fedoraproject.org
-  parents		       bvirthost05
+  parents		       bvirthost07
 }
diff --git a/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg b/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg
index 419db4c4a9..eac7b00076 100644
--- a/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg
+++ b/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg
@@ -88,15 +88,6 @@ define servicedependency {
         execution_failure_criteria      w,c
 }
 
-define servicedependency {
-        host_name                      	bvirthost05
-        service_description            	nrpe 
-        dependent_host_name           	bvirthost05
-        dependent_service_description 	 Check Raid, Cron Daemon, Disk Space /, Swap, Total Processes, Zombie Processes
-        notification_failure_criteria   w,c
-        execution_failure_criteria      w,c
-}
-
 define servicedependency {
         host_name                      	sundries01
         service_description            	nrpe 
diff --git a/roles/nagios_server/files/nagios/services/disk.cfg b/roles/nagios_server/files/nagios/services/disk.cfg
index 9c4d92759c..575aa072e3 100644
--- a/roles/nagios_server/files/nagios/services/disk.cfg
+++ b/roles/nagios_server/files/nagios/services/disk.cfg
@@ -34,12 +34,12 @@ define service {
 #  use                   disktemplate
 #}
 
-define service {
-  host_name             log02
-  service_description   Disk space /var/log
-  check_command         check_by_nrpe!check_disk_/var/log
-  use                   disktemplate
-}
+#define service {
+#  host_name             log02
+#  service_description   Disk space /var/log
+#  check_command         check_by_nrpe!check_disk_/var/log
+#  use                   disktemplate
+#}
 
 #define service {
 #  host_name             nfs01