diff --git a/values-global.yaml b/values-global.yaml
index 2899ceb..1622259 100644
--- a/values-global.yaml
+++ b/values-global.yaml
@@ -8,7 +8,7 @@ global:
     installPlanApproval: Automatic
 
 main:
-  clusterGroupName: prod
+  clusterGroupName: staging
   multiSourceConfig:
     enabled: true
     clusterGroupChartVersion: 0.9.*
diff --git a/values-prod.yaml b/values-prod.yaml
index 9263a88..4ec0758 100644
--- a/values-prod.yaml
+++ b/values-prod.yaml
@@ -10,8 +10,6 @@ clusterGroup:
     vault:
     multicluster-engine:
     group-sync-operator:
-    golang-external-secrets:
-      disabled: true
     external-secrets-operator:
       operatorGroup: true
       targetNamespaces: []
@@ -72,9 +70,6 @@ clusterGroup:
       annotations:
         argocd.argoproj.io/sync-wave: "28"
 
-    golang-external-secrets:
-      disabled: true
-
     openshift-external-secrets:
       name: openshift-external-secrets
       namespace: external-secrets
diff --git a/values-staging.yaml b/values-staging.yaml
index b61a19f..1212170 100644
--- a/values-staging.yaml
+++ b/values-staging.yaml
@@ -3,17 +3,27 @@ clusterGroup:
   isHubCluster: true
   sharedValueFiles:
     - /values-hypershift.yaml
+    - '/overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
+    - '/overrides/values-{{ $.Values.global.clusterVersion }}-{{ $.Values.clusterGroup.name }}.yaml'
 
   namespaces:
-    - vault
-    - golang-external-secrets
+    vault:
+    external-secrets-operator:
+      operatorGroup: true
+      targetNamespaces: []
+    external-secrets:
     - multicluster-engine
 
   subscriptions:
+    eso:
+      name: openshift-external-secrets-operator
+      namespace: external-secrets-operator
+      channel: stable-v1
+    
     mce:
       name: multicluster-engine
       namespace: multicluster-engine
-      channel: stable-2.10
+      channel: stable-2.11
     
   projects:
     - hub
@@ -23,23 +33,39 @@ clusterGroup:
     vault:
       name: vault
       namespace: vault
-      project: hub
+      argoProject: hub
       chart: hashicorp-vault
       chartVersion: 0.1.*
 
-    golang-external-secrets:
-      name: golang-external-secrets
-      namespace: golang-external-secrets
-      project: hub
-      chart: golang-external-secrets
-      chartVersion: 0.1.*
+    openshift-external-secrets:
+      name: openshift-external-secrets
+      namespace: external-secrets
+      argoProject: hub
+      chart: openshift-external-secrets
+      chartVersion: 0.0.*
 
     hypershift:
       disabled: false
       name: hypershift
       namespace: multicluster-engine
-      project: hypershift
-      path: charts/all/hypershift
+      argoProject: hypershift
+      chart: hypershift-config
+      chartVersion: 0.0.*
+  
+    hypershift-cli:
+      disabled: false
+      name: hcp-cli
+      namespace: cluster-provisioning
+      argoProject: infrastructure
+      path: charts/all/hcp-cli  
+
+    autoscaler:
+      disabled: false
+      name: cluster-autoscaler
+      namespace: openshift-machine-api
+      argoProject: hypershift
+      chart: cluster-autoscaler
+      chartVersion: 0.0.*
 
   imperative:
     # NOTE: We *must* use lists and not hashes. As hashes lose ordering once parsed by helm
@@ -65,4 +91,4 @@ clusterGroup:
         value: group-one
       helmOverrides:
       - name: clusterGroup.isHubCluster
-        value: false
+        value: false
\ No newline at end of file