Rework how host keys are used