Add setting for keychain
Fix script