The announcement was made at Microsoft’s Build developer conference on Monday, and was notable given Microsoft’s partnership with OpenAI. Musk founded xAI, the startup behind Grok, but he has also been locked in a feud with OpenAI since stepping down from its board in the late 2010s, citing disagreements over its leadership direction.

Microsoft on Monday announced a partnership with Elon Musk’s AI startup xAI, bringing its controversial Grok models to the company’s cloud platform Azure. The news came during the kickoff of Microsoft’s Build developer conference,