Make sure deploys all happen at once and only after everything else succeeded
(cherry picked from commit cc3f113f)