Retirement tax questions

I have a very very similar situation if not the same. Just would like the clarify. My 1099-r is for $12000 because I made after tax contributions in 2021 for both 2021 and 2020. But when I enter the 1099-r for each year (amend for 2020) I am entering it as if I received a 1099-r for each year one for $6000, right? So I am entering as income and deducting it with the steps mentioned below for current 2021 and amended 2020 taxes.