Cyclone and corrosion resistant water storage solutions