One embodiment provides a method of determining a revised firmware upgrade plan for one or more devices, said method including: utilizing at least one processor to execute computer code that performs the steps of: selecting, in view of a predetermined change window and risk associated with the firmware upgrade plan, a firmware upgrade plan; detecting a failure during execution of the firmware upgrade plan; and responsive to the detecting, identifying a revised firmware upgrade plan based on time remaining in the predetermined change window and risk associated with the revised firmware upgrade plan. Other aspects are described and claimed.