Craig Hamilton has signed a new two-year deal that will keep him at Edinburgh until 2011.
The second row played an instrumental role in the Scottish side securing second place in the Magners League and he has been rewarded with a revised contract.
"I’m really happy with the way everything has gone over the past 12 months – both with Edinburgh and now Scotland ‘A’ – but I realise there is still plenty of room for improvement," said Hamilton.
"With the France ‘A’ game coming up at the weekend, everyone in the squad is determined to finish on a high and continue the winning habit, although we know it will be a tough test.
"I feel I’m playing a lot better than I have ever done before and hopefully there is a lot more to come."
Hamilton enjoyed spells with Newcastle, Glasgow and Border Reivers before joining Edinburgh in 2007 and he hopes to follow in the example set by the likes of Simon Shaw, who at 37 is currently on tour with the British & Irish Lions.
"A lot of second rows don’t really hit their peak until later on in their careers. Simon Shaw has done really well and to get onto a Lions tour at 37 is an incredible achievement," he continued.
"I’m really happy to stay with Edinburgh for another two years. The way we finished the season, with six straight wins, was great.
"Full credit to the coaches and players because we stuck together and ploughed on through until the end."
In other Magners League news, Glasgow Warriors will have to without centre Andrew Henderson next year after the Scotland international has joined French top-flight club Montauban.