diff --git a/build/azure-pipelines/sql-web-build.yml b/build/azure-pipelines/sql-web-build.yml
index b2bb284e97..d1318c223a 100644
--- a/build/azure-pipelines/sql-web-build.yml
+++ b/build/azure-pipelines/sql-web-build.yml
@@ -1,7 +1,7 @@
 resources:
   containers:
   - container: linux-x64
-    image: sqltoolscontainers.azurecr.io/web-build-image:1
+    image: sqltoolscontainers.azurecr.io/web-build-image:2
     endpoint: ContainerRegistry
 
 jobs:
diff --git a/build/azure-pipelines/web/build/Dockerfile b/build/azure-pipelines/web/build/Dockerfile
index cc6061964c..a69d7671c4 100644
--- a/build/azure-pipelines/web/build/Dockerfile
+++ b/build/azure-pipelines/web/build/Dockerfile
@@ -10,6 +10,11 @@ RUN apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xv
 	libkrb5-dev git apt-transport-https ca-certificates curl gnupg-agent software-properties-common \
 	libnss3 libasound2 make gcc libx11-dev fakeroot rpm libgconf-2-4 libunwind8 g++ python
 
+# Set the Chrome repo and install Chrome.
+RUN curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
+	&& echo "deb https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
+	&& apt-get update && apt-get install -y google-chrome-stable
+
 #docker
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
 RUN apt-key fingerprint 0EBFCD88
diff --git a/build/azure-pipelines/web/sql-product-build-web.yml b/build/azure-pipelines/web/sql-product-build-web.yml
index 4d7e612f68..901bbb4d1d 100644
--- a/build/azure-pipelines/web/sql-product-build-web.yml
+++ b/build/azure-pipelines/web/sql-product-build-web.yml
@@ -99,6 +99,20 @@ steps:
     yarn gulp vscode-reh-web-linux-x64-min
   displayName: Compile
 
+- script: |
+    set -e
+    yarn gulp compile-extensions
+  displayName: Compile Extensions
+
+- script: |
+    set -e
+    node ./node_modules/playwright/install.js
+    APP_ROOT=$(Agent.BuildDirectory)/vscode-reh-web-linux-x64
+    xvfb-run yarn smoketest --build "$(Agent.BuildDirectory)/vscode-reh-web-linux-x64" --web --headless --screenshots "$(Build.ArtifactStagingDirectory)/smokeshots"
+  displayName: Run smoke tests (Browser)
+  continueOnError: true
+  condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+
 # - script: |
 #     set -e
 #     AZURE_STORAGE_ACCOUNT="$(sourcemap-storage-account)" \
@@ -137,15 +151,6 @@ steps:
     yarn gulp package-external-extensions
   displayName: Package External extensions
 
-- script: |
-    set -e
-    node ./node_modules/playwright/install.js
-    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-x64" \
-    yarn smoketest --web --headless  --screenshots "$(build.artifactstagingdirectory)/smokeshots"
-  displayName: Run smoke tests (Browser)
-  continueOnError: true
-  condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
-
 - script: |
     set -e
     yarn gulp package-langpacks