diff --git a/bindep.txt b/bindep.txt
index 2d3f341..6af7fbb 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -10,8 +10,8 @@ device-mapper-multipath     [platform:rpm (cinder purestorage) (nova purestorage
 dnsmasq                     [neutron]
 dnsmasq-utils               [neutron]
 ebtables                    [neutron]
-gcc                         [platform:rpm requirements]
 gcc-c++                     [platform:rpm requirements]
+gcc                         [platform:rpm requirements]
 genisoimage                 [(nova configdrive)]
 git                         [requirements]
 haproxy                     [neutron]
@@ -21,19 +21,17 @@ iproute2                    [platform:dpkg neutron nova]
 ipset                       [neutron]
 iptables                    [neutron (nova linuxbridge)]
 iputils-arping              [platform:dpkg neutron]
-ipxe                        [platform:dpkg (ironic ipxe)]
 ipxe-bootimgs               [platform:rpm (ironic ipxe)]
+ipxe                        [platform:dpkg (ironic ipxe)]
 iscsi-initiator-utils       [platform:rpm (cinder purestorage) (nova purestorage)]
 keepalived                  [neutron]
-libapache2-mod-wsgi         [platform:dpkg apache]
 libapache2-mod-auth-mellon  [platform:dpkg (keystone apache mellon)]
-mod_auth_mellon             [platform:rpm (keystone apache mellon)]
 libapache2-mod-auth-openidc [platform:dpkg (keystone apache openidc)]
-mod_auth_openidc            [platform:rpm (keystone apache openidc)]
-liberasurecode-dev          [platform:dpkg requirements]
+libapache2-mod-wsgi         [platform:dpkg apache]
 liberasurecode-devel        [platform:rpm requirements]
-libffi-dev                  [platform:dpkg requirements]
+liberasurecode-dev          [platform:dpkg requirements]
 libffi-devel                [platform:rpm requirements]
+libffi-dev                  [platform:dpkg requirements]
 libgcrypt                   [platform:rpm requirements]
 libkrb5-dev                 [platform:dpkg requirements]
 libldap-2.4-2               [platform:dpkg (keystone ldap !python3)]
@@ -48,50 +46,52 @@ libpython3.5                [platform:dpkg python3]
 libsasl2-dev                [platform:dpkg requirements]
 libssl-dev                  [platform:dpkg requirements]
 libsystemd-dev              [platform:dpkg requirements]
-libvirt-dev                 [platform:dpkg requirements]
-libvirt-devel               [platform:rpm requirements]
 libvirt0                    [platform:dpkg nova]
+libvirt-devel               [platform:rpm requirements]
+libvirt-dev                 [platform:dpkg requirements]
 libxml2                     []
-libxml2-dev                 [platform:dpkg requirements]
 libxml2-devel               [platform:rpm requirements]
-libxslt-devel               [platform:rpm requirements]
+libxml2-dev                 [platform:dpkg requirements]
 libxslt1-dev                [platform:dpkg requirements]
-libyaml-dev                 [platform:dpkg requirements]
+libxslt-devel               [platform:rpm requirements]
 libyaml-devel               [platform:rpm requirements]
+libyaml-dev                 [platform:dpkg requirements]
 libz-dev                    [platform:dpkg requirements]
 lvm2                        [(cinder lvm)]
-multipath-tools             [platform:dpkg (cinder purestorage) (nova purestorage)]
 make                        [platform:rpm requirements]
 mariadb-devel               [platform:rpm requirements]
+mod_auth_mellon             [platform:rpm (keystone apache mellon)]
+mod_auth_openidc            [platform:rpm (keystone apache openidc)]
 mod_ssl                     [platform:rpm apache]
 mod_wsgi                    [platform:rpm apache]
+multipath-tools             [platform:dpkg (cinder purestorage) (nova purestorage)]
 nginx                       [nginx]
 nss-devel                   [platform:rpm requirements]
 nss-util                    [platform:rpm requirements]
-openldap                    [platform:rpm (keystone ldap !python3)]
+open-iscsi                  [platform:dpkg (cinder purestorage) (nova purestorage)]
 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)]
-open-iscsi                  [platform:dpkg (cinder purestorage) (nova purestorage)]
 pcre-devel                  [platform:rpm requirements]
 pkg-config                  [platform:dpkg requirements]
 pkgconfig                   [platform:rpm requirements]
 postgresql-devel            [platform:rpm requirements]
-python-dev                  [platform:dpkg (requirements !python3)]
-python-devel                [platform:rpm (requirements !python3)]
-python-rbd                  [(glance ceph !python3)]
-python3-dev                 [platform:dpkg (requirements python3)]
 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-rbd                  [(glance ceph !python3)]
 qemu-img                    [platform:rpm (nova qemu) (ironic qemu) (cinder qemu)]
 qemu-utils                  [platform:dpkg (nova qemu) (ironic qemu) (cinder qemu)]
 sg3_utils                   [(cinder purestorage) (nova purestorage)]
 syslinux-tftpboot           [platform:rpm (ironic tftp)]
 systemd-devel               [platform:rpm requirements]
 targetcli                   [platform:rpm (cinder lvm)]
-tftp-server                 [platform:rpm (ironic tftp)]
 tftpd-hpa                   [platform:dpkg (ironic tftp)]
+tftp-server                 [platform:rpm (ironic tftp)]
 tgt                         [platform:dpkg (cinder lvm)]
 thin-provisioning-tools     [platform:dpkg (cinder lvm)]
 uuid                        [platform:rpm neutron]
diff --git a/scripts/install.sh b/scripts/install.sh
index 107af6b..bb39961 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -47,6 +47,13 @@ if [[ "${PROJECT}" == "requirements" ]]; then
 fi
 
 $(dirname $0)/fetch_wheels.sh
+if [[ "${PROJECT}" == "infra" ]]; then
+   $(dirname $0)/setup_pip.sh
+    $(dirname $0)/pip_install.sh bindep==2.6.0 ${PIP_PACKAGES}
+    $(dirname $0)/install_packages.sh
+    $(dirname $0)/cleanup.sh
+    exit 0
+fi
 if [[ "${PLUGIN}" == "no" ]]; then
     $(dirname $0)/create_user.sh
     $(dirname $0)/setup_pip.sh