Governor Mike Sonko and Nairobi Metropolitan Services (NMS) Director-General Mohammed Badi have agreed to bury the hatchet and work together.
The truce comes after a stern warning by President Uhuru Kenyatta that he will not tolerate any more "petty" politics in Nairobi.
Speaking during the issuance of title deeds at the KICC Wednesday, the President, without mincing his words, berated Mr Sonko, making it clear that he will not allow politics to derail his vision for the city.
He asked politicians who are not ready to serve the people to step aside.
"Sonko, stop petty politics. Badi has no interest in the post of governor, Speaker, MCA or any other. After he is done with the NMS, he will go back to the military to protect Kenyans.
"We are here to serve the people and not to cause confusion and commotion," he said.
The Head of State said the NMS was established to transform the capital into a city befitting its status by uplifting the livelihoods of residents who continue to wallow in misery without water, proper sewerage system, roads and hospitals, among others.
"Our work as elected leaders is serving those who elected us and not wrangles every time. I don't want any more politics but to ensure we have roads, a good sewerage system, water and so on. We are here to serve the people and I will deliver on my pledge," he said.
For his part, Governor Sonko said he had put aside any differences he had with Major-General Badi and they will now work closely to serve Nairobi residents.
The City Hall boss blamed politicians for the strained working relationship with the NMS and the friction between the two offices.