diff --git a/bitnami/cassandra/templates/statefulset.yaml b/bitnami/cassandra/templates/statefulset.yaml
index 2412d9893..4942ecb58 100644
--- a/bitnami/cassandra/templates/statefulset.yaml
+++ b/bitnami/cassandra/templates/statefulset.yaml
@@ -98,9 +98,9 @@ spec:
           value: {{ .Values.cluster.endpointSnitch }}
 {{- if .Values.tlsEncryptionSecretName }}
         - name: CASSANDRA_INTERNODE_ENCRYPTION
-          value: {{ .Values.cluster.internodeEncryption }}
+          value: {{ .Values.cluster.internodeEncryption | quote }}
         - name: CASSANDRA_CLIENT_ENCRYPTION
-          value: {{ .Values.cluster.clientEncryption }}
+          value: {{ .Values.cluster.clientEncryption | quote }}
         - name: CASSANDRA_TRUSTSTORE_PASSWORD
           valueFrom:
             secretKeyRef:
@@ -214,14 +214,14 @@ spec:
 {{- end }}
       volumes:
 {{- if .Values.tlsEncryptionSecretName }}
-        - name: encryption-secrets
-          secret:
-            secretName: {{ .Values.tlsEncryptionSecretName }}
-            items:
-            - key: keystore
-              path: keystore
-            - key: truststore
-              path: truststore
+      - name: encryption-secrets
+        secret:
+          secretName: {{ .Values.tlsEncryptionSecretName }}
+          items:
+          - key: keystore
+            path: keystore
+          - key: truststore
+            path: truststore
 {{- end }}
 {{- if or (.Files.Glob "files/conf/*") .Values.existingConfiguration }}
       - name: configurations
@@ -264,4 +264,4 @@ spec:
       storageClassName: {{ .Values.persistence.storageClass | quote }}
     {{- end }}
     {{- end }}
-{{- end }}
+{{- end }}
\ No newline at end of file