On June 16, 2017, WWE announced Storm as one of the first four participants of the Mae Young Classic. Storm entered the tournament on July 13, defeating Ayesha Raymond in the first round. The following day, Storm defeated Lacey Evans in the second round and Piper Niven in the quarterfinals, before being eliminated from the tournament in the semifinals by Kairi Sane.
On May 9, 2018, Storm was advertised for the upcoming United Kingdom Championship Tournament events. On 18 June at the United Kingdom Championship Tournament, Storm defeated Killer Kelly and Isla Dawn in a Triple threat match to become the number one contender for the NXT Women's Championship. The following day at the NXT UK Championship, Storm was defeated by the defending NXT Women's Champion Shayna Baszler. During the 26 August NXT UK tapings, Storm was defeated by Rhea Ripley in a tournament final to determine the inaugural NXT UK Women's Champion. On 28 October 2018, at WWE Evolution, she defeated Io Shirai to win the 2018 Mae Young Classic.
On 12 January 2019 at NXT UK TakeOver: Blackpool, Storm defeated Rhea Ripley to capture the NXT UK Women's Championship. On August 31, 2019 at NXT UK TakeOver: Cardiff, Storm lost her NXT UK Women's Championship to Kay Lee Ray, ending her reign at 231 days. On November 24, 2019 on the NXT TakeOver: WarGames post-show, Storm was announced to be a part of the NXT women's Survivor Series team by team captain Rhea Ripley. At Survivor Series, Storm was eliminated after Natalya and Sasha Banks aligned and locked in a Bank Statement/Sharpshooter combination.
At NXT UK TakeOver: Blackpool II, Storm competed unsuccesfully in a triple threat match for the NXT UK Women’s Championship against Kay Lee Ray and Piper Niven. Storm participated in the women's Royal Rumble match at the namesake pay-per-view and entered at number twenty, but was eliminated by Shayna Baszler. Storm wrestled her last match for the NXT UK brand on the February 27, 2020 episode, losing to Kay Lee Ray in an "I Quit" match.
After an eight-month hiatus, on October 4, 2020 at NXT TakeOver: 31, Toni returned to NXT following the NXT Women's Championship match between Io Shirai and Candice LeRae. On the November 25 episode of NXT, Toni attacked Ember Moon, thus turning heel for the first time in her WWE career. She then joined Candice LeRae's team with Dakota Kai and Raquel González for NXT TakeOver: WarGames. She competed in a triple threat match for the NXT Women's Championship involving Mercedes Martinez and reigning champion Io Shirai at NXT TakeOver: Vengeance Day in a losing effort. On the March 10, 2021 episode of NXT, Storm challenged Shirai for the title, where she was again unsuccessful. On the NXT TakeOver: Stand and Deliver pre-show, Storm was defeated by Zoey Stark.
On the July 9 episode of SmackDown, a video package aired hyping up Storm's arrival to the brand. She debuted on the July 23 episode of SmackDown, defeating Zelina Vega. In October, Storm entered the Queen's Crown tournament, where she lost to Zelina Vega in the first round. On November 19, Storm was announced as the final member of the Team SmackDown for the women's Survivor Series match at Survivor Series, replacing Aliyah. Storm would then begin a program with SmackDown Women's Champion Charlotte Flair, with Storm winning their first bout via disqualification. She then received her title opportunity on the Christmas Eve edition of SmackDown in a losing effort. This was her last televised appearance in WWE as the following week on December 29, 2021, Storm requested a release from her WWE contract.