There will be hundreds of taster sessions available for those who want to try watersports at the Port Edgar marina in South Queensferry.
The marina's open weekend is back on May 16 and 17 2020, with a street food market also taking over the port.
It's a great opportunity to try sailing, kayaking or other sports before signing up to longer lessons.
Many of the activities will be family-friendly, but expect places will need to be booked in advance and they may go quickly.
Visitors will also be able to take part in discounted sailing sessions on board a luxury catamaran from Edinburgh Boat Charters.
Staff at the marina say they'll offer the following:
*More than 500 watersports taster sessions
*Our friends from Rogue Village will be running their Canteen Street Food Festival, in addition to Marina favourites Scott’s and Down the Hatch
*Fantastic shopping opportunities at Beacon
*Sailing experiences with Edinburgh Boat Charters
You can find out more here.