Revert "Revert "more config updates""

This reverts commit ff95a3b2bea200f0806c348662eb6871c9a0df7e.