diff --git a/charts/postgres-cluster/Chart.yaml b/charts/postgres-cluster/Chart.yaml
index a171e8d..ad93d74 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.4
+version: 6.0.5
 description: Cloudnative-pg Cluster
 keywords:
   - database
diff --git a/charts/postgres-cluster/README.md b/charts/postgres-cluster/README.md
index 86fc462..747d18b 100644
--- a/charts/postgres-cluster/README.md
+++ b/charts/postgres-cluster/README.md
@@ -1,6 +1,6 @@
 # postgres-cluster
 
-![Version: 6.0.4](https://img.shields.io/badge/Version-6.0.4-informational?style=flat-square) ![AppVersion: v1.26.0](https://img.shields.io/badge/AppVersion-v1.26.0-informational?style=flat-square)
+![Version: 6.0.5](https://img.shields.io/badge/Version-6.0.5-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 b8883e1..b0fb922 100644
--- a/charts/postgres-cluster/templates/object-store.yaml
+++ b/charts/postgres-cluster/templates/object-store.yaml
@@ -14,12 +14,12 @@ spec:
   configuration:
     destinationPath: {{ $context.destinationPath }}
     endpointURL: {{ $context.endpointURL }}
-    {{- if $context.endpointCA.name }}
+    {{- if not (empty $context.endpointCA.name) }}
     endpointCA:
       name: {{ $context.endpointCA.name }}
       key: {{ $context.endpointCA.key }}
     {{- end }}
-    {{- if $context.clusterName }}
+    {{- if not (empty $context.clusterName) }}
     serverName: "{{ $context.clusterName }}-backup-{{ $context.index }}"
     {{- else }}
     serverName: "{{ include "cluster.name" $context }}-backup-{{ $context.index }}"
@@ -38,14 +38,14 @@ spec:
       jobs: {{ $context.data.jobs }}
     s3Credentials:
       accessKeyId:
-        {{- if $context.endpointCredentials }}
+        {{- if not (empty $context.endpointCredentials) }}
         name: {{ $context.endpointCredentials }}
         {{- else }}
         name: {{- printf "%s-backup-secret" (include "cluster.name" $context) | trunc 63 | trimSuffix "-" -}}
         {{- end }}
         key: ACCESS_KEY_ID
       secretAccessKey:
-        {{- if $context.endpointCredentials }}
+        {{- if not (empty $context.endpointCredentials) }}
         name: {{ $context.endpointCredentials }}
         {{- else }}
         name: {{- printf "%s-backup-secret" (include "cluster.name" $context) | trunc 63 | trimSuffix "-" -}}
@@ -67,7 +67,7 @@ spec:
   configuration:
     destinationPath: {{ .Values.recovery.objectStore.destinationPath }}
     endpointURL: {{ .Values.recovery.objectStore.endpointURL }}
-    {{- if .Values.recovery.objectStore.endpointCA.name }}
+    {{- if not (empty .Values.recovery.objectStore.endpointCA.name) }}
     endpointCA:
       name: {{ .Values.recovery.objectStore.endpointCA.name }}
       key: {{ .Values.recovery.objectStore.endpointCA.key }}