diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index dd7ab94ab28c22851bff8d442ff2f3b38f1e2099..a9ac4c7821f33064cb36d10e910c4ef8f565aa40 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -335,17 +335,17 @@ steps:
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
-    artifact: darwin-$(VSCODE_ARCH)
+    artifact: vscode-darwin-$(VSCODE_ARCH)
     displayName: Publish archive
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(Agent.BuildDirectory)/vscode-server-darwin.zip
-    artifact: server-darwin-$(VSCODE_ARCH)
+    artifact: vscode-server-darwin-$(VSCODE_ARCH)
     displayName: Publish server
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(Agent.BuildDirectory)/vscode-server-darwin-web.zip
-    artifact: server-darwin-$(VSCODE_ARCH)-web
+    artifact: vscode-server-darwin-$(VSCODE_ARCH)-web
     displayName: Publish web server
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
 
diff --git a/build/azure-pipelines/linux/product-build-alpine.yml b/build/azure-pipelines/linux/product-build-alpine.yml
index d8944be4d0153531b0be8bdf32c27b624ea0114c..a2bbb119bfb7c7d8c74dd5dfa1c6820320ed8644 100644
--- a/build/azure-pipelines/linux/product-build-alpine.yml
+++ b/build/azure-pipelines/linux/product-build-alpine.yml
@@ -124,12 +124,12 @@ steps:
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(Agent.BuildDirectory)/vscode-server-linux-alpine.tar.gz
-    artifact: server-linux-alpine
+    artifact: vscode-server-linux-alpine
     displayName: Publish server archive
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(Agent.BuildDirectory)/vscode-server-linux-alpine-web.tar.gz
-    artifact: server-linux-alpine-web
+    artifact: vscode-server-linux-alpine-web
     displayName: Publish web server archive
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index 518ab721b74873e6776d9d54115275fa875b8ca0..1e6603a6f64050c1a2ba7205897005828af8b5be 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -260,17 +260,17 @@ steps:
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: .build/linux/rpm
-    artifact: linux-rpm-$(VSCODE_ARCH)
+    artifact: vscode-linux-rpm-$(VSCODE_ARCH)
     displayName: Publish rpm package
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-  # - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH).tar.gz
-  #   artifact: server-linux-$(VSCODE_ARCH)
-  #   displayName: Publish server archive
-  #   condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+  - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH).tar.gz
+    artifact: vscode-server-linux-$(VSCODE_ARCH)
+    displayName: Publish server archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH)-web.tar.gz
-    artifact: server-linux-$(VSCODE_ARCH)-web
+    artifact: vscode-server-linux-$(VSCODE_ARCH)-web
     displayName: Publish web server archive
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
diff --git a/build/azure-pipelines/linux/snap-build-linux.yml b/build/azure-pipelines/linux/snap-build-linux.yml
index 58997bcac9d06592b710d7dff22acda5189b2d9d..434508a0cf2eab29fb76aa6f1f0bb4921abaa00a 100644
--- a/build/azure-pipelines/linux/snap-build-linux.yml
+++ b/build/azure-pipelines/linux/snap-build-linux.yml
@@ -56,6 +56,6 @@ steps:
       node build/azure-pipelines/common/createAsset.js "linux-snap-$(VSCODE_ARCH)" package "$SNAP_FILENAME" "$SNAP_PATH"
 
   - publish: .build/linux/snap/$(VSCODE_ARCH)
-    artifact: linux-snap-$(VSCODE_ARCH)
+    artifact: vscode-linux-snap-$(VSCODE_ARCH)
     displayName: Publish snap package
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
diff --git a/build/azure-pipelines/web/product-build-web.yml b/build/azure-pipelines/web/product-build-web.yml
index 7a43638205e741a74b86e50dfcf98c1fe0382315..05aa68fe12613bdeca7e0a9ff821a0723640a1ee 100644
--- a/build/azure-pipelines/web/product-build-web.yml
+++ b/build/azure-pipelines/web/product-build-web.yml
@@ -125,6 +125,6 @@ steps:
     displayName: Publish
 
   - publish: $(Agent.BuildDirectory)/vscode-web.tar.gz
-    artifact: web-standalone
+    artifact: vscode-web-standalone
     displayName: Publish web archive
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index 45d24c7a52b27065ec2f7db5edbca27c90cafc6f..327cd36d77e205cbe2a02c05931be6e317b0baa8 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -296,27 +296,27 @@ steps:
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\archive\VSCode-win32-$(VSCODE_ARCH).zip
-    artifact: win32-$(VSCODE_ARCH)-archive
+    artifact: vscode-win32-$(VSCODE_ARCH)-archive
     displayName: Publish archive
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\system-setup\VSCodeSetup.exe
-    artifact: win32-$(VSCODE_ARCH) setup
+    artifact: vscode-win32-$(VSCODE_ARCH)-setup
     displayName: Publish system setup
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\user-setup\VSCodeSetup.exe
-    artifact: win32-$(VSCODE_ARCH)-user setup
+    artifact: vscode-win32-$(VSCODE_ARCH)-user-setup
     displayName: Publish user setup
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - publish: $(System.DefaultWorkingDirectory)\.build\vscode-server-win32-$(VSCODE_ARCH).zip
-    artifact: server-win32-$(VSCODE_ARCH)
+    artifact: vscode-server-win32-$(VSCODE_ARCH)
     displayName: Publish server
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
   - publish: $(System.DefaultWorkingDirectory)\.build\vscode-server-win32-$(VSCODE_ARCH)-web.zip
-    artifact: server-win32-$(VSCODE_ARCH)-web
+    artifact: vscode-server-win32-$(VSCODE_ARCH)-web
     displayName: Publish web server
     condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))