Move to using figaro