diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index 067fd0331c087101b245520427b886ba8e231c18..6a50f82662d5b4622a7fb22fe09cd43bf0135ce7 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -7,7 +7,7 @@ steps:
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
     keyfile: '.build/commit'
-    targetfolder: '.build, **/out-build'
+    targetfolder: '.build, **/out-vscode-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true
     alias: 'Compilation'
diff --git a/build/azure-pipelines/linux/product-build-linux-multiarch.yml b/build/azure-pipelines/linux/product-build-linux-multiarch.yml
index 68c988bdc313d7894658578e4cdf947e3213e0e3..b1ebcc02e62c3c9b711f97497907a2068d7cb4e0 100644
--- a/build/azure-pipelines/linux/product-build-linux-multiarch.yml
+++ b/build/azure-pipelines/linux/product-build-linux-multiarch.yml
@@ -7,7 +7,7 @@ steps:
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
     keyfile: '.build/commit'
-    targetfolder: '.build, **/out-build'
+    targetfolder: '.build, **/out-vscode-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true
     alias: 'Compilation'
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index a30e74adea4497bb0b68a90ec7f4fa9f32349c41..c70cdb6d53090b597f67617ebb42a2192dcbc38f 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -7,7 +7,7 @@ steps:
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
     keyfile: '.build/commit'
-    targetfolder: '.build, **/out-build'
+    targetfolder: '.build, **/out-vscode-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true
     alias: 'Compilation'
diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index ddd2baf5e451f18bd519b1513a984bf50c005c6c..8f2189fed125b528e3f260da6c57f5036dc9a27f 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -7,7 +7,7 @@ steps:
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
     keyfile: '.build/commit'
-    targetfolder: '.build, **/out-build'
+    targetfolder: '.build, **/out-vscode-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true
     alias: 'Compilation'
@@ -99,13 +99,14 @@ steps:
     set -e
     yarn gulp compile-build
     yarn gulp compile-extensions-build
+    yarn gulp minify-vscode
   displayName: Compile
   condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
   inputs:
     keyfile: '.build/commit'
-    targetfolder: '.build, **/out-build'
+    targetfolder: '.build, **/out-vscode-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true
     alias: 'Compilation'
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index 27c436da1cbd0096cb2a75d9788a33e7db9655c6..a7e097fed367c31564a3473635c243e7fd13671e 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -7,7 +7,7 @@ steps:
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
     keyfile: '.build/commit'
-    targetfolder: '.build, **/out-build'
+    targetfolder: '.build, **/out-vscode-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true
     alias: 'Compilation'
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 90082925121e5f9bf30c65568dc70a0d3957d262..bdb49e71c7ef17b727351c06985545df4735d3a6 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -116,6 +116,7 @@ const minifyVSCodeTask = task.define('minify-vscode', task.series(
 	},
 	common.minifyTask('out-vscode', `${sourceMappingURLBase}/core`)
 ));
+gulp.task(minifyVSCodeTask);
 
 // Package
 
@@ -437,7 +438,6 @@ BUILD_TARGETS.forEach(buildTarget => {
 		const destinationFolderName = `VSCode${dashed(platform)}${dashed(arch)}`;
 
 		const vscodeTaskCI = task.define(`vscode${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series(
-			minified ? minifyVSCodeTask : optimizeVSCodeTask,
 			util.rimraf(path.join(buildRoot, destinationFolderName)),
 			packageTask(platform, arch, sourceFolderName, destinationFolderName, opts)
 		));
@@ -446,6 +446,7 @@ BUILD_TARGETS.forEach(buildTarget => {
 		const vscodeTask = task.define(`vscode${dashed(platform)}${dashed(arch)}${dashed(minified)}`, task.series(
 			compileBuildTask,
 			compileExtensionsBuildTask,
+			minified ? minifyVSCodeTask : optimizeVSCodeTask,
 			vscodeTaskCI
 		));
 		gulp.task(vscodeTask);