Mayor vows to keep water crisis on agenda until resolved