Retirement tax questions

I chose to repay my Cares act withdrawl (taken 11/7/20) starting in early 2021 which I reported on my 2020 tax return. What is unclear is whether my final paymnet is due with my 2022 tax return filing or whether I can submit my rollover to occur 11/1/23?  I have heard final payment is actually due 3 years and 1 day after taking the withdrawl.  I have not claimed any of the amount as income over as I intend to pay the entire amount back so no need to ammend prior returns. Just looking for clarity on when final payment is actually due. Thans!