Yes, you will mail Form 1040-X, Form 8606, and the new Form 1040
Yes, you will use the new version for filing your 2021 state return.
For the 2020 amended state return, you can check if anything changes on your state return and if yes you will have to file it too.
@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"
