diff --git a/bindep.txt b/bindep.txt
index 2f43e6d..6330b05 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -18,7 +18,7 @@ git                         [requirements]
 haproxy                     [neutron]
 httpd                       [platform:rpm apache]
 ipmitool                    [(ironic ipmi)]
-iproute2                    [platform:dpkg neutron nova]
+iproute2                    [platform:dpkg neutron nova (infra libvirt)]
 ipset                       [neutron]
 iptables                    [neutron (nova linuxbridge)]
 iputils-arping              [platform:dpkg neutron]
@@ -26,6 +26,7 @@ ipxe-bootimgs               [platform:rpm (ironic ipxe)]
 ipxe                        [platform:dpkg (ironic ipxe)]
 iscsi-initiator-utils       [platform:rpm (cinder purestorage) (nova purestorage)]
 keepalived                  [neutron]
+kvm                         [platform:rpm (infra libvirt)]
 libapache2-mod-auth-mellon  [platform:dpkg (keystone apache mellon)]
 libapache2-mod-auth-openidc [platform:dpkg (keystone apache openidc)]
 libapache2-mod-wsgi         [platform:dpkg apache]
@@ -50,8 +51,10 @@ libsasl2-dev                [platform:dpkg requirements]
 libssl-dev                  [platform:dpkg requirements]
 libsystemd-dev              [platform:dpkg requirements]
 libvirt0                    [platform:dpkg nova]
+libvirt-bin                 [platform:dpkg (infra libvirt)]
 libvirt-devel               [platform:rpm requirements]
 libvirt-dev                 [platform:dpkg requirements]
+libvirt                     [platform:rpm (infra libvirt)]
 libxml2                     []
 libxml2-devel               [platform:rpm requirements]
 libxml2-dev                 [platform:dpkg requirements]
@@ -75,8 +78,8 @@ open-iscsi                  [platform:dpkg (cinder purestorage) (nova purestorag
 openldap-devel              [platform:rpm requirements]
 openldap                    [platform:rpm (keystone ldap !python3)]
 openssl-devel               [platform:rpm requirements]
-openvswitch                 [platform:rpm (neutron openvswitch) (nova openvswitch)]
-openvswitch-switch          [platform:dpkg (neutron openvswitch) (nova openvswitch)]
+openvswitch                 [platform:rpm (neutron openvswitch) (nova openvswitch) (infra openvswitch)]
+openvswitch-switch          [platform:dpkg (neutron openvswitch) (nova openvswitch) (infra openvswitch)]
 pcre-devel                  [platform:rpm requirements]
 pkg-config                  [platform:dpkg requirements]
 pkgconfig                   [platform:rpm requirements]
@@ -88,6 +91,7 @@ python-devel                [platform:rpm (requirements !python3)]
 python-dev                  [platform:dpkg (requirements !python3)]
 python-rbd                  [(glance ceph !python3)]
 qemu-img                    [platform:rpm (nova qemu) (ironic qemu) (cinder qemu)]
+qemu                        [platform:dpkg (infra libvirt)]
 qemu-utils                  [platform:dpkg (nova qemu) (ironic qemu) (cinder qemu)]
 sg3-utils                   [platform:dpkg (cinder purestorage) (nova purestorage)]
 sg3_utils                   [platform:rpm (cinder purestorage) (nova purestorage)]