I wish you all have a great 2022, stay safe!

This is the first FY change for me in D365 and I'm struggling with Goals. We had a quote goal (2021 Quote Break-Even) with 'Reveunue (Quotes)' as Goal Metric and 'Quote (Active)' as Rollup Query Actual Money. The Goal is summing up all amounts from active quotes created in 2021 (time period is 01/01/2021 to 31/12/2021).

I need to create one goal as above for 2022 BUT ALSO add amount coming from Active Quotes created in 2021. Can anyone explain what logic I should follow?