Rework config file and add vault.system ns.