diff --git a/inventory/inventory b/inventory/inventory
index 78d5941adf..00c7fc73ed 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -232,11 +232,9 @@ autocloud-backend-libvirt
 autocloud-backend-vbox
 
 [autocloud-backend-libvirt]
-autocloud-backend-libvirt.phx2.fedoraproject.org
 autocloud-backend-libvirt2.phx2.fedoraproject.org
 
 [autocloud-backend-vbox]
-autocloud-backend-vbox.phx2.fedoraproject.org
 autocloud-backend-vbox2.phx2.fedoraproject.org
 
 [autocloud-backend-stg:children]
diff --git a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
index 110b9258c2..d889e892c1 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
@@ -28,14 +28,6 @@ subnet 10.5.126.0 netmask 255.255.255.0 {
         option host-name "virthost04";
     }
 
-    host autocloud-backend-vbox {
-        hardware ethernet e4:1f:13:ba:84:d0;
-        fixed-address 10.5.126.122;
-        next-server 10.5.126.41;
-        option host-name "autocloud-backend-vbox";
-	filename "pxelinux.0";
-    }
-
 #    host virthost05 {
 #        hardware ethernet E4:1F:13:BA:99:28;
 #        fixed-address 10.5.126.145;
@@ -60,14 +52,6 @@ subnet 10.5.126.0 netmask 255.255.255.0 {
 #	filename "pxelinux.0";
 #    }
 
-    host autocloud-backend-libvirt {
-        hardware ethernet e4:1f:13:ba:e6:f8;
-        fixed-address 10.5.126.123;
-        next-server 10.5.126.41;
-        option host-name "autocloud-backend-libvirt";
-	filename "pxelinux.0";
-    }
-
 #    host virthost09 {
 #        hardware ethernet e4:1f:13:ba:7f:88;
 #        fixed-address 10.5.126.149;
diff --git a/roles/fedmsg/base/templates/endpoints-autocloud.py.j2 b/roles/fedmsg/base/templates/endpoints-autocloud.py.j2
index 95d983c8d1..65802ab7aa 100644
--- a/roles/fedmsg/base/templates/endpoints-autocloud.py.j2
+++ b/roles/fedmsg/base/templates/endpoints-autocloud.py.j2
@@ -3,7 +3,7 @@ suffix  = 'stg.phx2.fedoraproject.org'
 machines = ['autocloud-backend01', 'autocloud-backend02']
 {% else %}
 suffix = 'phx2.fedoraproject.org'
-machines = ['autocloud-backend-libvirt', 'autocloud-backend-vbox']
+machines = ['autocloud-backend-libvirt2', 'autocloud-backend-vbox2']
 {% endif %}
 
 endpoints = {}