Shepard, who starred in and directed the big-screen adaptation of CHIPS early this year, popped up on Fox comedy Ghosted over the weekend. He joins a Will & Grace guest lineup that has also welcomed Jane Lynch and Max Greenfield.
Will & Grace, which was revived this fall by NBC after a decade-long hiatus, has already been renewed for another season. The current season consists of 16 episodes.
Will & Grace airs Thursdays at 9 p.m. ET/PT on NBC.
This article originally appeared on PEOPLE.