diff --git a/.github/workflows/code-build.yaml b/.github/workflows/code-build.yaml
index 59a7167ede15e3..2011c41c0414d7 100644
--- a/.github/workflows/code-build.yaml
+++ b/.github/workflows/code-build.yaml
@@ -69,7 +69,6 @@ jobs:
               - [ ] test `gp open` and `gp preview`
               - [ ] test open in VS Code Desktop, check `gp open` and `gp preview` in task/user terminals
               - [ ] telemetry data like `vscode_extension_gallery` is collected in [Segment](https://app.segment.com/gitpod/sources/staging_trusted/debugger)
-              - [ ] test using `ubuntu 18` is working well, [example repo](https://github.com/jeanp413/test-gp-prebuild/tree/jp/damaged-aardwolf)
 
             ### Preview status
             gitpod:summary
diff --git a/WORKSPACE.yaml b/WORKSPACE.yaml
index 89451d4f66a4f1..5de69948366928 100644
--- a/WORKSPACE.yaml
+++ b/WORKSPACE.yaml
@@ -7,8 +7,8 @@ defaultArgs:
   publishToNPM: true
   publishToJBMarketplace: true
   localAppVersion: unknown
-  codeCommit: 74a2fbf70cc0f306dac374ee78760da2e157bb7c
-  codeVersion: 1.98.2
+  codeCommit: ec2e536434cea064d6864b259015fefdaa07a74b
+  codeVersion: 1.99.3
   codeQuality: stable
   codeWebExtensionCommit: 3953e8160fffa97dd4a4509542b4bf7ff9b704cd
   xtermCommit: d547d4ff4590b66c3ea24342fc62e3afcf6b77bc
diff --git a/components/ide/code/leeway.Dockerfile b/components/ide/code/leeway.Dockerfile
index e5b9e441d85a5c..0532a1fceb16ab 100644
--- a/components/ide/code/leeway.Dockerfile
+++ b/components/ide/code/leeway.Dockerfile
@@ -125,7 +125,7 @@ RUN nameShort=$(jq --raw-output '.nameShort' product.json) && \
     mv product.json.tmp product.json && \
     jq '{quality,nameLong,nameShort}' product.json
 
-RUN npm run gulp compile-build-pr
+RUN npm run gulp compile-build-without-mangling
 RUN npm run gulp extensions-ci
 RUN npm run gulp minify-vscode-reh
 RUN npm run gulp vscode-web-min-ci