Follow up to !45146 (merged)
Run-3 CA-based config also updated consistently with some tools needed as public
FYI @ncalace @nstyles @goblirsc @vcairo @npetters