Techiyas Hameisim and Noach

The thought occurred to me last week, what will be the status of Adam and Noach after techiyas hameisim. When it comes to the Avos and Shevatim, one could get into the whole discussion whether they have a status of Yisroel or not. (ayin Parshas Derachim). However, everyone agrees that Adam and Noach do not have the status of Yisroel. Will they need to be m'gayeir after techiyas hameisim, will it be optional ? Just wondering.