Yes, your Form 8606 and the entry on Form 1040 line 4 looks correct.
The 2021 amendment you can e-file.
For the 2020 amended return you will mail Form 1040-X, the new Form 1040, and Form 8606.
@Jenny011
**Say "Thanks" by clicking the thumb icon in a post
**Mark the post that answers your question by clicking on "Mark as Best Answer"
