The city council will vote on water rate changes while also discussing electric rates, which will be decided in September.