We use scepter water cans, 1g water bottles (in rotation), and our pressure tank.

For long-term non-used it's the scepter water cans. I think I have around 200 gallons worth full, locked away. Use city water, and tighten them good. When ready to use shake w/cap open a few times, let set and shake again.. this will make sure the water is not 'flat' tasting. You should not have to do anything to store your water to make it good to drink in a years time.

If we need to use the stored water that is not rotated or used regularly we will filter it through a AquaRain filter system we have stored away too. I believe the Big Burkey? (Spelling) is similar and can be used for the same thing.

Our goal is to still add a second pressure tank (save $ heating cold well water + more water storage), and also a 2600g tank for the garden which could provide drinking water too. Coupled with the generator we can pull water until we run out of fuel.