Corrected 1099-R after file and refund received

[C2per]

I received 2 sets of 1099-R in 2021 from my financial institution:

First - I received and used this in my income tax return filed before April 2022 deadline. 1099-R - Box 1 - $10,000; Box 2b - marked x; Box 7 - J. 

Second - I received corrected with 2 1099-Rs after filing and received the refund.1) 1099-R with only filled boxes are: Box 1 - $4,300 and Box 7 - 8J. 2) 1099-R with only filled boxes: Box 1 - $4,200; Box 2a - $200; Box 7 - PJ. 

Should I amend my 2021 return?

Thank you!

[Critter-3]

Yes.    

How to amend (change or correct) a return you already filed

https://ttlc.intuit.com/community/amending/help/how-to-amend-change-or-correct-a-return-you-already-...

[C2per]

Thank you! Should I amend my 2020 return too? One of the 2021 1099-Rs I got this year included one with Box 7 as PJ. I also received in back in 2021 the 1099-R with the filled boxes for 2020: Box 1 - $1,000; Box 2b - marked x; Box 7 - J.

[C2per]

Sorry, may I ask if you could reply on my follow up question? Thank you so much!