use the correct year Form 8606 for the year you are amending.
On the latest Form 1040-X you write in the the year you are amending.
Use the July 2021 revision of Form 1040-X to amend 2019 and later tax return
You will not be charged if you do it the way I described above.
@panacea6565
