Andrew Kelly said: "I'm delighted to be staying with the club and am looking forward to next year. My first season was a world cup year and I know how challenging a time that can be so I'm looking forward to working hard to get game time with Edinburgh."
Speaking on his decision to sign for the club, prop Geoff Cross said: "I came to Edinburgh to play rugby which I have done and I am looking forward to continuing my development with the coaching staff next season. I am delighted to have the opportunity to realise my potential as a player with Edinburgh."
Executive Chairman Alex Carruthers commenting on the triumvirate: "We are delighted to retain Craig for another two years. As Edinburgh's second most capped player, he has a wealth of experience and is a valued member of the squad who contributes both on and off the field.
"Andrew is in his fourth year with Edinburgh and is keen to stake a claim for the number two jersey while Geoff has used his loan spell from the Border Reivers well to earn a new deal with us and we are pleased they'll be with us next season."
Head coach Lynn Howells added: "Having recognised the need for experience and continuity within the squad, Craig, Andrew and Geoff will give us just that, and I am delighted that Edinburgh have secured their services ahead of next season."