diff --git a/bitnami/solr/Chart.yaml b/bitnami/solr/Chart.yaml
index 7814bc6c31..a86a13de02 100644
--- a/bitnami/solr/Chart.yaml
+++ b/bitnami/solr/Chart.yaml
@@ -27,4 +27,4 @@ name: solr
 sources:
   - https://github.com/bitnami/bitnami-docker-solr
   - https://lucene.apache.org/solr/
-version: 2.0.10
+version: 2.1.0
diff --git a/bitnami/solr/templates/statefulset.yaml b/bitnami/solr/templates/statefulset.yaml
index c3b7c37cb0..f47ced91eb 100644
--- a/bitnami/solr/templates/statefulset.yaml
+++ b/bitnami/solr/templates/statefulset.yaml
@@ -307,6 +307,10 @@ spec:
           {{- if .Values.extraVolumeMounts }}
           {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 12 }}
           {{- end }}
+          {{- range .Values.persistence.extraVolumeClaimTemplates }}
+            - name: {{ .name }}
+              mountPath: {{ .mountPath }}
+          {{- end}}
         {{- if .Values.sidecars }}
         {{- include "common.tplvalues.render" (dict "value" .Values.sidecars "context" $) | nindent 8 }}
         {{- end }}
@@ -345,4 +349,20 @@ spec:
           requests:
             storage: {{ .Values.persistence.size | quote }}
         {{ include "solr.storageClass" . | nindent 8 }}
+    {{- range .Values.persistence.extraVolumeClaimTemplates }}
+    - metadata:
+        name: {{ .name }}
+        {{- if $.Values.persistence.annotations }}
+        annotations: {{- include "common.tplvalues.render" (dict "value" .Values.persistence.annotations "context" $) | nindent 10 }}
+        {{- end }}
+      spec:
+        accessModes:
+        {{- range $.Values.persistence.accessModes }}
+          - {{ . | quote }}
+        {{- end }}
+        resources:
+          requests:
+            storage: {{ .size | quote }}
+        {{ include "solr.storageClass" $ | nindent 8 }}
+    {{- end }}
   {{- end }}
diff --git a/bitnami/solr/values.yaml b/bitnami/solr/values.yaml
index 7ec134ed9c..61dc187905 100644
--- a/bitnami/solr/values.yaml
+++ b/bitnami/solr/values.yaml
@@ -394,6 +394,16 @@ persistence:
   ## @param persistence.mountPath Persistence mount path for Solr
   ##
   mountPath: /bitnami/solr
+
+  ## @param persistence.extraVolumeClaimTemplates Additional pod instance specific volumes
+  ##
+  ## Example
+  ## extraVolumeClaimTemplates:
+  ## - name: "extra"
+  ##   size: 8Gi
+  ##   mountPath: "/extra"
+  extraVolumeClaimTemplates: []
+
 serviceAccount:
   ## @param serviceAccount.create Specifies whether a ServiceAccount should be created
   ##