diff --git a/install/installer/pkg/components/server/deployment.go b/install/installer/pkg/components/server/deployment.go
index ba09c7422b..6ec4dda7f2 100644
--- a/install/installer/pkg/components/server/deployment.go
+++ b/install/installer/pkg/components/server/deployment.go
@@ -17,6 +17,7 @@ import (
 	"github.com/gitpod-io/gitpod/installer/pkg/components/spicedb"
 	"github.com/gitpod-io/gitpod/installer/pkg/components/usage"
 	wsmanager "github.com/gitpod-io/gitpod/installer/pkg/components/ws-manager"
+	wsmanagermk2 "github.com/gitpod-io/gitpod/installer/pkg/components/ws-manager-mk2"
 
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
 	wsmanagerbridge "github.com/gitpod-io/gitpod/installer/pkg/components/ws-manager-bridge"
@@ -240,11 +241,19 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 
 	addWsManagerTls := common.WithLocalWsManager(ctx)
 	if addWsManagerTls {
+		secretName := wsmanager.TLSSecretNameClient
+		_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
+			if cfg.Workspace != nil && cfg.Workspace.UseWsmanagerMk2 {
+				secretName = wsmanagermk2.TLSSecretNameClient
+			}
+			return nil
+		})
+
 		volumes = append(volumes, corev1.Volume{
 			Name: "ws-manager-client-tls-certs",
 			VolumeSource: corev1.VolumeSource{
 				Secret: &corev1.SecretVolumeSource{
-					SecretName: wsmanager.TLSSecretNameClient,
+					SecretName: secretName,
 				},
 			},
 		})
diff --git a/install/installer/pkg/components/ws-manager-bridge/deployment.go b/install/installer/pkg/components/ws-manager-bridge/deployment.go
index 96fec25895..618ae72351 100644
--- a/install/installer/pkg/components/ws-manager-bridge/deployment.go
+++ b/install/installer/pkg/components/ws-manager-bridge/deployment.go
@@ -11,6 +11,8 @@ import (
 	"github.com/gitpod-io/gitpod/installer/pkg/cluster"
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
 	wsmanager "github.com/gitpod-io/gitpod/installer/pkg/components/ws-manager"
+	wsmanagermk2 "github.com/gitpod-io/gitpod/installer/pkg/components/ws-manager-mk2"
+	"github.com/gitpod-io/gitpod/installer/pkg/config/v1/experimental"
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -35,11 +37,19 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 
 	addWsManagerTls := common.WithLocalWsManager(ctx)
 	if addWsManagerTls {
+		secretName := wsmanager.TLSSecretNameClient
+		_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
+			if cfg.Workspace != nil && cfg.Workspace.UseWsmanagerMk2 {
+				secretName = wsmanagermk2.TLSSecretNameClient
+			}
+			return nil
+		})
+
 		volumes = append(volumes, corev1.Volume{
 			Name: "ws-manager-client-tls-certs",
 			VolumeSource: corev1.VolumeSource{
 				Secret: &corev1.SecretVolumeSource{
-					SecretName: wsmanager.TLSSecretNameClient,
+					SecretName: secretName,
 				},
 			},
 		})