 In 1997, Castillo made his move to the World Wrestling Federation, as a member of the Los Boricuas stable, which was led by Savio Vega.Castillo mainly competed in tag team matches with other members of the group José Estrada Jr., Miguel Pérez, and leader Savio Vega.In summer 1998, Castillo became a jobber, competing on Shotgun, losing to superstars; featuring a young Edge, X-Pac and Dan Severn.