Everything I have read here has been spot on.
I keep several cases of water on hand, but I also have a home made gravity water filter. It filters slow because it isn't pressurized and doesn't have a pump, but those have drawbacks. You might not always have a power source to power the pump, but I can usually find gravity about everywhere that I go

I also have a few portable/self rescue filters too.
As for the beans and rice, I have a ton of that. You can often find it in 20 or 25 pound bags that you can put into quart vacuum seal bags separately then store in 5 gallon buckets. Plus, if there is an emergency and you're staying at home, you can always dump the vacuum seal bags out and fill them up with water if you can at the onset of power and/or water outages. Even if the power is out, the water will often still be available for a short time afterwards because it's pressurized.
And as Grendel has pointed out, you can add a few drops of bleach per gallon if you don't have a good filter. But there are different kinds of bleach. Don't use the gel or anti splash bleach. I don't even like the concentrate bleach. I like the plain good old fashioned Clorox. I have a large syringe taped to a gallon of Clorox just for that purpose.
I also think having some sugar and iodized salt in vacuum seal bags are important. Some pretty gnarly things can happen to you if you go long term without iodized salt. Many survival foods have a ton of salt in them as a preservative, but I still like having my own salt too.
https://www.healthline.com/nutrition/iodine-deficiency-symptomsCanned foods are great and will last for years especially if kept in cool dry place. That's why the old timers had root cellars. I simply cannot tolerate powdered milk. I'm allergic to it I guess. I break out in hives after I drink it. But I have a bunch of really big cans of other foods. Including some big can swiss miss hot chocolate. So, if I can't drink powdered milk, at least I can have something besides plain water occasionally.
Vacuum packed tea, lemonade, kool aid packs. Because lets' face it, plain water gets old after a while.
Instant (complete) aunt jemima pancakes are good. The one that you only have to add water. Not the version where you need eggs and other stuff.
There are a LOT of things that you can store yourself that just needs water.