diff --git a/.github/workflows/jsonschema.yaml b/.github/workflows/jsonschema.yaml
index 03e563dbc..79f22d7b0 100644
--- a/.github/workflows/jsonschema.yaml
+++ b/.github/workflows/jsonschema.yaml
@@ -45,6 +45,10 @@ jobs:
           set -e
           find . -maxdepth 1 -type f -name "values-*.yaml" ! -name "values-global.yaml" -print0 | while IFS= read -r -d '' i;
           do
+            if [[ "$i" =~ 4\.[0-9]+ ]]; then
+              echo "Skipping $i"
+              continue
+            fi
             echo "$i"
             # disable shellcheck of single quotes in yq
             # shellcheck disable=2016
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 0081dd875..fa9ed0180 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: "external-secrets.io/v1beta1"
+apiVersion: {{ .Values.esoversion }}
 kind: ExternalSecret
 metadata:
   name: config-demo-secret
diff --git a/charts/all/config-demo/values.yaml b/charts/all/config-demo/values.yaml
index 2dda45229..6d27c371d 100644
--- a/charts/all/config-demo/values.yaml
+++ b/charts/all/config-demo/values.yaml
@@ -3,6 +3,7 @@ secretStore:
   name: vault-backend
   kind: ClusterSecretStore
 
+esoversion: "external-secrets.io/v1beta1"
 configdemosecret:
   key: secret/data/global/config-demo
 
diff --git a/values-4.20-group-one.yaml b/values-4.20-group-one.yaml
new file mode 100644
index 000000000..8d4c5a8e5
--- /dev/null
+++ b/values-4.20-group-one.yaml
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 000000000..fc8d37601
--- /dev/null
+++ b/values-4.20-hub.yaml
@@ -0,0 +1,24 @@
+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 4be23f17d..cd163243f 100644
--- a/values-group-one.yaml
+++ b/values-group-one.yaml
@@ -1,10 +1,11 @@
 clusterGroup:
   name: group-one
   isHubCluster: false
+  # Namespace is a dictionary for easier overriding (lists are supported as well)
   namespaces:
-    - config-demo
-    - hello-world
-    - golang-external-secrets
+    config-demo:
+    hello-world:
+    golang-external-secrets:
   # The only subscription on spokes is gitops which gets managed by ACM
   # subscriptions:
   argoProjects:
diff --git a/values-hub.yaml b/values-hub.yaml
index 49fe2e94c..5df42e5dc 100644
--- a/values-hub.yaml
+++ b/values-hub.yaml
@@ -1,12 +1,13 @@
 clusterGroup:
   name: hub
   isHubCluster: true
+  # Namespace is a dictionary for easier overriding (lists are supported as well)
   namespaces:
-    - open-cluster-management
-    - vault
-    - golang-external-secrets
-    - config-demo
-    - hello-world
+    open-cluster-management:
+    vault:
+    golang-external-secrets:
+    config-demo:
+    hello-world:
   subscriptions:
     acm:
       name: advanced-cluster-management