try just using the plastic milk or orange juice jugs.we use them for storing water from the rain barrel thats used to water house plants in the winter.ours are years old and don't leak and they get carried around the house and refilled from a few 30 gallon barrels i found with a "take me" sign on them.
food safe because thats what they are made for and square so you can store them.it's also "not all eggs in one basket deal".every time you empty a jug like that with milk,juice,apple cider--whatever just rinse it out with warm water,refill from the tap,unless you have nasty local water and put away.
i have said this before but living someplace where water is not a problem i was not really aware of the lack of it until i was driving in the SW and saw signs at the rest stops forbidding "tanking up" from the rest stops taps....