Move namespace-aware flag setting to config file