The Scottish Environment Protection Agency have issued a flood alert for Edinburgh and Lothians.
Heavy, thundery showers are likely to develop in the region through Friday afternoon and evening, which may result in isolated areas of surface water flooding.
According to SEPA, the greatest risk will be if the showers occur over urban areas or the transport network.
The Met Office has also warned of potential torrential downpours with 25 to 35mm rain falling in an hour in some places.
A spokesman for the Met office said: "With this heavy rain falling in a short time we could see some disruption to transport or damage to properties due to localised flooding, as well as the chance of lightning and hail."
SEPA wrote on their website: "Remain vigilant and remember, it is your responsibility to take actions which help protect yourself and your property.
"Advice and information is also available through Floodline on 0345 9881188."
The good news though is that when the downpours clear Edinburgh and the rest of the UK is set to sizzle in a heatwave.
The forecast says: "Temperatures should generally be above average, possibly turning very warm in places.
"In early July, a transition to more settled conditions is signalled with many seeing more prolonged drier and sunnier spells."
