Fix upgrade for different vendor release