Move rdo juno enablement up earlier