The Confederation of African Football (CAF) President Patrice Motsepe said that both the Champions League and Confederation Cup finals will return to the two-leg format instead of the one-leg format applied in the last three editions.