If you’re like me, you’ve been waiting patiently for Fat Joe and Remy Ma’s Plata o Plomo, the long-awaited collaborative album that gave us hope Fat Joe’s pyramid scheme days were over. You’ve bumped the “All the Way Up” remix at rude volumes. You’ve seen Remy perform during DJ Khaled’s set on Beyoncé’s Formation Tour. Now, just before the release of the album on February 17, Fat Joe is revealing another beef-squashing surprise: the Bronx-born rapper just signed a management deal with Jay-Z’s Roc Nation agency, according to Billboard.

Hip-hop rumor sites have long speculated about Sean Carter and Joey Crack’s rivalry, which created tension between the Terror Squad and Roc-a-Fella crews for years. Last May, Joe and Jay signaled the public end of their beef with a remix of “All the Way Up” and a photo opp backstage during the Formation Tour. The Roc Nation co-sign seems to signal a solid comeback for Joe, perhaps even a sign that solo material could be coming soon. Fat Joe’s return to New York hip-hop would be a welcome ray of light, especially after last summer’s shooting of rapper Troy Ave has raised questions about the survival of the city’s hip-hop infrastructure. We’ll just have to wait and see what the partnership will bring.

In the meantime, watch the just-released video for the Plata o Plomo album cut “Money Showers” via Tidal below.