Reorder deployment tasks and get rid of immediate runs