Switch all keys over to ENV