I use BPA-free water bottles (Nalgene being my preference). A few years ago, I purchased a ProPur water filer (yes, the ones promoted by Infowars). After filtering, I store the water in BPA-free gallon jugs in my refrigerator. I am very pleased with the taste of the water, and I am drinking more than a gallon per day.

Here's a link if you're interested in the filters: https://www.propurusa.com