diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml
index b5ab7b432a..e327231d64 100644
--- a/build/ci/phase-template.yml
+++ b/build/ci/phase-template.yml
@@ -11,6 +11,7 @@ phases:
       _phaseName: ${{ parameters.name }}
       _arch: ${{ parameters.architecture }}
     queue:
+      timeoutInMinutes: 40
       parallel: 99
       matrix:
         Build_Debug:
@@ -40,21 +41,21 @@ phases:
         mergeTestResults: true
     - task: CopyFiles@2
       displayName: Stage build logs
-      condition: failed()
+      condition: not(succeeded())
       inputs:
         sourceFolder: $(Build.SourcesDirectory)
         contents: '?(msbuild.*|binclash.log|init-tools.log)'
         targetFolder: $(Build.ArtifactStagingDirectory)
     - task: CopyFiles@2
       displayName: Stage test output
-      condition: failed()
+      condition: not(succeeded())
       inputs:
         sourceFolder: $(Build.SourcesDirectory)/bin
         contents: '**/TestOutput/**/*'
         targetFolder: $(Build.ArtifactStagingDirectory)
     - task: PublishBuildArtifacts@1
       displayName: Publish build and test logs
-      condition: failed()
+      condition: not(succeeded())
       inputs:
         pathToPublish: $(Build.ArtifactStagingDirectory)
         artifactName: ${{ parameters.name }} $(_config_short)