The City of Tshwane and Department of Water and Sanitation have committed themselves to working together on a project to resolve the water issues in Hammanskraal.