events: improve upgrade-step