If I recall correctly from service in the US Army Reserve decades ago, every officer is a sir, whether male or female.

NCOs are addressed by rank. After all, unlike the 'sirs', they work for a living.

Make the terms gender neutral. Be the change.