Move keyring settings into persisted config