diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c8043636acd..933081013f6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -295,9 +295,6 @@ jobs:
       - name: Run Valid Layers Checks
         run: yarn valid-layers-check
 
-      - name: Compile /build/
-        run: yarn --cwd build compile
-
       - name: Run eslint
         run: yarn eslint
 
diff --git a/build/azure-pipelines/darwin/product-build-darwin-sign.yml b/build/azure-pipelines/darwin/product-build-darwin-sign.yml
index 8b5dd741b51..a7d52870d49 100644
--- a/build/azure-pipelines/darwin/product-build-darwin-sign.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin-sign.yml
@@ -29,9 +29,15 @@ steps:
 
   - script: |
       set -e
-      yarn --cwd build
-      yarn --cwd build compile
-    displayName: Compile build tools
+      for i in {1..3}; do # try 3 times, for Terrapin
+        yarn --cwd build --frozen-lockfile && break
+        if [ $i -eq 3 ]; then
+          echo "Yarn failed too many times" >&2
+          exit 1
+        fi
+        echo "Yarn failed $i, trying again..."
+      done
+    displayName: Install build dependencies
 
   - download: current
     artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index 55f566ef945..91f522026a9 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -65,9 +65,15 @@ steps:
 
   - script: |
       set -e
-      yarn --cwd build
-      yarn --cwd build compile
-    displayName: Compile build tools
+      for i in {1..3}; do # try 3 times, for Terrapin
+        yarn --cwd build --frozen-lockfile && break
+        if [ $i -eq 3 ]; then
+          echo "Yarn failed too many times" >&2
+          exit 1
+        fi
+        echo "Yarn failed $i, trying again..."
+      done
+    displayName: Install build dependencies
 
   - script: |
       set -e
diff --git a/build/azure-pipelines/sdl-scan.yml b/build/azure-pipelines/sdl-scan.yml
index d417a1c4ed6..bf07555f674 100644
--- a/build/azure-pipelines/sdl-scan.yml
+++ b/build/azure-pipelines/sdl-scan.yml
@@ -173,9 +173,15 @@ stages:
 
           - script: |
               set -e
-              yarn --cwd build
-              yarn --cwd build compile
-            displayName: Compile build tools
+              for i in {1..3}; do # try 3 times, for Terrapin
+                yarn --cwd build --frozen-lockfile && break
+                if [ $i -eq 3 ]; then
+                  echo "Yarn failed too many times" >&2
+                  exit 1
+                fi
+                echo "Yarn failed $i, trying again..."
+              done
+            displayName: Install build dependencies
 
           - script: |
               set -e
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index a8c937858da..d84146565e2 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -24,7 +24,7 @@ steps:
   - task: ExtractFiles@1
     displayName: Extract compilation output
     inputs:
-      archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/compilation.tar.gz'
+      archiveFilePatterns: "$(Build.ArtifactStagingDirectory)/compilation.tar.gz"
       cleanDestinationFolder: false
 
   - powershell: |
@@ -273,14 +273,6 @@ steps:
     displayName: Download ESRPClient
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-  - powershell: |
-      . build/azure-pipelines/win32/exec.ps1
-      $ErrorActionPreference = "Stop"
-      exec { yarn --cwd build }
-      exec { yarn --cwd build compile }
-    displayName: Compile build tools
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"