Kaniva, Elmhurst, Moyston next on GWMWater's upgrade list