diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index cde0a7a3c2b..cb77d68c9e9 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -76,8 +76,14 @@ steps:
 
 - script: |
     set -e
+    yarn gulp compile-build
+    yarn gulp compile-extensions-build
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp darwin-min
+      yarn gulp vscode-darwin-ci
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      yarn gulp vscode-reh-darwin-ci
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      yarn gulp vscode-web-darwin-ci
     AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
       yarn gulp upload-vscode-sourcemaps
   displayName: Build
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index f03c41a0709..a32dd127dfa 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -77,8 +77,14 @@ steps:
 
 - script: |
     set -e
+    yarn gulp compile-build
+    yarn gulp compile-extensions-build
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp linux-$VSCODE_ARCH-min
+      yarn gulp vscode-linux-$VSCODE_ARCH-min-ci
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      yarn gulp vscode-reh-$VSCODE_ARCH-min-ci
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      yarn gulp vscode-web-$VSCODE_ARCH-min-ci
   displayName: Build
 
 - script: |
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index 411d2f784e7..cd574f085f5 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -85,7 +85,11 @@ steps:
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
     $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
-    exec { yarn gulp "win32-$env:VSCODE_ARCH-min" }
+    exec { yarn gulp compile-build }
+    exec { yarn gulp compile-extensions-build }
+    exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-min-ci" }
+    exec { yarn gulp "vscode-reh-win32-$env:VSCODE_ARCH-min-ci" }
+    exec { yarn gulp "vscode-web-win32-$env:VSCODE_ARCH-min-ci" }
     exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-inno-updater" }
   displayName: Build
 
diff --git a/build/gulpfile.ci.js b/build/gulpfile.ci.js
deleted file mode 100644
index ab3746af2a6..00000000000
--- a/build/gulpfile.ci.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-const gulp = require('gulp');
-const task = require('./lib/task');
-
-gulp.task(task.define('win32-ia32', task.series(
-	gulp.task('compile-build'),
-	gulp.task('compile-extensions-build'),
-	gulp.task('vscode-win32-ia32-ci')
-)));
-
-gulp.task(task.define('win32-ia32-min', task.series(
-	gulp.task('compile-build'),
-	gulp.task('compile-extensions-build'),
-	gulp.task('vscode-win32-ia32-min-ci')
-)));
-
-gulp.task(task.define('win32-x64', task.series(
-	gulp.task('compile-build'),
-	gulp.task('compile-extensions-build'),
-	gulp.task('vscode-win32-x64-ci')
-)));
-
-gulp.task(task.define('win32-x64-min', task.series(
-	gulp.task('compile-build'),
-	gulp.task('compile-extensions-build'),
-	gulp.task('vscode-win32-x64-min-ci')
-)));
-
-gulp.task(task.define('linux-ia32', task.series(
-	gulp.task('compile-build'),
-	gulp.task('compile-extensions-build'),
-	gulp.task('vscode-linux-ia32-ci')
-)));
-
-gulp.task(task.define('linux-ia32-min', task.series(
-	gulp.task('compile-build'),
-	gulp.task('compile-extensions-build'),
-	gulp.task('vscode-linux-ia32-min-ci')
-)));
-
-gulp.task(task.define('linux-x64', task.series(
-	gulp.task('compile-build'),
-	gulp.task('compile-extensions-build'),
-	gulp.task('vscode-linux-x64-ci')
-)));
-
-gulp.task(task.define('linux-x64-min', task.series(
-	gulp.task('compile-build'),
-	gulp.task('compile-extensions-build'),
-	gulp.task('vscode-linux-x64-min-ci')
-)));
-
-gulp.task(task.define('darwin', task.series(
-	gulp.task('compile-build'),
-	gulp.task('compile-extensions-build'),
-	gulp.task('vscode-darwin-ci')
-)));
-
-gulp.task(task.define('darwin-min', task.series(
-	gulp.task('compile-build'),
-	gulp.task('compile-extensions-build'),
-	gulp.task('vscode-darwin-min-ci')
-)));
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
index 02f680af01c..8828a0d394f 100644
--- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
@@ -43,6 +43,11 @@ gulp.task('vscode-reh-linux-x64-min', noop);
 gulp.task('vscode-reh-linux-armhf-min', noop);
 gulp.task('vscode-reh-linux-alpine-min', noop);
 
+gulp.task('vscode-web-win32-ia32-min', noop);
+gulp.task('vscode-web-win32-x64-min', noop);
+gulp.task('vscode-web-darwin-min', noop);
+gulp.task('vscode-web-linux-x64-min', noop);
+gulp.task('vscode-web-linux-alpine-min', noop);
 
 function getNodeVersion() {
 	const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8');
diff --git a/gulpfile.js b/gulpfile.js
index e41bf4a498f..8a5eff502f6 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -40,6 +40,4 @@ process.on('unhandledRejection', (reason, p) => {
 // Load all the gulpfiles only if running tasks other than the editor tasks
 const build = path.join(__dirname, 'build');
 require('glob').sync('gulpfile.*.js', { cwd: build })
-	.filter(f => !/gulpfile\.ci\.js/.test(f))
-	.forEach(f => require(`./build/${f}`));
-require('./build/gulpfile.ci.js');
\ No newline at end of file
+	.forEach(f => require(`./build/${f}`));
\ No newline at end of file