diff --git a/inventory/host_vars/bastion01.phx2.fedoraproject.org b/inventory/host_vars/bastion01.phx2.fedoraproject.org
index 6eddd6aee3..e6d08801c3 100644
--- a/inventory/host_vars/bastion01.phx2.fedoraproject.org
+++ b/inventory/host_vars/bastion01.phx2.fedoraproject.org
@@ -3,9 +3,9 @@ nm: 255.255.255.0
 gw: 10.5.126.254
 dns: 10.5.126.21
 
-volgroup: /dev/vg_guests00
+volgroup: /dev/vg_guests
 
 eth0_ip: 10.5.126.12
 
-vmhost: virthost04.phx2.fedoraproject.org
+vmhost: virthost02.phx2.fedoraproject.org
 datacenter: phx2
diff --git a/inventory/host_vars/notifs-web01.phx2.fedoraproject.org b/inventory/host_vars/notifs-web01.phx2.fedoraproject.org
index d9ffbb5294..c10d223bfd 100644
--- a/inventory/host_vars/notifs-web01.phx2.fedoraproject.org
+++ b/inventory/host_vars/notifs-web01.phx2.fedoraproject.org
@@ -8,7 +8,7 @@ ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
 
 eth0_ip: 10.5.126.103
 
-volgroup: /dev/vg_virthost04
-vmhost: virthost04.phx2.fedoraproject.org
+volgroup: /dev/vg_guests
+vmhost: virthost02.phx2.fedoraproject.org
 
 datacenter: phx2
diff --git a/roles/nagios_server/files/nagios/hosts/bastion01.cfg b/roles/nagios_server/files/nagios/hosts/bastion01.cfg
index 13f96fb8b9..c0abe8f904 100644
--- a/roles/nagios_server/files/nagios/hosts/bastion01.cfg
+++ b/roles/nagios_server/files/nagios/hosts/bastion01.cfg
@@ -3,5 +3,5 @@ define host {
   alias                        bastion01.phx2.fedoraproject.org
   use                          defaulttemplate
   address                      bastion01.phx2.fedoraproject.org
-  parents                      virthost04,fwsm01-gw
+  parents                      virthost02,fwsm01-gw
 }
diff --git a/roles/nagios_server/files/nagios/hosts/notifs-web01.cfg b/roles/nagios_server/files/nagios/hosts/notifs-web01.cfg
index 1c8f08bc2a..93821054a8 100644
--- a/roles/nagios_server/files/nagios/hosts/notifs-web01.cfg
+++ b/roles/nagios_server/files/nagios/hosts/notifs-web01.cfg
@@ -3,5 +3,5 @@ define host {
   alias                        notifs-web01.phx2.fedoraproject.org
   use                          defaulttemplate
   address                      notifs-web01.phx2.fedoraproject.org
-  parents                      virthost04
+  parents                      virthost02
 }