I am trying to amend my client's 2020 personal tax return for full repayment of the Covid retirement distribution.

The IRS website says to use Form 9815-E.  However this form only talks about repayments made before, not after filing of the 2020 tax return.

Form 8915-F says it is not to be used for 2020 tax returns.

Any suggestions on the best way to file the 1040X.

I appreciate any help offered