I'd be fine with either, and I think it'd also help with price-gouging like Turing Pharmaceuticals engaged in with Daraprim.

A public drugmaker could be obligated to have implemented processes to manufacture every approved drug. If a maker engaged in price-gouging, or had its facilities disrupted, the public drugmaker could supply an alternative supply at fair prices.