CAAT-2607 Fix build option

Also made improvement to only re-apply config when necessary