diff --git a/build/azure-pipelines/darwin/createDrop.sh b/build/azure-pipelines/darwin/createDrop.sh
index 02b66ceae1..3e7fb6c452 100755
--- a/build/azure-pipelines/darwin/createDrop.sh
+++ b/build/azure-pipelines/darwin/createDrop.sh
@@ -6,6 +6,6 @@ REPO="$(pwd)"
 mkdir -p $REPO/.build/darwin/{archive,server}
 
 # package Remote Extension Host
-# pushd .. && mv azuredatastudio-reh-darwin azuredatastudio-server-darwin && zip -Xry $REPO/.build/darwin/server/azuredatastudio-server-darwin.zip azuredatastudio-server-darwin && popd
+pushd .. && mv azuredatastudio-reh-darwin azuredatastudio-server-darwin && zip -Xry $REPO/.build/darwin/server/azuredatastudio-server-darwin.zip azuredatastudio-server-darwin && popd
 
 node build/azure-pipelines/common/copyArtifacts.js
diff --git a/build/azure-pipelines/darwin/sql-product-build-darwin.yml b/build/azure-pipelines/darwin/sql-product-build-darwin.yml
index 1dcd0b2901..6b30304bb0 100644
--- a/build/azure-pipelines/darwin/sql-product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/sql-product-build-darwin.yml
@@ -96,8 +96,8 @@ steps:
       set -e
       yarn gulp package-rebuild-extensions
       yarn gulp vscode-darwin-min-ci
-      # yarn gulp vscode-reh-darwin-min-ci
-      # yarn gulp vscode-reh-web-darwin-min-ci
+      yarn gulp vscode-reh-darwin-min-ci
+      yarn gulp vscode-reh-web-darwin-min-ci
     displayName: Build
     env:
       VSCODE_MIXIN_PASSWORD: $(github-distro-mixin-password)
diff --git a/build/azure-pipelines/linux/createDrop.sh b/build/azure-pipelines/linux/createDrop.sh
index 9605fd7b9a..c3f8e55153 100755
--- a/build/azure-pipelines/linux/createDrop.sh
+++ b/build/azure-pipelines/linux/createDrop.sh
@@ -15,12 +15,12 @@ rm -rf $ROOT/code-*.tar.*
 (cd $ROOT && tar -czf $TARBALL_PATH $BUILDNAME)
 
 # Publish Remote Extension Host
-# LEGACY_SERVER_BUILD_NAME="azuredatastudio-reh-$PLATFORM_LINUX"
-# SERVER_BUILD_NAME="azuredatastudio-server-$PLATFORM_LINUX"
-# SERVER_TARBALL_FILENAME="azuredatastudio-server-$PLATFORM_LINUX.tar.gz"
-# SERVER_TARBALL_PATH="$REPO/.build/linux/server/$SERVER_TARBALL_FILENAME"
+LEGACY_SERVER_BUILD_NAME="azuredatastudio-reh-$PLATFORM_LINUX"
+SERVER_BUILD_NAME="azuredatastudio-server-$PLATFORM_LINUX"
+SERVER_TARBALL_FILENAME="azuredatastudio-server-$PLATFORM_LINUX.tar.gz"
+SERVER_TARBALL_PATH="$REPO/.build/linux/server/$SERVER_TARBALL_FILENAME"
 
-# rm -rf $ROOT/azuredatastudio-server-*.tar.*
-# (cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME)
+rm -rf $ROOT/azuredatastudio-server-*.tar.*
+(cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME)
 
 node build/azure-pipelines/common/copyArtifacts.js
diff --git a/build/azure-pipelines/linux/sql-product-build-linux.yml b/build/azure-pipelines/linux/sql-product-build-linux.yml
index b56f3c74bc..835c275338 100644
--- a/build/azure-pipelines/linux/sql-product-build-linux.yml
+++ b/build/azure-pipelines/linux/sql-product-build-linux.yml
@@ -91,8 +91,8 @@ steps:
   - script: |
       set -e
       yarn gulp vscode-linux-x64-min-ci
-      # yarn gulp vscode-reh-linux-x64-min-ci
-      # yarn gulp vscode-reh-web-linux-x64-min-ci
+      yarn gulp vscode-reh-linux-x64-min-ci
+      yarn gulp vscode-reh-web-linux-x64-min-ci
     displayName: Build
     env:
       VSCODE_MIXIN_PASSWORD: $(github-distro-mixin-password)
diff --git a/build/azure-pipelines/sql-product-build.yml b/build/azure-pipelines/sql-product-build.yml
index 0e59eea346..783b4efe31 100644
--- a/build/azure-pipelines/sql-product-build.yml
+++ b/build/azure-pipelines/sql-product-build.yml
@@ -49,27 +49,27 @@ jobs:
       extensionsToUnitTest: ["admin-tool-ext-win", "agent", "azdata", "azurecore", "cms", "dacpac", "import", "schema-compare", "notebook", "resource-deployment", "machine-learning", "sql-database-projects"]
   timeoutInMinutes: 70
 
-# - job: LinuxWeb
-#   condition: and(succeeded(), eq(variables['VSCODE_BUILD_WEB'], 'true'))
-#   pool:
-#     vmImage: 'Ubuntu-16.04'
-#   container: linux-x64
-#   variables:
-#     VSCODE_ARCH: x64
-#   dependsOn:
-#   - Compile
-#   steps:
-#   - template: web/sql-product-build-web.yml
+- job: LinuxWeb
+  condition: and(succeeded(), eq(variables['VSCODE_BUILD_WEB'], 'true'))
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  container: linux-x64
+  variables:
+    VSCODE_ARCH: x64
+  dependsOn:
+  - Compile
+  steps:
+  - template: web/sql-product-build-web.yml
 
-# - job: Docker
-#   condition: and(succeeded(), eq(variables['VSCODE_BUILD_DOCKER'], 'true'))
-#   pool:
-#     vmImage: 'Ubuntu-16.04'
-#   container: linux-x64
-#   dependsOn:
-#   - Linux
-#   steps:
-#   - template: docker/sql-product-build-docker.yml
+- job: Docker
+  condition: and(succeeded(), eq(variables['VSCODE_BUILD_DOCKER'], 'true'))
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  container: linux-x64
+  dependsOn:
+  - Linux
+  steps:
+  - template: docker/sql-product-build-docker.yml
 
 - job: Windows
   condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
@@ -98,10 +98,10 @@ jobs:
   dependsOn:
   - macOS
   - Linux
-  # - Docker
+  - Docker
   - Windows
   - Windows_Test
-  # - LinuxWeb
+  - LinuxWeb
   - macOS_Signing
   steps:
   - template: sql-release.yml
diff --git a/build/azure-pipelines/win32/createDrop.ps1 b/build/azure-pipelines/win32/createDrop.ps1
index a2535224b7..4552c2014e 100644
--- a/build/azure-pipelines/win32/createDrop.ps1
+++ b/build/azure-pipelines/win32/createDrop.ps1
@@ -5,16 +5,16 @@ $Arch = "x64"
 
 $Repo = "$(pwd)"
 $Root = "$Repo\.."
-# $LegacyServer = "$Root\azuredatastudio-reh-win32-$Arch"
-# $ServerName = "azuredatastudio-server-win32-$Arch"
-# $Server = "$Root\$ServerName"
-# $ServerZipLocation = "$Repo\.build\win32-$Arch\server"
-# $ServerZip = "$ServerZipLocation\azuredatastudio-server-win32-$Arch.zip"
+$LegacyServer = "$Root\azuredatastudio-reh-win32-$Arch"
+$ServerName = "azuredatastudio-server-win32-$Arch"
+$Server = "$Root\$ServerName"
+$ServerZipLocation = "$Repo\.build\win32-$Arch\server"
+$ServerZip = "$ServerZipLocation\azuredatastudio-server-win32-$Arch.zip"
 
 # Create server archive
-# New-Item $ServerZipLocation -ItemType Directory # this will throw even when success for we don't want to exec this
-# $global:LASTEXITCODE = 0
-# exec { Rename-Item -Path $LegacyServer -NewName $ServerName } "Rename Item"
-# exec { .\node_modules\7zip\7zip-lite\7z.exe a -tzip $ServerZip $Server -r } "Zip Server"
+New-Item $ServerZipLocation -ItemType Directory # this will throw even when success for we don't want to exec this
+$global:LASTEXITCODE = 0
+exec { Rename-Item -Path $LegacyServer -NewName $ServerName } "Rename Item"
+exec { .\node_modules\7zip\7zip-lite\7z.exe a -tzip $ServerZip $Server -r } "Zip Server"
 
 exec { node build/azure-pipelines/common/copyArtifacts.js } "Copy Artifacts"
diff --git a/build/azure-pipelines/win32/sql-product-build-win32.yml b/build/azure-pipelines/win32/sql-product-build-win32.yml
index 8e71c6df47..96cca91c63 100644
--- a/build/azure-pipelines/win32/sql-product-build-win32.yml
+++ b/build/azure-pipelines/win32/sql-product-build-win32.yml
@@ -95,8 +95,8 @@ steps:
       $ErrorActionPreference = "Stop"
       exec { yarn gulp "package-rebuild-extensions" }
       exec { yarn gulp "vscode-win32-x64-min-ci" }
-      # exec { yarn gulp "vscode-reh-win32-x64-min-ci" }
-      # exec { yarn gulp "vscode-reh-web-win32-x64-min-ci" }
+      exec { yarn gulp "vscode-reh-win32-x64-min-ci" }
+      exec { yarn gulp "vscode-reh-web-win32-x64-min-ci" }
       exec { yarn gulp "vscode-win32-x64-code-helper" }
       exec { yarn gulp "vscode-win32-x64-inno-updater" }
     displayName: Build