Me rinse out gallon milk jugs fill with water,then place them in milk crates.

4 to crate,store in dark space.

Like closet/basement,change water every six months to be safe side.

If and when you have to use water that taste flat.Pour water back and forth using 2 containers.