Changing to use Saltstack PPA seems to speed this up