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 has partnered with Elon Musk’s artificial intelligence venture, xAI, to bring its Grok AI models to the Azure cloud platform, despite recent criticism over the chatbot’s politically charged and racially controversial outputs.

In a move that could redefine its AI alliances, Microsoft has added Elon Musk’s Grok to Azure AI Foundry—making the controversial xAI model available to developers and enterprises through the same platform that powers OpenAI’s ChatGPT.