Post 12.1.0 change to distro configuration