Update recovery scripts to streamline recovery building