DEV-3832 Switching from namespaces, also doing some config