Reorder some stuff and remove the installzip stage as zip is now installed on the containers