In early 2005, Steamboat returned to WWE as a producer and was introduced as a WWE Legend on the "Homecoming" edition of "Raw" in October 2005. In early 2006, Ricky Steamboat told WWE management that he would like to come out of retirement at WrestleMania 22 and work a match with Ric Flair, but the idea was nixed. Ricky Steamboat has been the special referee in main event matches between John Cena, Triple H, and/or Edge at WWE house shows. In 2006 at the Raw SummerSlam Tour in Sydney, Australia, he was a referee for a match between Cena and Edge for the WWE Championship. He also refereed another title match in July 2007 between John Cena and Randy Orton in Anaheim, California. On April 1, 2007, he made an appearance at WrestleMania 23 while various other legends were having a small dance party in the background. He also briefly appeared at the pay-per-view, being recognized as a former Intercontinental Champion. He made another appearance on WWE television during Ric Flair's farewell on the March 31, 2008 edition of "Raw".