Move upgrade into next unused version