They're working on that, but there's the issue that the vaccines haven't been out for a long time, and since we're apparently in for a longer haul than we anticipated, the question is which actually lasts longer.
BUT! Vaccines are the safer route...