As next step to what was done in #6765 we should not align with the next beta of SPFx 1.22,0
We should update the following commands

• spfx project upgrade
• spfx doctor
• spfx project doctor

Referenced docs that might be helpful:
SPFx project upgrade

References PR we may base on:
#6815