HCSVLAB-625: Yet another config tweak