diff --git a/components/ws-proxy/pkg/config/config.go b/components/ws-proxy/pkg/config/config.go
index f5a127d9cb9962..fc8d230a0585f9 100644
--- a/components/ws-proxy/pkg/config/config.go
+++ b/components/ws-proxy/pkg/config/config.go
@@ -70,7 +70,7 @@ func GetConfig(fn string) (*Config, error) {
 		return nil, xerrors.Errorf("config validation error: %w", err)
 	}
 
-	timeout := time.Minute * 5
+	timeout := time.Second * 45
 	log.WithField("timeout", timeout).Info("waiting for Feature Flag")
 	experimentsClient := experiments.NewClient(experiments.WithPollInterval(time.Second * 3))
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
diff --git a/install/installer/pkg/common/common.go b/install/installer/pkg/common/common.go
index b34f362014c745..b3c3999f0d1150 100644
--- a/install/installer/pkg/common/common.go
+++ b/install/installer/pkg/common/common.go
@@ -410,18 +410,6 @@ func ConfigcatEnv(ctx *RenderContext) []corev1.EnvVar {
 }
 
 func ConfigcatEnvOutOfCluster(ctx *RenderContext) []corev1.EnvVar {
-	var sdkKey string
-	_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
-		if cfg.WebApp != nil && cfg.WebApp.ConfigcatKey != "" {
-			sdkKey = cfg.WebApp.ConfigcatKey
-		}
-		return nil
-	})
-
-	if sdkKey == "" {
-		return nil
-	}
-
 	return []corev1.EnvVar{
 		{
 			Name:  "CONFIGCAT_SDK_KEY",