Update to use config for master key