If you will keep on getting water by tanker believe it or not, it will always be the same. I am telling you coz of my previous experience. Better move out sooner then later.

Peace.