Scotland hooker Ross Ford is back in the Edinburgh side for the eagerly-awaited clash with Glasgow at Firhill on Friday night.
Ford has been ruled out for the past month after picking up an ankle injury while on Scotland duty in the RBS 6 Nations.
Ross Rennie, who earned a call-up to the Scotland squad for the RBS 6 Nations game against Ireland in February returns to the back row alongside Ally Hogg, who along with Hugo Southwell will make his 100th appearance for Edinburgh.
Roland Reid is fit again after hamstring trouble to take his place on the right wing but centre Nick de Luca has not recovered from the ankle problem which has plagued him for the past two months.
Scotland prop Allan Jacobsen is ruled out with a groin problem but international props Gavin Kerr and Craig Smith fill the front-row berths.
The match in the Celtic League also incorporates the battle for the 1872 Challenge Cup.
Peter O'Mahony was named man of the match against England last month
21 April 2017, 7:22pm
Peter O'Mahony's performance in the RBS 6 Nations finale for Ireland against England was crucial to his selection for the British & Irish Lions on Wednesday, Ireland and Lions defence coach Andy Farrell has revealed.