On 17 May 1988, she was renamed Kahu (A04) and recommissioned as the basic seamanship and navigation training vessel attached to the Royal New Zealand Naval College. Kahu is the second boat with this name to serve in the New Zealand Navy. Kāhu also is the Māori name for a New Zealand native harrier hawk. She was replaced in her role as a diving tender by HMNZS Manawanui (A09). She remained in service for seamanship, Officer of the Watch training and as a backup diving tender until her decommissioning on 30 October 2009. The ship was sold for use as a pleasure craft on 18 February 2010.