Land on the approach to Port Otago is to be jointly managed by Ngai Tahu.
A plan was being launched on Wednesday by Te Runanga o Otakou, Dunedin City Council, the Department of Conservation and Korako Karetai Trust.
The agreement will give the runanga a seat at the decision-making table for any issues involving Pukekura, also known as Taiaroa Head.
Local Maori have for years been campaigning to co-govern the tip of the Otago Peninsula, after the Crown took the whenua for military defences in 1880s and never returned it.
The chair of the runanga, Edward Ellison, says they are once again guardians of the land.
He says previous development of Pukekura has caused tension between tangata whenua and authorities.
Mr Ellison says his runanga will now be part of any planning on the headland.