Hi,
 
If you meet the self assessmnet criteria for the year in which you entered the Uk, then the first year for a return would be
21/22  based on the information you have provided here.

Your understanding is correct.

Thank you.