diff --git a/inventory/group_vars/all b/inventory/group_vars/all
index 4d4045ff86..8a2b976db2 100644
--- a/inventory/group_vars/all
+++ b/inventory/group_vars/all
@@ -34,14 +34,14 @@ lvm_size: 20000
 #                  gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0
 #                  hostname={{ inventory_hostname }}" 
 #                 --network=bridge=br0 --autostart --noautoconsole
-virt_install_command: 'virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
-                 --disk ''bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}''
-                 --vcpus''=''{{ num_cpus }}  -l {{ ks_repo }} -x
-                 "ksdevice''=''eth0 ks''=''{{ ks_url }} console''=''tty0 console''=''ttyS0
-                  hostname''=''{{ inventory_hostname }} nameserver''=''{{ dns }}
-                  ip''=''{{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none"
-                 --network ''bridge=br0,model=virtio''
-                 --autostart --noautoconsole'
+virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+                 --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
+                 --vcpus={{ num_cpus }}  -l {{ ks_repo }} -x
+                 "ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
+                  hostname={{ inventory_hostname }} nameserver={{ dns }}
+                  ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none"
+                 --network bridge=br0,model=virtio
+                 --autostart --noautoconsole
 
 # By default, nodes get no fedmsg certs.  They need to declare them explicitly.
 fedmsg_certs: []
diff --git a/inventory/inventory b/inventory/inventory
index ce0440d33f..62ad5ca39e 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -103,9 +103,7 @@ bugzilla2fedmsg01.phx2.fedoraproject.org
 bugzilla2fedmsg01.stg.phx2.fedoraproject.org
 
 [bvirthost]
-bvirthost01.phx2.fedoraproject.org
 bvirthost04.phx2.fedoraproject.org
-bvirthost05.phx2.fedoraproject.org
 bvirthost06.phx2.fedoraproject.org
 bvirthost07.phx2.fedoraproject.org
 bvirthost08.phx2.fedoraproject.org