Get a couple of Military Plastic Jerry Cans from BrigadeQuartermaster. Their gurateed for life I think.

Fill them up with distilled water and add the proper amount of Aqua Pur. Then rotate it every few years.

Keep a few nalgene, canteen, or similar heavy duty containers filled for hiking purposes.