diff --git a/charts/postgres-cluster/Chart.yaml b/charts/postgres-cluster/Chart.yaml
index da135d8..70f526f 100644
--- a/charts/postgres-cluster/Chart.yaml
+++ b/charts/postgres-cluster/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: postgres-cluster
-version: 6.0.7
+version: 6.0.8
 description: Cloudnative-pg Cluster
 keywords:
   - database
diff --git a/charts/postgres-cluster/README.md b/charts/postgres-cluster/README.md
index 5fddec7..84f0edb 100644
--- a/charts/postgres-cluster/README.md
+++ b/charts/postgres-cluster/README.md
@@ -1,6 +1,6 @@
 # postgres-cluster
 
-![Version: 6.0.7](https://img.shields.io/badge/Version-6.0.7-informational?style=flat-square) ![AppVersion: v1.26.0](https://img.shields.io/badge/AppVersion-v1.26.0-informational?style=flat-square)
+![Version: 6.0.8](https://img.shields.io/badge/Version-6.0.8-informational?style=flat-square) ![AppVersion: v1.26.0](https://img.shields.io/badge/AppVersion-v1.26.0-informational?style=flat-square)
 
 Cloudnative-pg Cluster
 
diff --git a/charts/postgres-cluster/templates/object-store.yaml b/charts/postgres-cluster/templates/object-store.yaml
index b0fb922..08d0ef0 100644
--- a/charts/postgres-cluster/templates/object-store.yaml
+++ b/charts/postgres-cluster/templates/object-store.yaml
@@ -14,7 +14,7 @@ spec:
   configuration:
     destinationPath: {{ $context.destinationPath }}
     endpointURL: {{ $context.endpointURL }}
-    {{- if not (empty $context.endpointCA.name) }}
+    {{- if $context.endpointCA.enabled }}
     endpointCA:
       name: {{ $context.endpointCA.name }}
       key: {{ $context.endpointCA.key }}
@@ -67,7 +67,7 @@ spec:
   configuration:
     destinationPath: {{ .Values.recovery.objectStore.destinationPath }}
     endpointURL: {{ .Values.recovery.objectStore.endpointURL }}
-    {{- if not (empty .Values.recovery.objectStore.endpointCA.name) }}
+    {{- if .Values.recovery.objectStore.endpointCA.enabled }}
     endpointCA:
       name: {{ .Values.recovery.objectStore.endpointCA.name }}
       key: {{ .Values.recovery.objectStore.endpointCA.key }}