diff --git a/bindep.txt b/bindep.txt
index b524a40..a218d66 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -10,30 +10,31 @@ device-mapper-multipath     [platform:rpm (cinder purestorage) (nova purestorage
 dnsmasq                     [neutron]
 dnsmasq-utils               [neutron]
 ebtables                    [neutron]
-gcc-c++                     [platform:rpm requirements]
+erlang-base-hipe            [(infra rabbitmq hipe)]
 gcc                         [platform:rpm requirements]
+gcc-c++                     [platform:rpm requirements]
 genisoimage                 [(nova configdrive)]
 gettext                     [horizon]
 git                         [requirements]
-haproxy                     [neutron]
+haproxy                     [neutron (infra haproxy)]
 httpd                       [platform:rpm apache]
 ipmitool                    [(ironic ipmi)]
 iproute2                    [platform:dpkg neutron nova (infra libvirt)]
 ipset                       [neutron]
 iptables                    [neutron (nova linuxbridge)]
 iputils-arping              [platform:dpkg neutron]
-ipxe-bootimgs               [platform:rpm (ironic ipxe)]
 ipxe                        [platform:dpkg (ironic ipxe)]
+ipxe-bootimgs               [platform:rpm (ironic ipxe)]
 iscsi-initiator-utils       [platform:rpm (cinder purestorage) (nova purestorage)]
-keepalived                  [neutron]
+keepalived                  [neutron (infra keepalived)]
 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]
-liberasurecode-devel        [platform:rpm requirements]
 liberasurecode-dev          [platform:dpkg requirements]
-libffi-devel                [platform:rpm requirements]
+liberasurecode-devel        [platform:rpm requirements]
 libffi-dev                  [platform:dpkg requirements]
+libffi-devel                [platform:rpm requirements]
 libgcrypt                   [platform:rpm requirements]
 libkrb5-dev                 [platform:dpkg requirements]
 libldap-2.4-2               [platform:dpkg (keystone ldap !python3)]
@@ -50,18 +51,18 @@ libpython3.5                [platform:dpkg python3]
 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)]
+libvirt-bin                 [platform:dpkg (infra libvirt)]
+libvirt-dev                 [platform:dpkg requirements]
+libvirt-devel               [platform:rpm requirements]
+libvirt0                    [platform:dpkg nova]
 libxml2                     []
-libxml2-devel               [platform:rpm requirements]
 libxml2-dev                 [platform:dpkg requirements]
-libxslt1-dev                [platform:dpkg requirements]
+libxml2-devel               [platform:rpm requirements]
 libxslt-devel               [platform:rpm requirements]
-libyaml-devel               [platform:rpm requirements]
+libxslt1-dev                [platform:dpkg requirements]
 libyaml-dev                 [platform:dpkg requirements]
+libyaml-devel               [platform:rpm requirements]
 libz-dev                    [platform:dpkg requirements]
 lvm2                        [(cinder lvm)]
 make                        [platform:rpm requirements]
@@ -76,8 +77,8 @@ nginx                       [nginx]
 nss-devel                   [platform:rpm requirements]
 nss-util                    [platform:rpm requirements]
 open-iscsi                  [platform:dpkg (cinder purestorage) (nova purestorage)]
-openldap-devel              [platform:rpm requirements]
 openldap                    [platform:rpm (keystone ldap !python3)]
+openldap-devel              [platform:rpm requirements]
 openssl-devel               [platform:rpm requirements]
 openvswitch                 [platform:rpm (neutron openvswitch) (nova openvswitch) (infra openvswitch)]
 openvswitch-switch          [platform:dpkg (neutron openvswitch) (nova openvswitch) (infra openvswitch)]
@@ -85,22 +86,23 @@ pcre-devel                  [platform:rpm requirements]
 pkg-config                  [platform:dpkg requirements]
 pkgconfig                   [platform:rpm requirements]
 postgresql-devel            [platform:rpm requirements]
-python3-devel               [platform:rpm (requirements python3)]
-python3-dev                 [platform:dpkg (requirements python3)]
-python3-rbd                 [(glance ceph python3)]
-python-devel                [platform:rpm (requirements !python3)]
 python-dev                  [platform:dpkg (requirements !python3)]
+python-devel                [platform:rpm (requirements !python3)]
 python-rbd                  [(glance ceph !python3)]
-qemu-img                    [platform:rpm (nova qemu) (ironic qemu) (cinder qemu)]
+python3-dev                 [platform:dpkg (requirements python3)]
+python3-devel               [platform:rpm (requirements python3)]
+python3-rbd                 [(glance ceph python3)]
 qemu                        [platform:dpkg (infra libvirt)]
+qemu-img                    [platform:rpm (nova qemu) (ironic qemu) (cinder qemu)]
 qemu-utils                  [platform:dpkg (nova qemu) (ironic qemu) (cinder qemu)]
+rabbitmq-server             [(infra rabbitmq)]
 sg3-utils                   [platform:dpkg (cinder purestorage) (nova purestorage)]
 sg3_utils                   [platform:rpm (cinder purestorage) (nova purestorage)]
 syslinux-tftpboot           [platform:rpm (ironic tftp)]
 systemd-devel               [platform:rpm requirements]
 targetcli                   [platform:rpm (cinder lvm)]
-tftpd-hpa                   [platform:dpkg (ironic tftp)]
 tftp-server                 [platform:rpm (ironic tftp)]
+tftpd-hpa                   [platform:dpkg (ironic tftp)]
 tgt                         [platform:dpkg (cinder lvm)]
 thin-provisioning-tools     [platform:dpkg (cinder lvm)]
 uuid                        [platform:rpm neutron]