On June 12, 2005, Shelley made an appearance on the international version of WWE Heat, losing to Simon Dean after being hit with the Simonizer.
It was announced on the January 8, 2020 broadcast of NXT that Shelley would be teaming with Kushida in the Dusty Rhodes Tag Team Classic. On the January 16 episode of NXT, Shelley had his debut match teaming with Kushida and losing to the Grizzled Young Veterans in the first round of the Dusty Rhodes Tag Team Classic Tournament.
In September 2024, it was reported that Shelley and Chris Sabin had signed with WWE as The Motor City Machine Guns. Shelley and Sabin made their debut on the SmackDown brand on October 18, defeating A-Town Down Under (Austin Theory and Grayson Waller) and Los Garza (Angel and Berto) of Legado del Fantasma in a tournament semifinal for the WWE Tag Team Championship number one contendership. The Motor City Machine Guns would defeat #DIY (Johnny Gargano and Tommaso Ciampa) in the tournament finals the following week on SmackDown before receiving their WWE Tag Team Championship opportunity later that night, where they defeated The Bloodline (Tama Tonga and Tonga Loa) to win the titles. On the November 15 episode of SmackDown, Shelley and Sabin defended the titles against The Street Profits (Angelo Dawkins and Montez Ford), but the match ended in a no contest after Ciampa attacked both teams. On the December 6 episode of SmackDown, Shelley and Sabin lost the titles to DIY after Gargano hit Sabin with a low blow, ending their reign at 42 days.