Another six year rule question.

Hi, Lived in our purchased PPoR for 3 years, had it valued when we moved out and rented it for 7 years before returning. No plans to sell for decades now, but I'll still need to expect to pay CGT for the period it was rented, yeah? So I need to have another valuation done when we move back in? Anything else to consider?