diff --git a/.github/workflows/code-nightly.yml b/.github/workflows/code-nightly.yml
index 58a1a87fb50b98..5a943ce6d1cd92 100644
--- a/.github/workflows/code-nightly.yml
+++ b/.github/workflows/code-nightly.yml
@@ -35,7 +35,7 @@ jobs:
         run: |
           export LEEWAY_WORKSPACE_ROOT=$GITHUB_WORKSPACE
 
-          codeHeadCommit=$(curl -H 'Accept: application/vnd.github.VERSION.sha' https://api.github.com/repos/gitpod-io/openvscode-server/commits/gp-code/release/1.91)
+          codeHeadCommit=$(curl -H 'Accept: application/vnd.github.VERSION.sha' https://api.github.com/repos/gitpod-io/openvscode-server/commits/gp-code/main)
           codeVersion=$(curl https://raw.githubusercontent.com/gitpod-io/openvscode-server/$codeHeadCommit/package.json | jq .version)
           imageRepoBase=${{ github.ref == 'refs/heads/main' && 'eu.gcr.io/gitpod-core-dev/build' || 'eu.gcr.io/gitpod-dev-artifact/build' }}
           cd components/ide/code
diff --git a/components/server/src/workspace/workspace-starter.ts b/components/server/src/workspace/workspace-starter.ts
index d5af945f9f5882..8643648de10105 100644
--- a/components/server/src/workspace/workspace-starter.ts
+++ b/components/server/src/workspace/workspace-starter.ts
@@ -308,7 +308,10 @@ export class WorkspaceStarter {
                     ideSettings = {
                         ...ideSettings,
                         defaultIde: ideConfig.ide,
-                        useLatestVersion: !!ideConfig.useLatest,
+                        useLatestVersion:
+                            ideSettings?.useLatestVersion ??
+                            user.additionalData?.ideSettings?.useLatestVersion ??
+                            !!ideConfig.useLatest,
                     };
                 }
             }
diff --git a/install/installer/pkg/components/blobserve/configmap.go b/install/installer/pkg/components/blobserve/configmap.go
index bdbd09579fb86c..b1c2c3e78ff5d3 100644
--- a/install/installer/pkg/components/blobserve/configmap.go
+++ b/install/installer/pkg/components/blobserve/configmap.go
@@ -34,6 +34,12 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 					InlineStatic: []blobserve_config.InlineReplacement{{
 						Search:      "{{WORKBENCH_WEB_BASE_URL}}",
 						Replacement: "${ide}",
+					}, {
+						Search:      "{{WORKBENCH_NLS_FALLBACK_URL}}",
+						Replacement: "${ide}/out/nls.messages.js",
+					}, {
+						Search:      "{{WORKBENCH_NLS_URL}}",
+						Replacement: "${ide}/out/nls.messages.js",
 					}, {
 						Search:      "/_supervisor/frontend",
 						Replacement: "${supervisor}",