diff --git a/geoserver-lb/Chart.yaml b/geoserver-lb/Chart.yaml
index 6b1c701..9a8af03 100644
--- a/geoserver-lb/Chart.yaml
+++ b/geoserver-lb/Chart.yaml
@@ -2,5 +2,5 @@ name: geoserver-lb
 apiVersion: v2
 description: A Helm chart for deploying geoserver loadbalanced
 type: application
-version: 0.5.1
+version: 0.6.0
 appVersion: "22.0.4"
diff --git a/geoserver-lb/templates/geoserver-deploy.yaml b/geoserver-lb/templates/geoserver-deploy.yaml
index b6abe82..7b377eb 100644
--- a/geoserver-lb/templates/geoserver-deploy.yaml
+++ b/geoserver-lb/templates/geoserver-deploy.yaml
@@ -51,10 +51,8 @@ spec:
         - name: geoserver-geodata
           persistentVolumeClaim:
             claimName: georchestra-geoserver-geodata
-        {{- range .Values.geoserver.extra_volumes }}
-        - name: {{ .name }}
-          persistentVolumeClaim:
-            claimName: {{ .claimName }}
+        {{- if .Values.geoserver.extra_volumes }}
+          {{ .Values.geoserver.extra_volumes | toYaml | nindent 6 }}
         {{- end }}
       {{- with .Values.geoserver.pull_secret }}
       imagePullSecrets:
@@ -239,9 +237,8 @@ spec:
             name: geoserver-webapp
           - mountPath: /mnt/geoserver_tiles
             name: geoserver-tiles
-          {{- range .Values.geoserver.extra_volumes }}
-          - name: {{ .name }}
-            mountPath: {{ .mountPath }}
+          {{- if .Values.geoserver.extra_volumeMounts }}
+            {{ .Values.geoserver.extra_volumeMounts | toYaml | nindent 10 }}
           {{- end }}
       - name: geoserver-reload
         image: {{ .Values.geoserver.reloader.docker_image }}