diff --git a/drupal/templates/solr-statefulset.yaml b/drupal/templates/solr-statefulset.yaml
index 42e84a35..8cd2b588 100644
--- a/drupal/templates/solr-statefulset.yaml
+++ b/drupal/templates/solr-statefulset.yaml
@@ -83,8 +83,12 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: {{ .Release.Name }}-solr-data
+      {{- if or (eq .Values.solr.persistence.data.storageClassName "silta-shared") (eq .Values.solr.persistence.data.storageClassName "nfs-shared") }}
+      annotations:
+        storage.silta/storage-path: {{ .Values.environmentName | default .Release.Name }}/solr-data
+      {{- end }}
     spec:
-      accessModes: [ "ReadWriteOnce" ]
+      accessModes: {{ .Values.solr.persistence.data.accessModes }}
       {{- if .Values.solr.persistence.data.storageClassName }}
       storageClassName: {{ .Values.solr.persistence.data.storageClassName }}
       {{- else if eq .Values.cluster.type "gke" }}
@@ -96,5 +100,4 @@ spec:
       resources:
         requests:
           storage: {{ .Values.solr.persistence.data.size }}
-      accessModes: {{ .Values.solr.persistence.data.accessModes }}
 {{- end }}
diff --git a/drupal/tests/solr_test.yaml b/drupal/tests/solr_test.yaml
new file mode 100644
index 00000000..e1b0680a
--- /dev/null
+++ b/drupal/tests/solr_test.yaml
@@ -0,0 +1,38 @@
+suite: solr
+templates:
+  - solr-statefulset.yaml
+  - solr-service.yaml
+capabilities:
+  apiVersions:
+    - pxc.percona.com/v1
+tests:
+  - it: storage path annotation is not set by default
+    template: solr-statefulset.yaml
+    set:
+      solr:
+        enabled: true
+    asserts:
+      - notExists:
+          path: spec.volumeClaimTemplates[0].metadata.annotations['storage.silta/storage-path']
+  - it: storage path annotation set if silta-shared storage class used
+    template: solr-statefulset.yaml
+    set:
+      solr:
+        enabled: true
+        persistence:
+          data:
+            storageClassName: silta-shared
+    asserts:
+      - exists:
+          path: spec.volumeClaimTemplates[0].metadata.annotations['storage.silta/storage-path']
+  - it: storage path annotation set if nfs-shared storage class used
+    template: solr-statefulset.yaml
+    set:
+      solr:
+        enabled: true
+        persistence:
+          data:
+            storageClassName: nfs-shared
+    asserts:
+      - exists:
+          path: spec.volumeClaimTemplates[0].metadata.annotations['storage.silta/storage-path']