diff --git a/build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml b/build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml
index 431eb8ec09b63..4c29271f35a77 100644
--- a/build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml
@@ -18,7 +18,7 @@ steps:
 
   - script: |
       set -e
-      npx https://aka.ms/enablesecurefeed standAlone
+      npm install https://aka.ms/enablesecurefeed --global && npm exec terrapinadotask -- standAlone
     timeoutInMinutes: 5
     retryCountOnTaskFailure: 3
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
@@ -40,6 +40,6 @@ steps:
     parameters:
       VSCODE_CLI_ARTIFACTS:
         - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
-          - unsigned_vscode_cli_darwin_x64_cli
+            - unsigned_vscode_cli_darwin_x64_cli
         - ${{ if eq(parameters.VSCODE_BUILD_MACOS_ARM64, true) }}:
-          - unsigned_vscode_cli_darwin_arm64_cli
+            - unsigned_vscode_cli_darwin_arm64_cli
diff --git a/build/azure-pipelines/darwin/product-build-darwin-sign.yml b/build/azure-pipelines/darwin/product-build-darwin-sign.yml
index a4ac373110405..c58b5ef1bb485 100644
--- a/build/azure-pipelines/darwin/product-build-darwin-sign.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin-sign.yml
@@ -69,7 +69,7 @@ steps:
 
   - script: |
       set -e
-      npx https://aka.ms/enablesecurefeed standAlone
+      npm install https://aka.ms/enablesecurefeed --global && npm exec terrapinadotask -- standAlone
     timeoutInMinutes: 5
     retryCountOnTaskFailure: 3
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
diff --git a/build/azure-pipelines/darwin/product-build-darwin-universal.yml b/build/azure-pipelines/darwin/product-build-darwin-universal.yml
index ebc7104d6ce5b..393308f99b5b5 100644
--- a/build/azure-pipelines/darwin/product-build-darwin-universal.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin-universal.yml
@@ -69,7 +69,7 @@ steps:
 
   - script: |
       set -e
-      npx https://aka.ms/enablesecurefeed standAlone
+      npm install https://aka.ms/enablesecurefeed --global && npm exec terrapinadotask -- standAlone
     timeoutInMinutes: 5
     retryCountOnTaskFailure: 3
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index f8e3e1d2666be..7ccd0344d2ca4 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -14,62 +14,62 @@ parameters:
 
 steps:
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-    - checkout: self
-      fetchDepth: 1
-      retryCountOnTaskFailure: 3
+      - checkout: self
+        fetchDepth: 1
+        retryCountOnTaskFailure: 3
 
   - task: NodeTool@0
     inputs:
       versionSpec: "16.x"
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - task: AzureKeyVault@1
-      displayName: "Azure Key Vault: Get Secrets"
-      inputs:
-        azureSubscription: "vscode-builds-subscription"
-        KeyVaultName: vscode
-        SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key"
+      - task: AzureKeyVault@1
+        displayName: "Azure Key Vault: Get Secrets"
+        inputs:
+          azureSubscription: "vscode-builds-subscription"
+          KeyVaultName: vscode
+          SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key"
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        artifact: Compilation
-        path: $(Build.ArtifactStagingDirectory)
-      displayName: Download compilation output
+      - task: DownloadPipelineArtifact@2
+        inputs:
+          artifact: Compilation
+          path: $(Build.ArtifactStagingDirectory)
+        displayName: Download compilation output
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
-      displayName: Extract compilation output
+      - script: |
+          set -e
+          tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
+        displayName: Extract compilation output
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        cat << EOF > ~/.netrc
-        machine github.com
-        login vscode
-        password $(github-distro-mixin-password)
-        EOF
-
-        git config user.email "vscode@microsoft.com"
-        git config user.name "VSCode"
-      displayName: Prepare tooling
+      - script: |
+          set -e
+          cat << EOF > ~/.netrc
+          machine github.com
+          login vscode
+          password $(github-distro-mixin-password)
+          EOF
+
+          git config user.email "vscode@microsoft.com"
+          git config user.name "VSCode"
+        displayName: Prepare tooling
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
-        echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
-        git checkout FETCH_HEAD
-      condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
-      displayName: Checkout override commit
+      - script: |
+          set -e
+          git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
+          echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
+          git checkout FETCH_HEAD
+        condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
+        displayName: Checkout override commit
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
-      displayName: Merge distro
+      - script: |
+          set -e
+          git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
+        displayName: Merge distro
 
   - script: |
       mkdir -p .build
@@ -98,7 +98,7 @@ steps:
 
   - script: |
       set -e
-      npx https://aka.ms/enablesecurefeed standAlone
+      npm install https://aka.ms/enablesecurefeed --global && npm exec terrapinadotask -- standAlone
     timeoutInMinutes: 5
     retryCountOnTaskFailure: 3
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
@@ -140,40 +140,40 @@ steps:
     displayName: Create node_modules archive
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    # This script brings in the right resources (images, icons, etc) based on the quality (insiders, stable, exploration)
-    - script: |
-        set -e
-        node build/azure-pipelines/mixin
-      displayName: Mix in quality
+      # This script brings in the right resources (images, icons, etc) based on the quality (insiders, stable, exploration)
+      - script: |
+          set -e
+          node build/azure-pipelines/mixin
+        displayName: Mix in quality
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-          yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
-      displayName: Build client
+      - script: |
+          set -e
+          VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+            yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
+        displayName: Build client
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        node build/azure-pipelines/mixin --server
-      displayName: Mix in server quality
+      - script: |
+          set -e
+          node build/azure-pipelines/mixin --server
+        displayName: Mix in server quality
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-          yarn gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci
-        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-          yarn gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci
-      displayName: Build Server
+      - script: |
+          set -e
+          VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+            yarn gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci
+          VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+            yarn gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci
+        displayName: Build Server
 
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-          yarn gulp "transpile-client-swc" "transpile-extensions"
-      displayName: Transpile
+      - script: |
+          set -e
+          VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+            yarn gulp "transpile-client-swc" "transpile-extensions"
+        displayName: Transpile
 
   - script: |
       set -e
@@ -183,132 +183,132 @@ steps:
     displayName: Find application path
 
   - ${{ if eq(parameters.VSCODE_BUILD_TUNNEL_CLI, true) }}:
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        artifact: unsigned_vscode_cli_darwin_arm64_cli
-        patterns: '**'
-        path: $(Build.ArtifactStagingDirectory)/cli
-      displayName: Download VS Code CLI
-      condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
-
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        artifact: unsigned_vscode_cli_darwin_x64_cli
-        patterns: '**'
-        path: $(Build.ArtifactStagingDirectory)/cli
-      displayName: Download VS Code CLI
-      condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
-
-    - script: |
-        set -e
-        ARCHIVE_NAME=$(ls "$(Build.ArtifactStagingDirectory)/cli" | head -n 1)
-        unzip "$(Build.ArtifactStagingDirectory)/cli/$ARCHIVE_NAME" -d "$(APP_PATH)/Contents/Resources/app/bin"
-        chmod +x "$(APP_PATH)/Contents/Resources/app/bin/code-tunnel"
-        if [ "$(VSCODE_QUALITY)" != "stable" ]; then
-          mv "$(APP_PATH)/Contents/Resources/app/bin/code-tunnel" "$(APP_PATH)/Contents/Resources/app/bin/code-tunnel-$(VSCODE_QUALITY)"
-        fi
-      displayName: Make CLI executable
+      - task: DownloadPipelineArtifact@2
+        inputs:
+          artifact: unsigned_vscode_cli_darwin_arm64_cli
+          patterns: "**"
+          path: $(Build.ArtifactStagingDirectory)/cli
+        displayName: Download VS Code CLI
+        condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
+
+      - task: DownloadPipelineArtifact@2
+        inputs:
+          artifact: unsigned_vscode_cli_darwin_x64_cli
+          patterns: "**"
+          path: $(Build.ArtifactStagingDirectory)/cli
+        displayName: Download VS Code CLI
+        condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
+
+      - script: |
+          set -e
+          ARCHIVE_NAME=$(ls "$(Build.ArtifactStagingDirectory)/cli" | head -n 1)
+          unzip "$(Build.ArtifactStagingDirectory)/cli/$ARCHIVE_NAME" -d "$(APP_PATH)/Contents/Resources/app/bin"
+          chmod +x "$(APP_PATH)/Contents/Resources/app/bin/code-tunnel"
+          if [ "$(VSCODE_QUALITY)" != "stable" ]; then
+            mv "$(APP_PATH)/Contents/Resources/app/bin/code-tunnel" "$(APP_PATH)/Contents/Resources/app/bin/code-tunnel-$(VSCODE_QUALITY)"
+          fi
+        displayName: Make CLI executable
 
   - ${{ if or(eq(parameters.VSCODE_RUN_UNIT_TESTS, true), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-    - template: product-build-darwin-test.yml
-      parameters:
-        VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
-        VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
-        VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
-        VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}
+      - template: product-build-darwin-test.yml
+        parameters:
+          VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
+          VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
+          VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
+          VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}
 
   - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
-    # Setting hardened entitlements is a requirement for:
-    # * Apple notarization
-    # * Running tests on Big Sur (because Big Sur has additional security precautions)
-    - script: |
-        set -e
-        security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
-        security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
-        security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
-        echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
-        security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
-        security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
-        VSCODE_ARCH=$(VSCODE_ARCH) DEBUG=electron-osx-sign* node build/darwin/sign.js
-      displayName: Set Hardened Entitlements
+      # Setting hardened entitlements is a requirement for:
+      # * Apple notarization
+      # * Running tests on Big Sur (because Big Sur has additional security precautions)
+      - script: |
+          set -e
+          security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+          security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
+          security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+          echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
+          security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
+          VSCODE_ARCH=$(VSCODE_ARCH) DEBUG=electron-osx-sign* node build/darwin/sign.js
+        displayName: Set Hardened Entitlements
 
   - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-    - script: |
-        set -e
-        pushd $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) && zip -r -X -y $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip * && popd
-      displayName: Archive build
+      - script: |
+          set -e
+          pushd $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) && zip -r -X -y $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip * && popd
+        displayName: Archive build
 
   - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-    - script: |
-        set -e
+      - script: |
+          set -e
 
-        # package Remote Extension Host
-        pushd .. && mv vscode-reh-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH) && zip -Xry vscode-server-darwin-$(VSCODE_ARCH).zip vscode-server-darwin-$(VSCODE_ARCH) && popd
+          # package Remote Extension Host
+          pushd .. && mv vscode-reh-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH) && zip -Xry vscode-server-darwin-$(VSCODE_ARCH).zip vscode-server-darwin-$(VSCODE_ARCH) && popd
 
-        # package Remote Extension Host (Web)
-        pushd .. && mv vscode-reh-web-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH)-web && zip -Xry vscode-server-darwin-$(VSCODE_ARCH)-web.zip vscode-server-darwin-$(VSCODE_ARCH)-web && popd
-      displayName: Prepare to publish servers
+          # package Remote Extension Host (Web)
+          pushd .. && mv vscode-reh-web-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH)-web && zip -Xry vscode-server-darwin-$(VSCODE_ARCH)-web.zip vscode-server-darwin-$(VSCODE_ARCH)-web && popd
+        displayName: Prepare to publish servers
 
   - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-      displayName: Generate SBOM (client)
-      inputs:
-        BuildDropPath: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-        PackageName: Visual Studio Code
+      - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+        displayName: Generate SBOM (client)
+        inputs:
+          BuildDropPath: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+          PackageName: Visual Studio Code
 
   - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-    - publish: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)/_manifest
-      displayName: Publish SBOM (client)
-      artifact: vscode_client_darwin_$(VSCODE_ARCH)_sbom
+      - publish: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)/_manifest
+        displayName: Publish SBOM (client)
+        artifact: vscode_client_darwin_$(VSCODE_ARCH)_sbom
 
   - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-      displayName: Generate SBOM (server)
-      inputs:
-        BuildDropPath: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
-        PackageName: Visual Studio Code Server
+      - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+        displayName: Generate SBOM (server)
+        inputs:
+          BuildDropPath: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
+          PackageName: Visual Studio Code Server
 
   - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-    - publish: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)/_manifest
-      displayName: Publish SBOM (server)
-      artifact: vscode_server_darwin_$(VSCODE_ARCH)_sbom
+      - publish: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)/_manifest
+        displayName: Publish SBOM (server)
+        artifact: vscode_server_darwin_$(VSCODE_ARCH)_sbom
 
   - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-    - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
-      artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
-      displayName: Publish client archive
+      - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
+        artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
+        displayName: Publish client archive
 
   - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-    - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH).zip
-      artifact: vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned
-      displayName: Publish server archive
+      - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH).zip
+        artifact: vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned
+        displayName: Publish server archive
 
   - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-    - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH)-web.zip
-      artifact: vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned
-      displayName: Publish web server archive
+      - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH)-web.zip
+        artifact: vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned
+        displayName: Publish web server archive
 
   - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-    - task: AzureCLI@2
-      inputs:
-        azureSubscription: "vscode-builds-subscription"
-        scriptType: pscore
-        scriptLocation: inlineScript
-        addSpnToEnvironment: true
-        inlineScript: |
-          Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId"
-          Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId"
-          Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey"
+      - task: AzureCLI@2
+        inputs:
+          azureSubscription: "vscode-builds-subscription"
+          scriptType: pscore
+          scriptLocation: inlineScript
+          addSpnToEnvironment: true
+          inlineScript: |
+            Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId"
+            Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId"
+            Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey"
 
   - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}:
-    - script: |
-        set -e
-        AZURE_STORAGE_ACCOUNT="ticino" \
-        AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
-        AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
-        AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \
-        VSCODE_ARCH="$(VSCODE_ARCH)" \
-          node build/azure-pipelines/upload-configuration
-      displayName: Upload configuration (for Bing settings search)
-      condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
-      continueOnError: true
+      - script: |
+          set -e
+          AZURE_STORAGE_ACCOUNT="ticino" \
+          AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
+          AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
+          AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \
+          VSCODE_ARCH="$(VSCODE_ARCH)" \
+            node build/azure-pipelines/upload-configuration
+        displayName: Upload configuration (for Bing settings search)
+        condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
+        continueOnError: true
diff --git a/build/azure-pipelines/linux/product-build-alpine.yml b/build/azure-pipelines/linux/product-build-alpine.yml
index c60f16d080450..34f08bd48c76d 100644
--- a/build/azure-pipelines/linux/product-build-alpine.yml
+++ b/build/azure-pipelines/linux/product-build-alpine.yml
@@ -82,7 +82,7 @@ steps:
 
   - script: |
       set -e
-      npx https://aka.ms/enablesecurefeed standAlone
+      npm install https://aka.ms/enablesecurefeed --global && npm exec terrapinadotask -- standAlone
     timeoutInMinutes: 5
     retryCountOnTaskFailure: 3
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
diff --git a/build/azure-pipelines/linux/product-build-linux-client.yml b/build/azure-pipelines/linux/product-build-linux-client.yml
index 13f48d400da07..9b22c4b26e6da 100644
--- a/build/azure-pipelines/linux/product-build-linux-client.yml
+++ b/build/azure-pipelines/linux/product-build-linux-client.yml
@@ -14,81 +14,81 @@ parameters:
 
 steps:
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-    - checkout: self
-      fetchDepth: 1
-      retryCountOnTaskFailure: 3
+      - checkout: self
+        fetchDepth: 1
+        retryCountOnTaskFailure: 3
 
   - task: NodeTool@0
     inputs:
       versionSpec: "16.x"
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - task: AzureKeyVault@1
-      displayName: "Azure Key Vault: Get Secrets"
-      inputs:
-        azureSubscription: "vscode-builds-subscription"
-        KeyVaultName: vscode
-        SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
+      - task: AzureKeyVault@1
+        displayName: "Azure Key Vault: Get Secrets"
+        inputs:
+          azureSubscription: "vscode-builds-subscription"
+          KeyVaultName: vscode
+          SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        artifact: Compilation
-        path: $(Build.ArtifactStagingDirectory)
-      displayName: Download compilation output
+      - task: DownloadPipelineArtifact@2
+        inputs:
+          artifact: Compilation
+          path: $(Build.ArtifactStagingDirectory)
+        displayName: Download compilation output
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        artifact: reh_node_modules-$(VSCODE_ARCH)
-        path: $(Build.ArtifactStagingDirectory)
-      displayName: Download server build dependencies
-      condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'armhf'))
+      - task: DownloadPipelineArtifact@2
+        inputs:
+          artifact: reh_node_modules-$(VSCODE_ARCH)
+          path: $(Build.ArtifactStagingDirectory)
+        displayName: Download server build dependencies
+        condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'armhf'))
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        # Start X server
-        /etc/init.d/xvfb start
-        # Start dbus session
-        DBUS_LAUNCH_RESULT=$(sudo dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address)
-        echo "##vso[task.setvariable variable=DBUS_SESSION_BUS_ADDRESS]$DBUS_LAUNCH_RESULT"
-      displayName: Setup system services
-      condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
+      - script: |
+          set -e
+          # Start X server
+          /etc/init.d/xvfb start
+          # Start dbus session
+          DBUS_LAUNCH_RESULT=$(sudo dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address)
+          echo "##vso[task.setvariable variable=DBUS_SESSION_BUS_ADDRESS]$DBUS_LAUNCH_RESULT"
+        displayName: Setup system services
+        condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
-      displayName: Extract compilation output
+      - script: |
+          set -e
+          tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
+        displayName: Extract compilation output
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        cat << EOF > ~/.netrc
-        machine github.com
-        login vscode
-        password $(github-distro-mixin-password)
-        EOF
-
-        git config user.email "vscode@microsoft.com"
-        git config user.name "VSCode"
-      displayName: Prepare tooling
+      - script: |
+          set -e
+          cat << EOF > ~/.netrc
+          machine github.com
+          login vscode
+          password $(github-distro-mixin-password)
+          EOF
+
+          git config user.email "vscode@microsoft.com"
+          git config user.name "VSCode"
+        displayName: Prepare tooling
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
-        echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
-        git checkout FETCH_HEAD
-      condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
-      displayName: Checkout override commit
+      - script: |
+          set -e
+          git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
+          echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
+          git checkout FETCH_HEAD
+        condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
+        displayName: Checkout override commit
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
-      displayName: Merge distro
+      - script: |
+          set -e
+          git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
+        displayName: Merge distro
 
   - script: |
       mkdir -p .build
@@ -97,20 +97,20 @@ steps:
     displayName: Prepare yarn cache flags
 
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-    - task: Cache@2
-      inputs:
-        key: "genericNodeModules | $(Agent.OS) | .build/yarnlockhash"
-        path: .build/node_modules_cache
-        cacheHitVar: NODE_MODULES_RESTORED
-      displayName: Restore node_modules cache
+      - task: Cache@2
+        inputs:
+          key: "genericNodeModules | $(Agent.OS) | .build/yarnlockhash"
+          path: .build/node_modules_cache
+          cacheHitVar: NODE_MODULES_RESTORED
+        displayName: Restore node_modules cache
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - task: Cache@2
-      inputs:
-        key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
-        path: .build/node_modules_cache
-        cacheHitVar: NODE_MODULES_RESTORED
-      displayName: Restore node_modules cache
+      - task: Cache@2
+        inputs:
+          key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
+          path: .build/node_modules_cache
+          cacheHitVar: NODE_MODULES_RESTORED
+        displayName: Restore node_modules cache
 
   - task: Cache@2
     inputs:
@@ -126,7 +126,7 @@ steps:
 
   - script: |
       set -e
-      npx https://aka.ms/enablesecurefeed standAlone
+      npm install https://aka.ms/enablesecurefeed --global && npm exec terrapinadotask -- standAlone
     timeoutInMinutes: 5
     retryCountOnTaskFailure: 3
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
@@ -204,12 +204,12 @@ steps:
     displayName: Download missing built-in extensions
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        rm -rf remote/node_modules
-        tar -xzf $(Build.ArtifactStagingDirectory)/reh_node_modules-$(VSCODE_ARCH).tar.gz --directory $(Build.SourcesDirectory)/remote
-      displayName: Extract server node_modules output
-      condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'armhf'))
+      - script: |
+          set -e
+          rm -rf remote/node_modules
+          tar -xzf $(Build.ArtifactStagingDirectory)/reh_node_modules-$(VSCODE_ARCH).tar.gz --directory $(Build.SourcesDirectory)/remote
+        displayName: Extract server node_modules output
+        condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'armhf'))
 
   - script: |
       set -e
@@ -220,160 +220,160 @@ steps:
     displayName: Create node_modules archive
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        node build/azure-pipelines/mixin
-      displayName: Mix in quality
+      - script: |
+          set -e
+          node build/azure-pipelines/mixin
+        displayName: Mix in quality
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-          yarn gulp vscode-linux-$(VSCODE_ARCH)-min-ci
-      displayName: Build
+      - script: |
+          set -e
+          VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+            yarn gulp vscode-linux-$(VSCODE_ARCH)-min-ci
+        displayName: Build
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        node build/azure-pipelines/mixin --server
-      displayName: Mix in server quality
+      - script: |
+          set -e
+          node build/azure-pipelines/mixin --server
+        displayName: Mix in server quality
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-          yarn gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci
-        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-          yarn gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
-      displayName: Build Server
+      - script: |
+          set -e
+          VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+            yarn gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci
+          VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+            yarn gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
+        displayName: Build Server
 
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-          yarn gulp "transpile-client-swc" "transpile-extensions"
-      displayName: Transpile
+      - script: |
+          set -e
+          VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+            yarn gulp "transpile-client-swc" "transpile-extensions"
+        displayName: Transpile
 
   - ${{ if eq(parameters.VSCODE_BUILD_TUNNEL_CLI, true) }}:
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        artifact: vscode_cli_linux_arm64_cli
-        patterns: '**'
-        path: $(Build.ArtifactStagingDirectory)/cli
-      displayName: Download VS Code CLI
-      condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
-
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        artifact: vscode_cli_linux_x64_cli
-        patterns: '**'
-        path: $(Build.ArtifactStagingDirectory)/cli
-      displayName: Download VS Code CLI
-      condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
-
-    - script: |
-        set -e
-        tar -xzvf $(Build.ArtifactStagingDirectory)/cli/*.tar.gz -C $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/bin
-        if [ "$(VSCODE_QUALITY)" != "stable" ]; then
-          mv "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/bin/code-tunnel" "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/bin/code-tunnel-$(VSCODE_QUALITY)"
-        fi
-      displayName: Make CLI executable
+      - task: DownloadPipelineArtifact@2
+        inputs:
+          artifact: vscode_cli_linux_arm64_cli
+          patterns: "**"
+          path: $(Build.ArtifactStagingDirectory)/cli
+        displayName: Download VS Code CLI
+        condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
+
+      - task: DownloadPipelineArtifact@2
+        inputs:
+          artifact: vscode_cli_linux_x64_cli
+          patterns: "**"
+          path: $(Build.ArtifactStagingDirectory)/cli
+        displayName: Download VS Code CLI
+        condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
+
+      - script: |
+          set -e
+          tar -xzvf $(Build.ArtifactStagingDirectory)/cli/*.tar.gz -C $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/bin
+          if [ "$(VSCODE_QUALITY)" != "stable" ]; then
+            mv "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/bin/code-tunnel" "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/bin/code-tunnel-$(VSCODE_QUALITY)"
+          fi
+        displayName: Make CLI executable
 
   - ${{ if or(eq(parameters.VSCODE_RUN_UNIT_TESTS, true), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
-    - template: product-build-linux-client-test.yml
-      parameters:
-        VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
-        VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
-        VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
-        VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}
+      - template: product-build-linux-client-test.yml
+        parameters:
+          VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
+          VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
+          VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
+          VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}
 
   - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
-    - script: |
-        set -e
-        yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-deb"
-        yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-rpm"
-      displayName: Build deb, rpm packages
+      - script: |
+          set -e
+          yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-deb"
+          yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-rpm"
+        displayName: Build deb, rpm packages
 
   - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
-    - script: |
-        set -e
-        yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
-      displayName: Prepare snap package
+      - script: |
+          set -e
+          yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
+        displayName: Prepare snap package
 
   - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
-    - task: UseDotNet@2
-      inputs:
-        version: 2.x
+      - task: UseDotNet@2
+        inputs:
+          version: 2.x
 
   - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
-    - task: EsrpClientTool@1
-      displayName: Download ESRPClient
+      - task: EsrpClientTool@1
+        displayName: Download ESRPClient
 
   - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
-    - script: |
-        set -e
-        node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" rpm $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) .build/linux/rpm '*.rpm'
-      displayName: Codesign rpm
+      - script: |
+          set -e
+          node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" rpm $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) .build/linux/rpm '*.rpm'
+        displayName: Codesign rpm
 
   - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
-    - script: |
-        set -e
-        VSCODE_ARCH="$(VSCODE_ARCH)" \
-        ./build/azure-pipelines/linux/prepare-publish.sh
-      displayName: Prepare for Publish
+      - script: |
+          set -e
+          VSCODE_ARCH="$(VSCODE_ARCH)" \
+          ./build/azure-pipelines/linux/prepare-publish.sh
+        displayName: Prepare for Publish
 
   - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-      displayName: Generate SBOM (client)
-      inputs:
-        BuildDropPath: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
-        PackageName: Visual Studio Code
+      - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+        displayName: Generate SBOM (client)
+        inputs:
+          BuildDropPath: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
+          PackageName: Visual Studio Code
 
   - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
-    - publish: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/_manifest
-      displayName: Publish SBOM (client)
-      artifact: vscode_client_linux_$(VSCODE_ARCH)_sbom
+      - publish: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/_manifest
+        displayName: Publish SBOM (client)
+        artifact: vscode_client_linux_$(VSCODE_ARCH)_sbom
 
   - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
-    - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-      displayName: Generate SBOM (server)
-      inputs:
-        BuildDropPath: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)
-        PackageName: Visual Studio Code Server
+      - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+        displayName: Generate SBOM (server)
+        inputs:
+          BuildDropPath: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)
+          PackageName: Visual Studio Code Server
 
   - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
-    - publish: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)/_manifest
-      displayName: Publish SBOM (server)
-      artifact: vscode_server_linux_$(VSCODE_ARCH)_sbom
+      - publish: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)/_manifest
+        displayName: Publish SBOM (server)
+        artifact: vscode_server_linux_$(VSCODE_ARCH)_sbom
 
   - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
-    - publish: $(DEB_PATH)
-      artifact: vscode_client_linux_$(VSCODE_ARCH)_deb-package
-      displayName: Publish deb package
+      - publish: $(DEB_PATH)
+        artifact: vscode_client_linux_$(VSCODE_ARCH)_deb-package
+        displayName: Publish deb package
 
   - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
-    - publish: $(RPM_PATH)
-      artifact: vscode_client_linux_$(VSCODE_ARCH)_rpm-package
-      displayName: Publish rpm package
+      - publish: $(RPM_PATH)
+        artifact: vscode_client_linux_$(VSCODE_ARCH)_rpm-package
+        displayName: Publish rpm package
 
   - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
-    - publish: $(TARBALL_PATH)
-      artifact: vscode_client_linux_$(VSCODE_ARCH)_archive-unsigned
-      displayName: Publish client archive
+      - publish: $(TARBALL_PATH)
+        artifact: vscode_client_linux_$(VSCODE_ARCH)_archive-unsigned
+        displayName: Publish client archive
 
   - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
-    - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH).tar.gz
-      artifact: vscode_server_linux_$(VSCODE_ARCH)_archive-unsigned
-      displayName: Publish server archive
+      - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH).tar.gz
+        artifact: vscode_server_linux_$(VSCODE_ARCH)_archive-unsigned
+        displayName: Publish server archive
 
   - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
-    - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH)-web.tar.gz
-      artifact: vscode_web_linux_$(VSCODE_ARCH)_archive-unsigned
-      displayName: Publish web server archive
+      - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH)-web.tar.gz
+        artifact: vscode_web_linux_$(VSCODE_ARCH)_archive-unsigned
+        displayName: Publish web server archive
 
   - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}:
-    - task: PublishPipelineArtifact@0
-      displayName: "Publish Pipeline Artifact"
-      inputs:
-        artifactName: "snap-$(VSCODE_ARCH)"
-        targetPath: .build/linux/snap-tarball
+      - task: PublishPipelineArtifact@0
+        displayName: "Publish Pipeline Artifact"
+        inputs:
+          artifactName: "snap-$(VSCODE_ARCH)"
+          targetPath: .build/linux/snap-tarball
diff --git a/build/azure-pipelines/linux/product-build-linux-server.yml b/build/azure-pipelines/linux/product-build-linux-server.yml
index 8ab58da435cc6..ebec4113dc456 100644
--- a/build/azure-pipelines/linux/product-build-linux-server.yml
+++ b/build/azure-pipelines/linux/product-build-linux-server.yml
@@ -8,55 +8,55 @@ steps:
       versionSpec: "16.x"
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - task: AzureKeyVault@1
-      displayName: "Azure Key Vault: Get Secrets"
-      inputs:
-        azureSubscription: "vscode-builds-subscription"
-        KeyVaultName: vscode
-        SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
+      - task: AzureKeyVault@1
+        displayName: "Azure Key Vault: Get Secrets"
+        inputs:
+          azureSubscription: "vscode-builds-subscription"
+          KeyVaultName: vscode
+          SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - task: Docker@1
-      displayName: "Pull Docker image"
-      inputs:
-        azureSubscriptionEndpoint: "vscode-builds-subscription"
-        azureContainerRegistry: vscodehub.azurecr.io
-        command: "Run an image"
-        imageName: "vscode-linux-build-agent:centos7-devtoolset8-arm64"
-        containerCommand: uname
-      condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
+      - task: Docker@1
+        displayName: "Pull Docker image"
+        inputs:
+          azureSubscriptionEndpoint: "vscode-builds-subscription"
+          azureContainerRegistry: vscodehub.azurecr.io
+          command: "Run an image"
+          imageName: "vscode-linux-build-agent:centos7-devtoolset8-arm64"
+          containerCommand: uname
+        condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        cat << EOF > ~/.netrc
-        machine github.com
-        login vscode
-        password $(github-distro-mixin-password)
-        EOF
+      - script: |
+          set -e
+          cat << EOF > ~/.netrc
+          machine github.com
+          login vscode
+          password $(github-distro-mixin-password)
+          EOF
 
-        git config user.email "vscode@microsoft.com"
-        git config user.name "VSCode"
-      displayName: Prepare tooling
+          git config user.email "vscode@microsoft.com"
+          git config user.name "VSCode"
+        displayName: Prepare tooling
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
-        echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
-        git checkout FETCH_HEAD
-      condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
-      displayName: Checkout override commit
+      - script: |
+          set -e
+          git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
+          echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
+          git checkout FETCH_HEAD
+        condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
+        displayName: Checkout override commit
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
-      displayName: Merge distro
+      - script: |
+          set -e
+          git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
+        displayName: Merge distro
 
   - script: |
       set -e
-      npx https://aka.ms/enablesecurefeed standAlone
+      npm install https://aka.ms/enablesecurefeed --global && npm exec terrapinadotask -- standAlone
     timeoutInMinutes: 5
     retryCountOnTaskFailure: 3
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
@@ -71,18 +71,18 @@ steps:
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-      displayName: Register Docker QEMU
-      condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
+      - script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+        displayName: Register Docker QEMU
+        condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        docker run -e VSCODE_QUALITY -e GITHUB_TOKEN -v $(pwd):/root/vscode -v ~/.netrc:/root/.netrc vscodehub.azurecr.io/vscode-linux-build-agent:centos7-devtoolset8-arm64 /root/vscode/build/azure-pipelines/linux/scripts/install-remote-dependencies.sh
-      displayName: Install dependencies via qemu
-      env:
-        GITHUB_TOKEN: "$(github-distro-mixin-password)"
-      condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
+      - script: |
+          set -e
+          docker run -e VSCODE_QUALITY -e GITHUB_TOKEN -v $(pwd):/root/vscode -v ~/.netrc:/root/.netrc vscodehub.azurecr.io/vscode-linux-build-agent:centos7-devtoolset8-arm64 /root/vscode/build/azure-pipelines/linux/scripts/install-remote-dependencies.sh
+        displayName: Install dependencies via qemu
+        env:
+          GITHUB_TOKEN: "$(github-distro-mixin-password)"
+        condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
 
   - script: |
       set -e
diff --git a/build/azure-pipelines/product-build-pr-cache.yml b/build/azure-pipelines/product-build-pr-cache.yml
index 042325394d3f1..7a6aaa7e559af 100644
--- a/build/azure-pipelines/product-build-pr-cache.yml
+++ b/build/azure-pipelines/product-build-pr-cache.yml
@@ -34,7 +34,7 @@ steps:
 
   - script: |
       set -e
-      npx https://aka.ms/enablesecurefeed standAlone
+      npm install https://aka.ms/enablesecurefeed --global && npm exec terrapinadotask -- standAlone
     timeoutInMinutes: 5
     retryCountOnTaskFailure: 3
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index c876066ef04f2..8110d9aaea3d3 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -28,7 +28,7 @@ parameters:
   - name: ENABLE_TERRAPIN
     displayName: "Enable Terrapin"
     type: boolean
-    default: false
+    default: true
   - name: VSCODE_BUILD_WIN32
     displayName: "🎯 Windows x64"
     type: boolean
diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index b0631e607dccc..7e1837a8ae42f 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -40,7 +40,7 @@ steps:
 
   - script: |
       set -e
-      npx https://aka.ms/enablesecurefeed standAlone
+      npm install https://aka.ms/enablesecurefeed --global && npm exec terrapinadotask -- standAlone
     timeoutInMinutes: 5
     retryCountOnTaskFailure: 3
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
@@ -86,11 +86,11 @@ steps:
     displayName: Create node_modules archive
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    # Mixin must run before optimize, because the CSS loader will inline small SVGs
-    - script: |
-        set -e
-        node build/azure-pipelines/mixin
-      displayName: Mix in quality
+      # Mixin must run before optimize, because the CSS loader will inline small SVGs
+      - script: |
+          set -e
+          node build/azure-pipelines/mixin
+        displayName: Mix in quality
 
   - script: |
       set -e
@@ -100,71 +100,71 @@ steps:
     displayName: Compile & Hygiene
 
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        yarn --cwd build compile
-        ./.github/workflows/check-clean-git-state.sh
-      displayName: Check /build/ folder
+      - script: |
+          set -e
+          yarn --cwd build compile
+          ./.github/workflows/check-clean-git-state.sh
+        displayName: Check /build/ folder
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        yarn --cwd test/smoke compile
-        yarn --cwd test/integration/browser compile
-      displayName: Compile test suites
-      condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+      - script: |
+          set -e
+          yarn --cwd test/smoke compile
+          yarn --cwd test/integration/browser compile
+        displayName: Compile test suites
+        condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - task: AzureCLI@2
-      inputs:
-        azureSubscription: "vscode-builds-subscription"
-        scriptType: pscore
-        scriptLocation: inlineScript
-        addSpnToEnvironment: true
-        inlineScript: |
-          Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId"
-          Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId"
-          Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey"
+      - task: AzureCLI@2
+        inputs:
+          azureSubscription: "vscode-builds-subscription"
+          scriptType: pscore
+          scriptLocation: inlineScript
+          addSpnToEnvironment: true
+          inlineScript: |
+            Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId"
+            Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId"
+            Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey"
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        AZURE_STORAGE_ACCOUNT="ticino" \
-        AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
-        AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
-        AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \
-          node build/azure-pipelines/upload-sourcemaps
-      displayName: Upload sourcemaps
+      - script: |
+          set -e
+          AZURE_STORAGE_ACCOUNT="ticino" \
+          AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
+          AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
+          AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \
+            node build/azure-pipelines/upload-sourcemaps
+        displayName: Upload sourcemaps
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -
-        ./build/azure-pipelines/common/extract-telemetry.sh
-      displayName: Extract Telemetry
+      - script: |
+          set -
+          ./build/azure-pipelines/common/extract-telemetry.sh
+        displayName: Extract Telemetry
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        tar -cz --ignore-failed-read -f $(Build.ArtifactStagingDirectory)/compilation.tar.gz .build out-* test/integration/browser/out test/smoke/out test/automation/out
-      displayName: Compress compilation artifact
+      - script: |
+          set -e
+          tar -cz --ignore-failed-read -f $(Build.ArtifactStagingDirectory)/compilation.tar.gz .build out-* test/integration/browser/out test/smoke/out test/automation/out
+        displayName: Compress compilation artifact
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - task: PublishPipelineArtifact@1
-      inputs:
-        targetPath: $(Build.ArtifactStagingDirectory)/compilation.tar.gz
-        artifactName: Compilation
-      displayName: Publish compilation artifact
+      - task: PublishPipelineArtifact@1
+        inputs:
+          targetPath: $(Build.ArtifactStagingDirectory)/compilation.tar.gz
+          artifactName: Compilation
+        displayName: Publish compilation artifact
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: |
-        set -e
-        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-          yarn download-builtin-extensions-cg
-      displayName: Built-in extensions component details
+      - script: |
+          set -e
+          VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+            yarn download-builtin-extensions-cg
+        displayName: Built-in extensions component details
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-      displayName: "Component Detection"
-      inputs:
-        sourceScanPath: $(Build.SourcesDirectory)
-      continueOnError: true
+      - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+        displayName: "Component Detection"
+        inputs:
+          sourceScanPath: $(Build.SourcesDirectory)
+        continueOnError: true
diff --git a/build/azure-pipelines/sdl-scan.yml b/build/azure-pipelines/sdl-scan.yml
index f6a44d4862b4c..1df26feebbdf4 100644
--- a/build/azure-pipelines/sdl-scan.yml
+++ b/build/azure-pipelines/sdl-scan.yml
@@ -83,7 +83,8 @@ stages:
           - powershell: |
               . build/azure-pipelines/win32/exec.ps1
               $ErrorActionPreference = "Stop"
-              exec { npx https://aka.ms/enablesecurefeed standAlone }
+              exec { npm install https://aka.ms/enablesecurefeed --global }
+              exec { npm exec terrapinadotask -- standAlone }
             timeoutInMinutes: 5
             retryCountOnTaskFailure: 3
             condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true'))
@@ -184,7 +185,7 @@ stages:
 
           - script: |
               set -e
-              npx https://aka.ms/enablesecurefeed standAlone
+              npm install https://aka.ms/enablesecurefeed --global && npm exec terrapinadotask -- standAlone
             timeoutInMinutes: 5
             retryCountOnTaskFailure: 3
             condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
diff --git a/build/azure-pipelines/web/product-build-web.yml b/build/azure-pipelines/web/product-build-web.yml
index 61e409d48597e..735b26cb0e755 100644
--- a/build/azure-pipelines/web/product-build-web.yml
+++ b/build/azure-pipelines/web/product-build-web.yml
@@ -73,7 +73,7 @@ steps:
 
   - script: |
       set -e
-      npx https://aka.ms/enablesecurefeed standAlone
+      npm install https://aka.ms/enablesecurefeed --global && npm exec terrapinadotask -- standAlone
     timeoutInMinutes: 5
     retryCountOnTaskFailure: 3
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index 7145cd689c1fe..0eb1ab16978ee 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -108,7 +108,8 @@ steps:
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
-      exec { npx https://aka.ms/enablesecurefeed standAlone }
+      exec { npm install https://aka.ms/enablesecurefeed --global }
+      exec { npm exec terrapinadotask -- standAlone }
     timeoutInMinutes: 5
     retryCountOnTaskFailure: 3
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))