HSA tax year correction

Hello all, 

 

I had HDHP for 10 months of 2024 (Jan-May and Aug-Dec). I file married jointly.

I know HSA limit if I use the last month rule is $8300 for year 2024 but I will not HDHP for the entire 2025.

My pre-tax contribution on 2024 was $8058 which is reflected on my W2, while my max limit must be 10/12*8300=$6917. To avoid penalty or taxes, I contacted the HSA trustee in Jan 2025 (before tax filing deadline) and ask to move the difference (8058-6917) to year 2025. 

Questions: 

Will I get a 1099-SA corrected for 2024 or 2025?

Will I receive a 5498-SA corrected for 2024 or 2025?

Filing 2024 taxes, where should I mention this correction has happened? or will it be reflected in 2025 filing?

 

Thank you very much!