Scotland prop Simon Berghan has signed a two-year contract extension with Edinburgh.
The 26-year-old has made 31 appearances in four seasons with the club and made his international debut against France this year.
Berghan said: "I feel we've got the makings of a very good squad and there's a lot of talent coming through the ranks. It's now about bringing that all together and pushing on in the coming season.
"Front row is a highly-competitive position and that will only drive standards. The battle for a starting spot will be extremely tough, but one in which I'll be looking to thrive."