Switch to using flat variables
Make sure apt dependencies are installed before trying to add any repos, else failure