Moving more config to uhh config.