diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 8019e9bf438..c61406f6d5c 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -318,3 +318,15 @@ stages:
           displayName: Publish Build
           steps:
             - template: product-publish.yml
+
+    - ${{ if or(eq(parameters.VSCODE_RELEASE, true), and(in(parameters.VSCODE_QUALITY, 'insider', 'exploration'), eq(variables['VSCODE_SCHEDULEDBUILD'], true))) }}:
+      - stage: Release
+        dependsOn:
+          - Publish
+        pool:
+          vmImage: "Ubuntu-18.04"
+        jobs:
+          - job: ReleaseBuild
+            displayName: Release Build
+            steps:
+              - template: release.yml
diff --git a/build/azure-pipelines/product-publish.yml b/build/azure-pipelines/product-publish.yml
index 093da27545d..c941e85f96a 100644
--- a/build/azure-pipelines/product-publish.yml
+++ b/build/azure-pipelines/product-publish.yml
@@ -85,11 +85,3 @@ steps:
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
     displayName: Determine if stage should succeed
-
-  - pwsh: |
-      . build/azure-pipelines/win32/exec.ps1
-
-      $env:AZURE_DOCUMENTDB_MASTERKEY = "$(builds-docdb-key-readwrite)"
-      exec { node build/azure-pipelines/common/releaseBuild.js }
-    condition: and(succeeded(), or(eq(variables['VSCODE_RELEASE'], true), and(in(variables['VSCODE_QUALITY'], 'insider', 'exploration'), eq(variables['VSCODE_SCHEDULEDBUILD'], true))))
-    displayName: Release build
diff --git a/build/azure-pipelines/product-release.yml b/build/azure-pipelines/product-release.yml
new file mode 100644
index 00000000000..1c5ec73c856
--- /dev/null
+++ b/build/azure-pipelines/product-release.yml
@@ -0,0 +1,22 @@
+steps:
+  - task: NodeTool@0
+    inputs:
+      versionSpec: "14.x"
+
+  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+    inputs:
+      versionSpec: "1.x"
+
+  - task: AzureKeyVault@1
+    displayName: "Azure Key Vault: Get Secrets"
+    inputs:
+      azureSubscription: "vscode-builds-subscription"
+      KeyVaultName: vscode
+
+  - script: |
+      set -e
+
+      (cd build ; yarn)
+
+      AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+      node build/azure-pipelines/common/releaseBuild.js