Sector 15: Upgrading, but water supply is making me rethink

Currently in a 2BHK in Sector 15, thinking of upgrading to a bigger place, maybe even a villa nearby. But honestly, the water situation is making me hesitate. Municipal water supply is so unreliable! Half the time it's tanker dependency. Is it the same even in the newer builder floor apartments? Paying a premium for a bigger place, but pani hi nahi hai toh kya fayda? Already have a home loan, so EMI is a big factor. Anyone else facing this water issue in Sector 15? What solutions are you using? Is borewell a viable option long term? Thinking of pulling out of the deal, tbh.