diff --git a/charts/all/config-demo/templates/config-demo-external-secret.yaml b/charts/all/config-demo/templates/config-demo-external-secret.yaml
index 496ca0a2e..6bfebbacf 100644
--- a/charts/all/config-demo/templates/config-demo-external-secret.yaml
+++ b/charts/all/config-demo/templates/config-demo-external-secret.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: {{ .Values.esoversion }}
+apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
   name: config-demo-secret
diff --git a/charts/all/config-demo/values.yaml b/charts/all/config-demo/values.yaml
index e7484f0c7..453b80b10 100644
--- a/charts/all/config-demo/values.yaml
+++ b/charts/all/config-demo/values.yaml
@@ -3,7 +3,6 @@ secretStore:
   name: vault-backend
   kind: ClusterSecretStore
 
-esoversion: "external-secrets.io/v1beta1"
 configdemosecret:
   key: secret/data/global/config-demo
   refreshInterval: 5m0s
diff --git a/values-4.20-group-one.yaml b/values-4.20-group-one.yaml
deleted file mode 100644
index 8d4c5a8e5..000000000
--- a/values-4.20-group-one.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-esoversion: "external-secrets.io/v1"
-
-clusterGroup:
-  namespaces:
-    golang-external-secrets:
-      disabled: true
-    external-secrets-operator:
-      operatorGroup: true
-      targetNamespaces: []
-    external-secrets:
-  subscriptions:
-    eso:
-      name: openshift-external-secrets-operator
-      namespace: external-secrets-operator
-      channel: stable-v1
-  applications:
-    golang-external-secrets:
-      disabled: true
-    openshift-external-secrets:
-      name: openshift-external-secrets
-      namespace: external-secrets
-      argoProject: eso
-      chart: openshift-external-secrets
-      chartVersion: 0.0.*
diff --git a/values-4.20-hub.yaml b/values-4.20-hub.yaml
deleted file mode 100644
index fc8d37601..000000000
--- a/values-4.20-hub.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-esoversion: "external-secrets.io/v1"
-
-clusterGroup:
-  namespaces:
-    golang-external-secrets:
-      disabled: true
-    external-secrets-operator:
-      operatorGroup: true
-      targetNamespaces: []
-    external-secrets:
-  subscriptions:
-    eso:
-      name: openshift-external-secrets-operator
-      namespace: external-secrets-operator
-      channel: stable-v1
-  applications:
-    golang-external-secrets:
-      disabled: true
-    openshift-external-secrets:
-      name: openshift-external-secrets
-      namespace: external-secrets
-      argoProject: hub
-      chart: openshift-external-secrets
-      chartVersion: 0.0.*
diff --git a/values-4.21-group-one.yaml b/values-4.21-group-one.yaml
deleted file mode 100644
index 8d4c5a8e5..000000000
--- a/values-4.21-group-one.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-esoversion: "external-secrets.io/v1"
-
-clusterGroup:
-  namespaces:
-    golang-external-secrets:
-      disabled: true
-    external-secrets-operator:
-      operatorGroup: true
-      targetNamespaces: []
-    external-secrets:
-  subscriptions:
-    eso:
-      name: openshift-external-secrets-operator
-      namespace: external-secrets-operator
-      channel: stable-v1
-  applications:
-    golang-external-secrets:
-      disabled: true
-    openshift-external-secrets:
-      name: openshift-external-secrets
-      namespace: external-secrets
-      argoProject: eso
-      chart: openshift-external-secrets
-      chartVersion: 0.0.*
diff --git a/values-4.21-hub.yaml b/values-4.21-hub.yaml
deleted file mode 100644
index fc8d37601..000000000
--- a/values-4.21-hub.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-esoversion: "external-secrets.io/v1"
-
-clusterGroup:
-  namespaces:
-    golang-external-secrets:
-      disabled: true
-    external-secrets-operator:
-      operatorGroup: true
-      targetNamespaces: []
-    external-secrets:
-  subscriptions:
-    eso:
-      name: openshift-external-secrets-operator
-      namespace: external-secrets-operator
-      channel: stable-v1
-  applications:
-    golang-external-secrets:
-      disabled: true
-    openshift-external-secrets:
-      name: openshift-external-secrets
-      namespace: external-secrets
-      argoProject: hub
-      chart: openshift-external-secrets
-      chartVersion: 0.0.*
diff --git a/values-group-one.yaml b/values-group-one.yaml
index 90d3e27ad..1c9cee24d 100644
--- a/values-group-one.yaml
+++ b/values-group-one.yaml
@@ -4,20 +4,27 @@ clusterGroup:
   namespaces:
     config-demo:
     hello-world:
-    golang-external-secrets:
-  # The only subscription on spokes is gitops which gets managed by ACM
-  # subscriptions:
+    external-secrets-operator:
+      operatorGroup: true
+      targetNamespaces: []
+    external-secrets:
+  # The gitops subscription on spokes gets managed by ACM
+  subscriptions:
+    eso:
+      name: openshift-external-secrets-operator
+      namespace: external-secrets-operator
+      channel: stable-v1
   argoProjects:
     - eso
     - config-demo
     - hello-world
   applications:
-    golang-external-secrets:
-      name: golang-external-secrets
-      namespace: golang-external-secrets
+    openshift-external-secrets:
+      name: openshift-external-secrets
+      namespace: external-secrets
       argoProject: eso
-      chart: golang-external-secrets
-      chartVersion: 0.2.*
+      chart: openshift-external-secrets
+      chartVersion: 0.0.*
     config-demo:
       name: config-demo
       namespace: config-demo
diff --git a/values-hub.yaml b/values-hub.yaml
index 71a664747..9b29943ab 100644
--- a/values-hub.yaml
+++ b/values-hub.yaml
@@ -4,7 +4,10 @@ clusterGroup:
   namespaces:
     open-cluster-management:
     vault:
-    golang-external-secrets:
+    external-secrets-operator:
+      operatorGroup: true
+      targetNamespaces: []
+    external-secrets:
     config-demo:
     hello-world:
   subscriptions:
@@ -13,6 +16,10 @@ clusterGroup:
       namespace: open-cluster-management
       channel: release-2.16
       # csv: advanced-cluster-management.v2.6.1
+    eso:
+      name: openshift-external-secrets-operator
+      namespace: external-secrets-operator
+      channel: stable-v1
   argoProjects:
     - hub
     - config-demo
@@ -51,12 +58,12 @@ clusterGroup:
       argoProject: hub
       chart: hashicorp-vault
       chartVersion: 0.1.*
-    golang-external-secrets:
-      name: golang-external-secrets
-      namespace: golang-external-secrets
+    openshift-external-secrets:
+      name: openshift-external-secrets
+      namespace: external-secrets
       argoProject: hub
-      chart: golang-external-secrets
-      chartVersion: 0.2.*
+      chart: openshift-external-secrets
+      chartVersion: 0.0.*
     config-demo:
       name: config-demo
       namespace: config-demo
diff --git a/values-standalone.yaml b/values-standalone.yaml
index d12c8b18d..c788db16d 100644
--- a/values-standalone.yaml
+++ b/values-standalone.yaml
@@ -1,10 +1,12 @@
 clusterGroup:
   name: standalone
   namespaces:
-    - vault
-    - golang-external-secrets
-    - config-demo
-    - hello-world
+    vault:
+    external-secrets-operator:
+      operatorGroup: true
+      targetNamespaces: []
+    config-demo:
+    hello-world:
   subscriptions: {}
   argoProjects:
     - hub
@@ -28,12 +30,12 @@ clusterGroup:
       argoProject: hub
       chart: hashicorp-vault
       chartVersion: 0.1.*
-    golang-external-secrets:
-      name: golang-external-secrets
-      namespace: golang-external-secrets
+    openshift-external-secrets:
+      name: openshift-external-secrets
+      namespace: external-secrets
       argoProject: hub
-      chart: golang-external-secrets
-      chartVersion: 0.1.*
+      chart: openshift-external-secrets
+      chartVersion: 0.0.*
     config-demo:
       name: config-demo
       namespace: config-demo