Add keys and try auto upgrade again