Munster will meet Racing 92 and Leicester Tigers once again in the pool stage of the Champions Cup next season.
The draw, which took place on Thursday morning, also saw Leinster and Ulster discover their faith regarding pool opposition for next season's campaign.
Munster were placed into tier 1 before the draw which meant they avoided last year's finalists Clermont and English Premiership side, Wasps.
They will face French side Castres as well as Racing and Leicester in Pool 4.
In Pool 3, Leinster will take on Exeter Chiefs, Montpellier and Glasgow.
Pool 1 sees Wasps, Harlequins and last season's Top 14 table-toppers La Rochelle battle it out with Ulster.
Here is the draw in full #ChampionsCupDraw pic.twitter.com/jDp8e6vaTH
— Newstalk Sport (@NewstalkSport) June 8, 2017
In the Challenge Cup, Connacht have been drawn alongside Donncha O'Callaghan's Worcester Warriors, Brive and Oyonnax.
Here are the Pool draws in full.
Oyonnax completes Pool 5 in the Challenge Cup#ChampionsCupDraw pic.twitter.com/6fwrW0Iw4Z
— Newstalk Sport (@NewstalkSport) June 8, 2017
Download the brand new OffTheBall App in the Play Store & App Store right now! We've got you covered!
Subscribe to OffTheBall's YouTube channel for more videos, like us on Facebook or follow us on Twitter for the latest sporting news and content.