Foreign Earned Income Tax Exclusion

I worked and lived as a civilian overseas in the middle east (Qatar) for a U.S. contractor from March 6, 2020 until July 7, 2021. I did not return to the U.S. at all during that time. For the tax year 2020 I claimed, and received, the foreign earned income tax exclusion using the physical presence test. When I file for tax year 2021, can I claim the foreign earned income tax exclusion for the months Jan. 1, 2021 to July 7, 2021? I returned to the U.S. on July 7, 2021. Do I need to change my tax year? Thank you.