The last final will be repeated in the new-look league stage.
Reigning champions Real Madrid will meet Borussia Dortmund at Santiago Bernabeu.
Every team will play eight matches as per the new Champions League format.
Real Madrid will face Liverpool in an away fixture at Anfield.
German champions Bayer Leverkusen will also travel to Liverpool.
Real Madrid will play a home match against Italian side AC Milan.
Manchester City will take on Serie A winners Inter Milan at home.
Pep Guardiola’s side will play Juventus and Paris Saint Germain away from home.
PSG will need to overcome Bayern Munich and Arsenal as well.
The Gunners will square off against Inter Milan in an away game.