Updates and fixes to firstboot
Taking code back to supporting mini repos