CDH-10439: Paramterize repos and fix repo version switch bug