diff --git a/charts/all/intel-dcap/values.yaml b/charts/all/intel-dcap/values.yaml
index 5910caed..049a9993 100644
--- a/charts/all/intel-dcap/values.yaml
+++ b/charts/all/intel-dcap/values.yaml
@@ -3,5 +3,5 @@ baremetal:
     nodeSelector: ""  # optional: hostname for PCCS pinning. Empty = schedule anywhere with tolerations.
 
 secretStore:
-  name: ""
-  kind: ""
+  name: vault-backend
+  kind: ClusterSecretStore
diff --git a/values-azure-spoke.yaml b/values-azure-spoke.yaml
index 9e724888..43cd34d9 100644
--- a/values-azure-spoke.yaml
+++ b/values-azure-spoke.yaml
@@ -24,9 +24,8 @@ clusterGroup:
     sandbox:
       name: sandboxed-containers-operator
       namespace: openshift-sandboxed-containers-operator
-      source: redhat-operators
       channel: stable
-      installPlanApproval: Manual 
+      installPlanApproval: Manual
       csv: sandboxed-containers-operator.v1.12.0
     cert-manager:
       name: openshift-cert-manager-operator
@@ -57,7 +56,7 @@ clusterGroup:
 
     sandbox:
       name: sandbox
-      namespace: openshift-sandboxed-containers-operator #upstream config
+      namespace: openshift-sandboxed-containers-operator
       project: sandbox
       chart: sandboxed-containers
       chartVersion: 0.2.*
diff --git a/values-azure.yaml b/values-azure.yaml
index 69848dec..48c5d703 100644
--- a/values-azure.yaml
+++ b/values-azure.yaml
@@ -34,14 +34,12 @@ clusterGroup:
     sandbox:
       name: sandboxed-containers-operator
       namespace: openshift-sandboxed-containers-operator
-      source: redhat-operators
       channel: stable
-      installPlanApproval: Manual 
+      installPlanApproval: Manual
       csv: sandboxed-containers-operator.v1.12.0
     trustee:
       name: trustee-operator
       namespace: trustee-operator-system
-      source: redhat-operators
       channel: stable
       installPlanApproval: Manual
       csv: trustee-operator.v1.1.0
@@ -86,7 +84,7 @@ clusterGroup:
       chartVersion: 0.0.*
     trustee:
       name: trustee
-      namespace: trustee-operator-system #upstream config
+      namespace: trustee-operator-system
       project: trustee
       chart: trustee
       chartVersion: 0.8.*
@@ -97,13 +95,14 @@ clusterGroup:
           value: "true"
     sandbox:
       name: sandbox
-      namespace: openshift-sandboxed-containers-operator #upstream config
+      namespace: openshift-sandboxed-containers-operator
       project: sandbox
       chart: sandboxed-containers
       chartVersion: 0.2.*
     sandbox-policies:
       name: sandbox-policies
-      namespace: openshift-sandboxed-containers-operator #upstream config
+      namespace: openshift-sandboxed-containers-operator
+      project: sandbox
       chart: sandboxed-policies
       chartVersion: 0.2.*
       overrides:
diff --git a/values-baremetal.yaml b/values-baremetal.yaml
index 4ddb685e..0d037ace 100644
--- a/values-baremetal.yaml
+++ b/values-baremetal.yaml
@@ -39,7 +39,6 @@ clusterGroup:
     sandbox:
       name: sandboxed-containers-operator
       namespace: openshift-sandboxed-containers-operator
-      source: redhat-operators
       channel: stable
       installPlanApproval: Manual
       csv: sandboxed-containers-operator.v1.12.0
@@ -48,7 +47,6 @@ clusterGroup:
     trustee:
       name: trustee-operator
       namespace: trustee-operator-system
-      source: redhat-operators
       channel: stable
       installPlanApproval: Manual
       csv: trustee-operator.v1.1.0
@@ -61,14 +59,10 @@ clusterGroup:
     lvm-operator:
       name: lvms-operator
       namespace: openshift-storage
-      source: redhat-operators
-      installPlanApproval: Automatic
     cnv:
       name: kubevirt-hyperconverged
       namespace: openshift-cnv
-      source: redhat-operators
       channel: stable
-      installPlanApproval: Automatic
     nfd:
       name: nfd
       namespace: openshift-nfd
@@ -210,12 +204,6 @@ clusterGroup:
       chart: sandboxed-containers
       chartVersion: 0.2.*
       overrides:
-        - name: global.secretStore.backend
-          value: vault
-        - name: secretStore.name
-          value: vault-backend
-        - name: secretStore.kind
-          value: ClusterSecretStore
         - name: enablePeerPods
           value: "false"
 
@@ -233,11 +221,6 @@ clusterGroup:
           name: sgxdeviceplugin-sample
           jsonPointers:
             - /spec
-      overrides:
-        - name: secretStore.name
-          value: vault-backend
-        - name: secretStore.kind
-          value: ClusterSecretStore
 
     nvidia-gpu:
       name: nvidia-gpu
@@ -261,6 +244,7 @@ clusterGroup:
     sandbox-policies:
       name: sandbox-policies
       namespace: openshift-sandboxed-containers-operator
+      project: sandbox
       chart: sandboxed-policies
       chartVersion: 0.2.*
       annotations:
diff --git a/values-trusted-hub.yaml b/values-trusted-hub.yaml
index fbf6bdf1..a54f1a48 100644
--- a/values-trusted-hub.yaml
+++ b/values-trusted-hub.yaml
@@ -29,7 +29,6 @@ clusterGroup:
     trustee:
       name: trustee-operator
       namespace: trustee-operator-system
-      source: redhat-operators
       channel: stable
       installPlanApproval: Manual
       csv: trustee-operator.v1.1.0
@@ -75,7 +74,7 @@ clusterGroup:
 
     trustee:
       name: trustee
-      namespace: trustee-operator-system #upstream config
+      namespace: trustee-operator-system
       project: trustee
       chart: trustee
       chartVersion: 0.8.*
@@ -86,7 +85,8 @@ clusterGroup:
           value: "true"
     sandbox-policies:
       name: sandbox-policies
-      namespace: openshift-sandboxed-containers-operator #upstream config
+      namespace: openshift-sandboxed-containers-operator
+      project: sandbox
       chart: sandboxed-policies
       chartVersion: 0.2.*
       overrides: