Fix water crisis, or else, City warned