diff --git a/charts/sn-platform-slim/templates/broker/broker-cluster.yaml b/charts/sn-platform-slim/templates/broker/broker-cluster.yaml
index cfe06fa4c..9cd966496 100644
--- a/charts/sn-platform-slim/templates/broker/broker-cluster.yaml
+++ b/charts/sn-platform-slim/templates/broker/broker-cluster.yaml
@@ -385,6 +385,7 @@ spec:
     pdb:
       managed: {{ .Values.broker.pdb.autoCreate }}
     {{- end }}
+{{- if or .Values.tls.broker.enabled .Values.broker.extraVolumeMounts .Values.broker.extraVolumeClaimTemplates }}
     statefulSet:
 {{- if or .Values.tls.broker.enabled .Values.broker.extraVolumeMounts }}
       volumeMounts:
@@ -393,11 +394,12 @@ spec:
 {{ toYaml . | indent 6 }}
 {{- end }}
 {{- end }}
-{{- if or .Values.tls.broker.enabled .Values.broker.extraVolumeMounts }}
+{{- if .Values.broker.extraVolumeClaimTemplates }}
       volumeClaimTemplates:
 {{- with .Values.broker.extraVolumeClaimTemplates }}
 {{ toYaml . | indent 6 }}
 {{- end }}
+{{- end }}
 {{- end }}
   {{- end }}
   {{- with .Values.broker.customization }}
diff --git a/charts/sn-platform-slim/templates/zookeeper/zookeeper-cluster.yaml b/charts/sn-platform-slim/templates/zookeeper/zookeeper-cluster.yaml
index 95e2a0103..e72209f4a 100644
--- a/charts/sn-platform-slim/templates/zookeeper/zookeeper-cluster.yaml
+++ b/charts/sn-platform-slim/templates/zookeeper/zookeeper-cluster.yaml
@@ -231,8 +231,10 @@ spec:
         - all
       {{- end }}
       {{- if .Values.zookeeper.operator.adopt_existing }}
+      {{- if and .Values.volumes.persistence .Values.zookeeper.volumes.persistence }}
       volumeClaimTemplates:
-      {{- include "pulsar.zookeeper.data.volumeClaimTemplates" . | nindent 6 }}
+      {{- include "pulsar.zookeeper.data.volumeClaimTemplates" . | nindent 8 }}
+      {{- end }}
       volumeMounts:
       {{- include "pulsar.zookeeper.data.volumeMounts" . | nindent 6 }}
       {{- include "pulsar.zookeeper.certs.volumeMounts" . | nindent 6 }}
diff --git a/charts/sn-platform/templates/broker/broker-cluster.yaml b/charts/sn-platform/templates/broker/broker-cluster.yaml
index e98ba9b90..c5268848d 100644
--- a/charts/sn-platform/templates/broker/broker-cluster.yaml
+++ b/charts/sn-platform/templates/broker/broker-cluster.yaml
@@ -385,6 +385,7 @@ spec:
     pdb:
       managed: {{ .Values.broker.pdb.autoCreate }}
     {{- end }}
+{{- if or .Values.tls.broker.enabled .Values.broker.extraVolumeMounts .Values.broker.extraVolumeClaimTemplates }}
     statefulSet:
 {{- if or .Values.tls.broker.enabled .Values.broker.extraVolumeMounts }}
       volumeMounts:
@@ -393,11 +394,12 @@ spec:
 {{ toYaml . | indent 6 }}
 {{- end }}
 {{- end }}
-{{- if or .Values.tls.broker.enabled .Values.broker.extraVolumeMounts }}
+{{- if .Values.broker.extraVolumeClaimTemplates }}
       volumeClaimTemplates:
 {{- with .Values.broker.extraVolumeClaimTemplates }}
 {{ toYaml . | indent 6 }}
 {{- end }}
+{{- end }}
 {{- end }}
   {{- end }}
   {{- with .Values.broker.customization }}
diff --git a/charts/sn-platform/templates/zookeeper/zookeeper-cluster.yaml b/charts/sn-platform/templates/zookeeper/zookeeper-cluster.yaml
index 800c60bf2..879bd3583 100644
--- a/charts/sn-platform/templates/zookeeper/zookeeper-cluster.yaml
+++ b/charts/sn-platform/templates/zookeeper/zookeeper-cluster.yaml
@@ -220,8 +220,10 @@ spec:
         - all
       {{- end }}
       {{- if .Values.zookeeper.operator.adopt_existing }}
+      {{- if and .Values.volumes.persistence .Values.zookeeper.volumes.persistence }}
       volumeClaimTemplates:
-      {{- include "pulsar.zookeeper.data.volumeClaimTemplates" . | nindent 6 }}
+      {{- include "pulsar.zookeeper.data.volumeClaimTemplates" . | nindent 8 }}
+      {{- end }}
       volumeMounts:
       {{- include "pulsar.zookeeper.data.volumeMounts" . | nindent 6 }}
       {{- include "pulsar.zookeeper.certs.volumeMounts" . | nindent 6 }}