diff --git a/template/stacks/forgejo/forgejo-server/manifests/forgejo-s3-backup-cronjob.yaml b/template/stacks/forgejo/forgejo-server/manifests/forgejo-s3-backup-cronjob.yaml
index ba0aebd..e5ea7df 100644
--- a/template/stacks/forgejo/forgejo-server/manifests/forgejo-s3-backup-cronjob.yaml
+++ b/template/stacks/forgejo/forgejo-server/manifests/forgejo-s3-backup-cronjob.yaml
@@ -55,7 +55,11 @@ kind: PersistentVolumeClaim
 metadata:
   name: s3-backup
   namespace: gitea
+  annotations:
+    everest.io/disk-volume-type: SATA
+    everest.io/crypt-key-id: {{{ .Env.PVC_KMS_KEY_ID }}}
 spec:
+  storageClassName: csi-disk
   accessModes:
     - ReadWriteOnce
   resources:
diff --git a/template/stacks/forgejo/forgejo-server/values.yaml b/template/stacks/forgejo/forgejo-server/values.yaml
index d8cd9dc..a7d7335 100644
--- a/template/stacks/forgejo/forgejo-server/values.yaml
+++ b/template/stacks/forgejo/forgejo-server/values.yaml
@@ -28,8 +28,10 @@ postgresql-ha:
 persistence:
   enabled: true
   size: 200Gi
+  storageClass: csi-disk
   annotations:
     everest.io/crypt-key-id: {{{ .Env.PVC_KMS_KEY_ID }}}
+    everest.io/disk-volume-type: SATA
 
 test:
   enabled: false
diff --git a/template/stacks/observability/grafana-operator/manifests/grafana.yaml b/template/stacks/observability/grafana-operator/manifests/grafana.yaml
index 87bc732..1c47357 100644
--- a/template/stacks/observability/grafana-operator/manifests/grafana.yaml
+++ b/template/stacks/observability/grafana-operator/manifests/grafana.yaml
@@ -6,7 +6,11 @@ metadata:
     dashboards: "grafana"
 spec:
   persistentVolumeClaim:
+    metadata:
+      annotations:
+        everest.io/disk-volume-type: SATA
     spec:
+      storageClassName: csi-disk
       accessModes:
         - ReadWriteOnce
       resources:
diff --git a/template/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml b/template/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml
index 4c6fbe9..c74f8d5 100644
--- a/template/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml
+++ b/template/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml
@@ -9,7 +9,9 @@ spec:
   storageMetadata:
     annotations:
       everest.io/crypt-key-id: {{{ .Env.PVC_KMS_KEY_ID }}}
+      everest.io/disk-volume-type: SATA
   storage:
+    storageClassName: csi-disk
     accessModes:
       - ReadWriteOnce
     resources:
@@ -21,4 +23,4 @@ spec:
       cpu: 500m
     limits:
       memory: 10Gi
-      cpu: 2
\ No newline at end of file
+      cpu: 2
diff --git a/template/stacks/observability/victoria-k8s-stack/values.yaml b/template/stacks/observability/victoria-k8s-stack/values.yaml
index db459f3..78c705d 100644
--- a/template/stacks/observability/victoria-k8s-stack/values.yaml
+++ b/template/stacks/observability/victoria-k8s-stack/values.yaml
@@ -289,7 +289,9 @@ vmsingle:
     storageMetadata:
       annotations:
         everest.io/crypt-key-id: {{{ .Env.PVC_KMS_KEY_ID }}}
+        everest.io/disk-volume-type: SATA
     storage:
+      storageClassName: csi-disk
       accessModes:
         - ReadWriteOnce
       resources:
@@ -880,7 +882,7 @@ grafana:
   enabled: false
   # all values for grafana helm chart can be specified here
   persistence:
-    enabled: true
+    enabled: false
     type: pvc
     storageClassName: "default"
   grafana.ini: