Water supply rehabilitation