diff --git a/components/dashboard/src/start/StartWorkspace.tsx b/components/dashboard/src/start/StartWorkspace.tsx
index 6f7c7b731a0538..f81563508033d0 100644
--- a/components/dashboard/src/start/StartWorkspace.tsx
+++ b/components/dashboard/src/start/StartWorkspace.tsx
@@ -778,8 +778,8 @@ function ImageBuildView(props: ImageBuildViewProps) {
                 <>
                     <div className="mt-6 w-11/12 lg:w-3/5">
                         <p className="text-center text-gray-400 dark:text-gray-500">
-                            💡 You can use the <code>gp rebuild</code> command to rebuild the workspace from the editor
-                            terminal. &nbsp;
+                            💡 You can use the <code>gp validate</code> command to validate the workspace configuration
+                            from the editor terminal. &nbsp;
                             <a
                                 href="https://www.gitpod.io/docs/configure/workspaces/workspace-image#trying-out-changes-to-your-dockerfile"
                                 target="_blank"
diff --git a/components/gitpod-cli/cmd/ports-await.go b/components/gitpod-cli/cmd/ports-await.go
index 4caed15bdc36ce..a946e0a13f9e05 100644
--- a/components/gitpod-cli/cmd/ports-await.go
+++ b/components/gitpod-cli/cmd/ports-await.go
@@ -75,7 +75,7 @@ var awaitPortCmdAlias = &cobra.Command{
 	Short:      awaitPortCmd.Short,
 	Long:       awaitPortCmd.Long,
 	Args:       awaitPortCmd.Args,
-	Run:        awaitPortCmd.Run,
+	RunE:       awaitPortCmd.RunE,
 }
 
 func init() {
diff --git a/components/gitpod-cli/cmd/ports-expose.go b/components/gitpod-cli/cmd/ports-expose.go
index 5a502a3b1354d3..2f9f5c97af742a 100644
--- a/components/gitpod-cli/cmd/ports-expose.go
+++ b/components/gitpod-cli/cmd/ports-expose.go
@@ -95,7 +95,7 @@ var portExposeCmdAlias = &cobra.Command{
 	Short:      portExposeCmd.Short,
 	Long:       portExposeCmd.Long,
 	Args:       portExposeCmd.Args,
-	Run:        portExposeCmd.Run,
+	RunE:       portExposeCmd.RunE,
 }
 
 func init() {
diff --git a/components/gitpod-cli/cmd/rebuild.go b/components/gitpod-cli/cmd/validate.go
similarity index 90%
rename from components/gitpod-cli/cmd/rebuild.go
rename to components/gitpod-cli/cmd/validate.go
index 52afcc5fa833fd..246e12540f7d66 100644
--- a/components/gitpod-cli/cmd/rebuild.go
+++ b/components/gitpod-cli/cmd/validate.go
@@ -46,7 +46,7 @@ func stopDebugContainer(ctx context.Context, dockerPath string) error {
 }
 
 func runRebuild(ctx context.Context, supervisorClient *supervisor.SupervisorClient) error {
-	logLevel, err := logrus.ParseLevel(rebuildOpts.LogLevel)
+	logLevel, err := logrus.ParseLevel(validateOpts.LogLevel)
 	if err != nil {
 		return GpError{Err: err, OutCome: utils.Outcome_UserErr, ErrorCode: utils.RebuildErrorCode_InvaligLogLevel}
 	}
@@ -57,7 +57,7 @@ func runRebuild(ctx context.Context, supervisorClient *supervisor.SupervisorClie
 		return err
 	}
 
-	checkoutLocation := rebuildOpts.WorkspaceFolder
+	checkoutLocation := validateOpts.WorkspaceFolder
 	if checkoutLocation == "" {
 		checkoutLocation = wsInfo.CheckoutLocation
 	}
@@ -206,11 +206,11 @@ func runRebuild(ctx context.Context, supervisorClient *supervisor.SupervisorClie
 
 	workspaceType := api.DebugWorkspaceType_regular
 	contentSource := api.ContentSource_from_other
-	if rebuildOpts.Prebuild {
+	if validateOpts.Prebuild {
 		workspaceType = api.DebugWorkspaceType_prebuild
-	} else if rebuildOpts.From == "prebuild" {
+	} else if validateOpts.From == "prebuild" {
 		contentSource = api.ContentSource_from_prebuild
-	} else if rebuildOpts.From == "snapshot" {
+	} else if validateOpts.From == "snapshot" {
 		contentSource = api.ContentSource_from_backup
 	}
 	debugEnvs, err := supervisorClient.Control.CreateDebugEnv(ctx, &api.CreateDebugEnvRequest{
@@ -238,7 +238,7 @@ func runRebuild(ctx context.Context, supervisorClient *supervisor.SupervisorClie
 	for _, env := range debugEnvs.Envs {
 		envs += env + "\n"
 	}
-	for _, env := range rebuildOpts.GitpodEnvs {
+	for _, env := range validateOpts.GitpodEnvs {
 		envs += env + "\n"
 	}
 	for _, env := range workspaceEnvs {
@@ -462,7 +462,7 @@ func openWindow(ctx context.Context, workspaceUrl string) error {
 	return gpCmd.Run()
 }
 
-var rebuildOpts struct {
+var validateOpts struct {
 	WorkspaceFolder string
 	LogLevel        string
 	From            string
@@ -472,9 +472,9 @@ var rebuildOpts struct {
 	GitpodEnvs []string
 }
 
-var rebuildCmd = &cobra.Command{
-	Use:    "rebuild",
-	Short:  "[experimental] Re-builds the workspace (useful to debug a workspace configuration)",
+var validateCmd = &cobra.Command{
+	Use:    "validate",
+	Short:  "[experimental] Validates the workspace (useful to debug a workspace configuration)",
 	Hidden: false,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		supervisorClient, err := supervisor.New(cmd.Context())
@@ -487,6 +487,14 @@ var rebuildCmd = &cobra.Command{
 	},
 }
 
+var rebuildCmd = &cobra.Command{
+	Hidden:     true,
+	Use:        "rebuild",
+	Deprecated: "please use `gp validate` instead.",
+	Short:      validateCmd.Short,
+	RunE:       validateCmd.RunE,
+}
+
 func init() {
 	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
 	defer cancel()
@@ -500,13 +508,22 @@ func init() {
 		}
 	}
 
-	rootCmd.AddCommand(rebuildCmd)
-	rebuildCmd.PersistentFlags().StringVarP(&rebuildOpts.WorkspaceFolder, "workspace-folder", "w", workspaceFolder, "Path to the workspace folder.")
-	rebuildCmd.PersistentFlags().StringVarP(&rebuildOpts.LogLevel, "log", "", "error", "Log level to use. Allowed values are 'error', 'warn', 'info', 'debug', 'trace'.")
-	rebuildCmd.PersistentFlags().StringVarP(&rebuildOpts.From, "from", "", "", "Starts from 'prebuild' or 'snapshot'.")
-	rebuildCmd.PersistentFlags().BoolVarP(&rebuildOpts.Prebuild, "prebuild", "", false, "starts as a prebuild workspace (--from is ignored).")
+	setFlags := func(cmd *cobra.Command) {
+		cmd.PersistentFlags().BoolVarP(&validateOpts.Prebuild, "prebuild", "", false, "starts as a prebuild workspace.")
+		cmd.PersistentFlags().StringVarP(&validateOpts.LogLevel, "log", "", "error", "Log level to use. Allowed values are 'error', 'warn', 'info', 'debug', 'trace'.")
 
-	// internal
-	rebuildCmd.PersistentFlags().StringArrayVarP(&rebuildOpts.GitpodEnvs, "gitpod-env", "", nil, "")
-	rebuildCmd.PersistentFlags().MarkHidden("gitpod-env")
+		// internal
+		cmd.PersistentFlags().StringArrayVarP(&validateOpts.GitpodEnvs, "gitpod-env", "", nil, "")
+		cmd.PersistentFlags().StringVarP(&validateOpts.WorkspaceFolder, "workspace-folder", "w", workspaceFolder, "Path to the workspace folder.")
+		cmd.PersistentFlags().StringVarP(&validateOpts.From, "from", "", "", "Starts from 'prebuild' or 'snapshot'.")
+		_ = cmd.PersistentFlags().MarkHidden("gitpod-env")
+		_ = cmd.PersistentFlags().MarkHidden("workspace-folder")
+		_ = cmd.PersistentFlags().MarkHidden("from")
+	}
+
+	setFlags(validateCmd)
+	setFlags(rebuildCmd)
+
+	rootCmd.AddCommand(validateCmd)
+	rootCmd.AddCommand(rebuildCmd)
 }
diff --git a/components/supervisor/validate.sh b/components/supervisor/validate.sh
index 3587a1025a4452..eb229b2f26e527 100755
--- a/components/supervisor/validate.sh
+++ b/components/supervisor/validate.sh
@@ -27,4 +27,4 @@ sudo rm -rf /.supervisor/frontend && true
 sudo ln -s "$DIR/frontend/dist" /.supervisor/frontend
 echo "$DIR/frontend/dist linked in /.supervisor/frontend"
 
-gp rebuild --workspace-folder="$ROOT_DIR/dev/ide/example/workspace" --gitpod-env "GITPOD_ANALYTICS_SEGMENT_KEY=YErmvd89wPsrCuGcVnF2XAl846W9WIGl" --gitpod-env "GP_OPEN_EDITOR=" --gitpod-env "GP_PREVIEW_BROWSER=" --gitpod-env "GP_EXTERNAL_BROWSER=" "$@"
+gp validate --workspace-folder="$ROOT_DIR/dev/ide/example/workspace" --gitpod-env "GITPOD_ANALYTICS_SEGMENT_KEY=YErmvd89wPsrCuGcVnF2XAl846W9WIGl" --gitpod-env "GP_OPEN_EDITOR=" --gitpod-env "GP_PREVIEW_BROWSER=" --gitpod-env "GP_EXTERNAL_BROWSER=" "$@"
diff --git a/install/installer/cmd/testdata/render/agent-smith/output.golden b/install/installer/cmd/testdata/render/agent-smith/output.golden
index 83c46759ecc3ea..81efd023f34292 100644
--- a/install/installer/cmd/testdata/render/agent-smith/output.golden
+++ b/install/installer/cmd/testdata/render/agent-smith/output.golden
@@ -3915,11 +3915,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/aws-setup/output.golden b/install/installer/cmd/testdata/render/aws-setup/output.golden
index 8d33fa6292ebcc..457d0544fddf4c 100644
--- a/install/installer/cmd/testdata/render/aws-setup/output.golden
+++ b/install/installer/cmd/testdata/render/aws-setup/output.golden
@@ -3356,11 +3356,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/custom-pull-repository/output.golden b/install/installer/cmd/testdata/render/custom-pull-repository/output.golden
index 24a6e32e8581fb..ea2b4c14d0ea79 100644
--- a/install/installer/cmd/testdata/render/custom-pull-repository/output.golden
+++ b/install/installer/cmd/testdata/render/custom-pull-repository/output.golden
@@ -3732,11 +3732,11 @@ data:
             "image": "registry.mydomain.com/namespace/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "registry.mydomain.com/namespace/ide/code:nightly",
             "imageLayers": [
-              "registry.mydomain.com/namespace/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "registry.mydomain.com/namespace/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "registry.mydomain.com/namespace/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "registry.mydomain.com/namespace/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "registry.mydomain.com/namespace/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "registry.mydomain.com/namespace/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/customization/output.golden b/install/installer/cmd/testdata/render/customization/output.golden
index 50ff9db8d1ea9c..49242c64c02798 100644
--- a/install/installer/cmd/testdata/render/customization/output.golden
+++ b/install/installer/cmd/testdata/render/customization/output.golden
@@ -4304,11 +4304,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/external-registry/output.golden b/install/installer/cmd/testdata/render/external-registry/output.golden
index 9b54d089585c11..464fbee15c3595 100644
--- a/install/installer/cmd/testdata/render/external-registry/output.golden
+++ b/install/installer/cmd/testdata/render/external-registry/output.golden
@@ -3566,11 +3566,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/gcp-setup/output.golden b/install/installer/cmd/testdata/render/gcp-setup/output.golden
index 8f6b42656fadd3..83d587371e0914 100644
--- a/install/installer/cmd/testdata/render/gcp-setup/output.golden
+++ b/install/installer/cmd/testdata/render/gcp-setup/output.golden
@@ -3393,11 +3393,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/http-proxy/output.golden b/install/installer/cmd/testdata/render/http-proxy/output.golden
index dfb2590c059e44..7b30edc0aaf3c1 100644
--- a/install/installer/cmd/testdata/render/http-proxy/output.golden
+++ b/install/installer/cmd/testdata/render/http-proxy/output.golden
@@ -3735,11 +3735,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/ide-config/output.golden b/install/installer/cmd/testdata/render/ide-config/output.golden
index f194b36703ae1a..b5e9a25839d723 100644
--- a/install/installer/cmd/testdata/render/ide-config/output.golden
+++ b/install/installer/cmd/testdata/render/ide-config/output.golden
@@ -3748,11 +3748,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/kind-ide/output.golden b/install/installer/cmd/testdata/render/kind-ide/output.golden
index f1841ce770f037..708341ded8b76f 100644
--- a/install/installer/cmd/testdata/render/kind-ide/output.golden
+++ b/install/installer/cmd/testdata/render/kind-ide/output.golden
@@ -1290,11 +1290,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/kind-meta/output.golden b/install/installer/cmd/testdata/render/kind-meta/output.golden
index 2b0dc998f262dc..146bae54a88e0c 100644
--- a/install/installer/cmd/testdata/render/kind-meta/output.golden
+++ b/install/installer/cmd/testdata/render/kind-meta/output.golden
@@ -2678,11 +2678,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/message-bus-password/output.golden b/install/installer/cmd/testdata/render/message-bus-password/output.golden
index 27bd4511fe2a1e..60ec0a2c83d384 100644
--- a/install/installer/cmd/testdata/render/message-bus-password/output.golden
+++ b/install/installer/cmd/testdata/render/message-bus-password/output.golden
@@ -3735,11 +3735,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/minimal/output.golden b/install/installer/cmd/testdata/render/minimal/output.golden
index ed697cb14f5417..18610d59550546 100644
--- a/install/installer/cmd/testdata/render/minimal/output.golden
+++ b/install/installer/cmd/testdata/render/minimal/output.golden
@@ -3732,11 +3732,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/overrides-inline/output.golden b/install/installer/cmd/testdata/render/overrides-inline/output.golden
index 17f1bd9b1edccd..ecae9900eed38a 100644
--- a/install/installer/cmd/testdata/render/overrides-inline/output.golden
+++ b/install/installer/cmd/testdata/render/overrides-inline/output.golden
@@ -3730,11 +3730,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/pod-config/output.golden b/install/installer/cmd/testdata/render/pod-config/output.golden
index 74240f11494da2..7f5e0e66e45b60 100644
--- a/install/installer/cmd/testdata/render/pod-config/output.golden
+++ b/install/installer/cmd/testdata/render/pod-config/output.golden
@@ -3739,11 +3739,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/shortname/output.golden b/install/installer/cmd/testdata/render/shortname/output.golden
index 1650bf16616d7c..17f4928c55ef31 100644
--- a/install/installer/cmd/testdata/render/shortname/output.golden
+++ b/install/installer/cmd/testdata/render/shortname/output.golden
@@ -3732,11 +3732,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/statefulset-customization/output.golden b/install/installer/cmd/testdata/render/statefulset-customization/output.golden
index 2a8a74f255779a..a1a98cf38a30d4 100644
--- a/install/installer/cmd/testdata/render/statefulset-customization/output.golden
+++ b/install/installer/cmd/testdata/render/statefulset-customization/output.golden
@@ -3744,11 +3744,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/telemetry/output.golden b/install/installer/cmd/testdata/render/telemetry/output.golden
index 87ebe96095d99b..13d1a0b625a6ec 100644
--- a/install/installer/cmd/testdata/render/telemetry/output.golden
+++ b/install/installer/cmd/testdata/render/telemetry/output.golden
@@ -3735,11 +3735,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden
index 7265d049e44ebd..1826962149d2e1 100644
--- a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden
+++ b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden
@@ -4065,11 +4065,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden b/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden
index d0e3c3275a3c8a..e9f4dbe289339f 100644
--- a/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden
+++ b/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden
@@ -3735,11 +3735,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden b/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden
index 3c8ecafe2c156a..6cf29bae09fd76 100644
--- a/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden
+++ b/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden
@@ -3735,11 +3735,11 @@ data:
             "image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-09c60f2a32f8f33a583d41b9878741730fb756cb",
             "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly",
             "imageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ],
             "latestImageLayers": [
-              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e",
+              "eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-3b076b91039c47404d98c4a3198edf2982e24af7",
               "eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:test"
             ]
           },
diff --git a/install/installer/pkg/components/workspace/ide/constants.go b/install/installer/pkg/components/workspace/ide/constants.go
index 9af050cb9fa5ab..ca03e1897c5c81 100644
--- a/install/installer/pkg/components/workspace/ide/constants.go
+++ b/install/installer/pkg/components/workspace/ide/constants.go
@@ -9,7 +9,7 @@ const (
 	CodeIDEImageStableVersion   = "commit-09c60f2a32f8f33a583d41b9878741730fb756cb" // stable version that will be updated manually on demand
 	CodeHelperIDEImage          = "ide/code-codehelper"
 	CodeWebExtensionImage       = "ide/gitpod-code-web"
-	CodeWebExtensionVersion     = "commit-9bca96df9401ae4a74ab4632548cb3c20136fa4e" // gitpod-web extension version comes from https://github.com/gitpod-io/gitpod-code
+	CodeWebExtensionVersion     = "commit-3b076b91039c47404d98c4a3198edf2982e24af7" // gitpod-web extension version comes from https://github.com/gitpod-io/gitpod-code
 	CodeDesktopIDEImage         = "ide/code-desktop"
 	CodeDesktopInsidersIDEImage = "ide/code-desktop-insiders"
 	IntelliJDesktopIDEImage     = "ide/intellij"