I need to amend 2021 Form 8606 since turbo tax generated it incorrectly. Do I amend my 2021 taxes with no changes,download 1040X and manually fill 8606 separately & mail?

In turbotax online I do not see form 8606 and eventhough I go through the IRA contribution section, I have a feeling it will incorrectly report the total basis like previously in amendment as well.