This is ostensibly what WebAuthn will do. It needs to happen, but retraining users is going to be the difficult bit.