The couple has been dating on and off since 2007
He’s won 18 gold medals and now he’s got the girl.
Olympic swimmer Michael Phelps and girlfriend Nicole Johnson are engaged.
Phelps, 29, announced the news on Saturday, posting a snowy photo to Instagram of him and Johnson with the caption, “She said yes.”
The former Miss California, 29, shared a similar photo on her account, showing off her sparkling ring against a winter background.
Both photos of the happy couple were snapped by Phelps’s training partner and fellow Olympian Allison Schmitt, who posted her own shot of the “soon to be Mr. & Mrs. Phelps.”
Phelps and Johnson have been dating on and off since 2007, and remained friends throughout the years. After splitting in late 2011, the couple rekindled their romance in 2014.
New From PEOPLE Books: PEOPLE Weddings: How Hollywood Days ‘I Do!’
• Intimate photos and glorious details from more than 40 celebrity weddings
• Available in stores and on newsstands now, or at www.timeincbooks.com