I have used the 2021 8915-E Disaster Distribution worksheet to calculate the 8915-F form for the amount of the distribution taxable in 2021 from the 2020 covid distribution spread over 3 years. The calculated amount on the 8915-F appears to replace the amount of the regular 2021 non covid distribution amount on the 1040.