diff --git a/.werft/jobs/build/installer/installer.ts b/.werft/jobs/build/installer/installer.ts
index f7abba5e69421a..5b1e88bb0279e9 100644
--- a/.werft/jobs/build/installer/installer.ts
+++ b/.werft/jobs/build/installer/installer.ts
@@ -72,9 +72,8 @@ export class Installer {
             this.configureSSHGateway(slice);
             this.configurePublicAPIServer(slice);
             this.configureUsage(slice);
-            this.configureConfigCat(slice);
-
             this.configureDefaultTemplate(slice);
+            this.configureConfigCat(slice);
 
             if (this.options.analytics) {
                 this.includeAnalytics(slice);
@@ -247,10 +246,13 @@ EOF`);
 
     private configureConfigCat(slice: string) {
         // This key is not a secret, it is a unique identifier of our ConfigCat application
+        const configcatKey = "WBLaCPtkjkqKHlHedziE9g/LEAOCNkbuUKiqUZAcVg7dw";
         exec(
-            `yq w -i ${this.options.installerConfigPath} experimental.webapp.configcatKey "WBLaCPtkjkqKHlHedziE9g/LEAOCNkbuUKiqUZAcVg7dw"`,
+            `yq w -i ${this.options.installerConfigPath} experimental.webapp.configcatKey "${configcatKey}"`,
             { slice: slice },
         );
+        exec(`yq w -i ${this.options.installerConfigPath} 'workspace.templates.default.spec.containers.(name==workspace).env[+].name' GITPOD_CONFIGCAT_SDK_KEY`);
+        exec(`yq w -i ${this.options.installerConfigPath} 'workspace.templates.default.spec.containers.(name==workspace).env.(name==GITPOD_CONFIGCAT_SDK_KEY).value' "${configcatKey}"`);
     }
 
     private includeAnalytics(slice: string): void {
diff --git a/WORKSPACE.yaml b/WORKSPACE.yaml
index 25a43ac8c47f88..15c52da78840af 100644
--- a/WORKSPACE.yaml
+++ b/WORKSPACE.yaml
@@ -7,7 +7,7 @@ defaultArgs:
   jbMarketplacePublishTrigger: "false"
   publishToJBMarketplace: true
   localAppVersion: unknown
-  codeCommit: 06783e74552ddefd74c7e02cdcce19054b294469
+  codeCommit: 5ea73bdb57dc8567bd03ed749f999964b2b6b7c4
   codeQuality: stable
   intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2022.2.1.tar.gz"
   golandDownloadUrl: "https://download.jetbrains.com/go/goland-2022.2.2.tar.gz"