diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index 74386b4ae30..cde0a7a3c2b 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -77,13 +77,9 @@ steps:
 - script: |
     set -e
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-    yarn gulp vscode-darwin-min
-    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-    yarn gulp vscode-reh-darwin-min
-    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-    yarn gulp vscode-web-darwin-min
+      yarn gulp darwin-min
     AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
-    yarn gulp upload-vscode-sourcemaps
+      yarn gulp upload-vscode-sourcemaps
   displayName: Build
 
 - script: |
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index bf3a0794561..f03c41a0709 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -77,17 +77,8 @@ steps:
 
 - script: |
     set -e
-    if [[ "$VSCODE_ARCH" == "ia32" ]]; then
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-linux-$VSCODE_ARCH-min
-    else
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-linux-$VSCODE_ARCH-min
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-reh-linux-$VSCODE_ARCH-min
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-web-linux-$VSCODE_ARCH-min
-    fi
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      yarn gulp linux-$VSCODE_ARCH-min
   displayName: Build
 
 - script: |
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index adc5bd51e20..411d2f784e7 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -85,9 +85,7 @@ steps:
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
     $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
-    exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-min" }
-    exec { yarn gulp "vscode-reh-win32-$env:VSCODE_ARCH-min" }
-    exec { yarn gulp "vscode-web-win32-$env:VSCODE_ARCH-min" }
+    exec { yarn gulp "win32-$env:VSCODE_ARCH-min" }
     exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-inno-updater" }
   displayName: Build