The Met Office have predicted heavy rain and thunderstorms for Edinburgh and the Lothians on Friday and Saturday.
Thunder and lightning reportedly struck around 2pm on Friday and is forecast to last until 7pm.
Yellow weather warnings are in place for much of the UK, including southern and central Scotland on Friday and Saturday.
Outbreaks of rain will be spread across the weekend and flood alerts have been issued for the region.
Edinburgh fire: Blaze breaks out at Franco's fish and chip shop in Newington
Ladies Day at Musselburgh Races: Children's nurse crowned most stylish woman
Edinburgh crime news: Teenage boy arrested after riding motorbike in a 'dangerous manner in a public place'
Edinburgh fire: ‘I knew I had to just get out’: Residents evacuated as fire breaks out in Newington area of Edinburgh
Crime: Teenage thug who fathered a child during sentence is back behind bars
Despite the rain and thunderstorms, the temperatures will remain warm, with highs of around 19C expected.