Retirement tax questions

Got it. Would the 8606 need to be filed with the 2020 return or next year with the 2021? I assume the 8606 would need to report the excess in one of the years.