Kinross-based Webster Honey has positioned four beehives on top of the Eden Locke in George Street.
The hotel will be able to serve the honey to its guests who can also learn about the vital role bees play in the environment.
Last year, in what was its very first deal with a hotel in Scotland, Webster Honey tied up with Monachyle Mhor Hotel in Balquhidder, near Lochearnhead when they agreed to have two hives positioned in their grounds.
Schools, nurseries and other businesses are among the organisations given the opportunity to look after the company’s hives for a year or longer.
Educational establishments can carry out lessons about bees with their pupils with Webster Honey’s beekeeper, Meik Molitor, who runs age appropriate sessions - first letting children decorate their own hive.
Monachyle Mhor has decided to offer honey workshops to foodie guests as day-long courses, with Meik overseeing this activity for them.
Daniel Webster, managing director of Webster Honey, said he was “delighted” to secure the deal with its first hotel in Edinburgh.
He said: “Hives can be sited anywhere, you don’t have to be out in the country to have bees, as we already have a hive on a roof at a nursery in Edinburgh.
"Roofs are a great and very safe place in which to put a hive and these ones will enjoy a spectacular view of Edinburgh, not that the bees will notice, they will be far too busy, but it will certainly be nice for Meik, our beekeeper.
“Let’s hope for another Summer of fine weather as last year our bees did really well with the warm Spring and less pollution due to lockdown.
“The lockdowns have prevented us from being able to do much engagement with any of our customers who were hosting hives for us.
"We would love it if now we are able to get back to doing that, as it adds so much to the overall hosting experience.
“Meik goes regularly round all of his hives to carry out all checks on the hives and make sure the bees are flourishing.”
Jamie Mackie, general manager at Eden Locke, said: “It’s been so exciting to have the four hives positioned today and filled with over 20,000 bees.
“We are thrilled to partner with Webster Honey and provide a safe new home for bees at Eden Locke, where they can thrive.
“We’ve no doubt that our guests will enjoy sampling some homemade honey, while learning about the important role bees play in our environment – and if they’re lucky, even catch Meik for a chat!”
Details on courses for schools and nurseries can be found here.