Yikes.... You need to keep bottled water on hand always. Municipal water is real nasty. Fecal matter in all muni water and tons of psycho meds.
I do rain catchment and have a bunch of different filters used for different things. Ends up all drinkable when done and never any surprises.
If I didn't live in an apartment/duplex I'd be less reliant on city water. I hate living in the city, I want to get out to the countryside where the freedom and night sky is. We do have bottled water on hand, though I don't use it when cooking or when brewing tea or coffee or to water my cats. I'm a bit of a 'prepper' my self, though not too extreme at this time. Basically have acquired a decent stock of canned goods and ammo, and now have a backpacking backpack stocked with a tent, sleeping bag, tarp, rip cord, poncho, nice hunting knife, swedish army fire-starter, flashlight and tomorrow the backpacking stove, cook set, hatchet and first aid kit come in. After that, all I need to top it all off is some MREs, a couple cans of beans, and other easy to make food as well as some water purification tablets and random small/misc items. I couldn't find a good canteen on Amazon, probably will go to an army surplus store and get something worthy of holding a couple quarts of water there.
Speaking of ammo/guns, may be getting a Smith & Weston 4566TSW later today. Need to make it back out to the range soon. Was out there a couple weeks ago and packed my old Ruger Standard, great gun, love it's style and it's cheap/easy to shoot but it kept jamming on me. Last summer it was great, could fire couple hundred rounds through it in one sitting. Then it started to jam, so took it home, cleaned it. It still continues to jam now. Need to take it to a gunsmith I suppose. But if I get that S&W today, that'll be great to.