A former First World War naval barracks in South Queensferry is set to be replaced with 49 new homes.
Port Edgar, the marina on the southern shore of the Firth of Forth, currently operates as a sailing base with up to 300 berths.
Lar Housing Trust have now submitted plans to deliver more homes at a mid-market rent, fresh from their project renovating a canalside industrial works in Ruchill.