diff --git a/scripts/gen-secrets.sh b/scripts/gen-secrets.sh
index 16c35807..adeeb636 100755
--- a/scripts/gen-secrets.sh
+++ b/scripts/gen-secrets.sh
@@ -4,8 +4,6 @@ echo "Creating secrets as required"
 echo
 
 COCO_SECRETS_DIR="${HOME}/.coco-pattern"
-KBS_PRIVATE_KEY="${COCO_SECRETS_DIR}/kbsPrivateKey"
-KBS_PUBLIC_KEY="${COCO_SECRETS_DIR}/kbsPublicKey"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 VALUES_FILE="${HOME}/values-secret-coco-pattern.yaml"
 
@@ -21,13 +19,6 @@ if [ "${COCO_ENABLE_SSH_DEBUG:-false}" = "true" ]; then
 	fi
 fi
 
-if [ ! -f "${KBS_PRIVATE_KEY}" ]; then
-	echo "Creating kbs keys"
-	rm -f "${KBS_PUBLIC_KEY}"
-	openssl genpkey -algorithm ed25519 >${KBS_PRIVATE_KEY}
-	openssl pkey -in "${KBS_PRIVATE_KEY}" -pubout -out "${KBS_PUBLIC_KEY}"
-fi
-
 ## PCCS secrets for bare metal Intel TDX deployments
 PCCS_PRIVATE_KEY="${COCO_SECRETS_DIR}/pccs_private.pem"
 PCCS_CERTIFICATE="${COCO_SECRETS_DIR}/pccs_certificate.pem"
diff --git a/values-azure.yaml b/values-azure.yaml
index 48c5d703..46cd037b 100644
--- a/values-azure.yaml
+++ b/values-azure.yaml
@@ -36,13 +36,13 @@ clusterGroup:
       namespace: openshift-sandboxed-containers-operator
       channel: stable
       installPlanApproval: Manual
-      csv: sandboxed-containers-operator.v1.12.0
+      csv: sandboxed-containers-operator.v1.13.0
     trustee:
       name: trustee-operator
       namespace: trustee-operator-system
       channel: stable
       installPlanApproval: Manual
-      csv: trustee-operator.v1.1.0
+      csv: trustee-operator.v1.2.0
     cert-manager:
       name: openshift-cert-manager-operator
       namespace: cert-manager-operator
@@ -87,7 +87,7 @@ clusterGroup:
       namespace: trustee-operator-system
       project: trustee
       chart: trustee
-      chartVersion: 0.8.*
+      chartVersion: 0.9.*
       extraValueFiles:
         - '/overrides/values-trustee.yaml'
       overrides:
diff --git a/values-baremetal.yaml b/values-baremetal.yaml
index 0d037ace..d9f45f9a 100644
--- a/values-baremetal.yaml
+++ b/values-baremetal.yaml
@@ -41,7 +41,7 @@ clusterGroup:
       namespace: openshift-sandboxed-containers-operator
       channel: stable
       installPlanApproval: Manual
-      csv: sandboxed-containers-operator.v1.12.0
+      csv: sandboxed-containers-operator.v1.13.0
       annotations:
         argocd.argoproj.io/sync-wave: "10"
     trustee:
@@ -49,7 +49,7 @@ clusterGroup:
       namespace: trustee-operator-system
       channel: stable
       installPlanApproval: Manual
-      csv: trustee-operator.v1.1.0
+      csv: trustee-operator.v1.2.0
       annotations:
         argocd.argoproj.io/sync-wave: "10"
     cert-manager:
@@ -163,8 +163,9 @@ clusterGroup:
       project: trustee
       annotations:
         argocd.argoproj.io/sync-wave: "20"
-      chart: trustee
-      chartVersion: 0.8.*
+      repoURL: https://github.com/butler54/trustee-chart.git
+      targetRevision: dev/osc-1.13-upgrade
+      path: .
       extraValueFiles:
         - '/overrides/values-trustee.yaml'
       overrides:
@@ -172,8 +173,6 @@ clusterGroup:
           value: "true"
         - name: kbs.tdx.enabled
           value: "true"
-        - name: kbs.tdx.collateralService
-          value: "https://pccs-service.intel-dcap.svc.cluster.local:8042/sgx/certification/v4/"
         - name: kbs.gpu.enabled
           value: "true"
         - name: kbs.baremetal.enabled
diff --git a/values-secret.yaml.template b/values-secret.yaml.template
index 1afb92d0..732728fb 100644
--- a/values-secret.yaml.template
+++ b/values-secret.yaml.template
@@ -11,23 +11,6 @@ secrets:
   # Core KBS Secrets (Always Required)
   # ===================================================================
 
-  # KBS public key - used by workloads to verify KBS identity
-  - name: kbsPublicKey
-    vaultPrefixes:
-    - hub
-    fields:
-    - name: publicKey
-      path: ~/.coco-pattern/kbsPublicKey
-
-  # KBS private key - used by KBS to sign responses
-  # Generated by gen-secrets.sh alongside kbsPublicKey
-  - name: kbsPrivateKey
-    vaultPrefixes:
-    - global
-    fields:
-    - name: privateKey
-      path: ~/.coco-pattern/kbsPrivateKey
-
   # Auto-generated test secrets provided by KBS
   - name: kbsres1
     vaultPrefixes:
diff --git a/values-trusted-hub.yaml b/values-trusted-hub.yaml
index a54f1a48..4037e9af 100644
--- a/values-trusted-hub.yaml
+++ b/values-trusted-hub.yaml
@@ -31,7 +31,7 @@ clusterGroup:
       namespace: trustee-operator-system
       channel: stable
       installPlanApproval: Manual
-      csv: trustee-operator.v1.1.0
+      csv: trustee-operator.v1.2.0
     cert-manager:
       name: openshift-cert-manager-operator
       namespace: cert-manager-operator
@@ -77,7 +77,7 @@ clusterGroup:
       namespace: trustee-operator-system
       project: trustee
       chart: trustee
-      chartVersion: 0.8.*
+      chartVersion: 0.9.*
       extraValueFiles:
         - '/overrides/values-trustee.yaml'
       overrides: