diff --git a/values-baremetal-gpu.yaml b/values-baremetal-gpu.yaml
index ecb54bff..1ba318d7 100644
--- a/values-baremetal-gpu.yaml
+++ b/values-baremetal-gpu.yaml
@@ -117,7 +117,7 @@ clusterGroup:
       namespace: trustee-operator-system
       project: trustee
       chart: trustee
-      chartVersion: 0.4.*
+      chartVersion: 0.6.*
       extraValueFiles:
         - '/overrides/values-trustee.yaml'
       overrides:
@@ -127,6 +127,8 @@ clusterGroup:
           value: "https://pccs-service.intel-dcap.svc.cluster.local:8042/sgx/certification/v4/"
         - name: kbs.gpu.enabled
           value: "true"
+        - name: kbs.baremetal.enabled
+          value: "true"
 
     storage:
       name: storage
diff --git a/values-baremetal.yaml b/values-baremetal.yaml
index f63b1c02..25a4414e 100644
--- a/values-baremetal.yaml
+++ b/values-baremetal.yaml
@@ -107,7 +107,7 @@ clusterGroup:
       namespace: trustee-operator-system
       project: trustee
       chart: trustee
-      chartVersion: 0.4.*
+      chartVersion: 0.6.*
       extraValueFiles:
         - '/overrides/values-trustee.yaml'
       overrides:
@@ -115,6 +115,8 @@ clusterGroup:
           value: "true"
         - name: kbs.tdx.collateralService
           value: "https://pccs-service.intel-dcap.svc.cluster.local:8042/sgx/certification/v4/"
+        - name: kbs.baremetal.enabled
+          value: "true"
 
     storage:
       name: storage