Improvements - remove dependency on installing puppetlabs/apt