Buprenorphine is one of the gold standard medication treatments for opioid use disorder (OUD), with proven effectiveness in preventing overdose, increasing abstinence, and improving quality of life. In the United States, buprenorphine can be legally prescribed and administered in office-based settings from clinicians who are specially credentialed to provide that care under the X-waiver. We believe the X-waiver will ultimately be repealed, but there is a need for a variety of strategies to create a new treatment system after the X-waiver. Building a new tier of treatment capacity will require educational outreach, systems strategies, and enhanced payments.