diff --git a/.gitignore b/.gitignore
index 3dd9a1b..4158f4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ terraform.tfstate
 
 #tmp kube config written by tooling container
 .kube_config
+.env.tmp
diff --git a/k8s-helm-charts/shared-resources/templates/gp3-expandable-storageclass.yaml b/k8s-helm-charts/shared-resources/templates/gp3-expandable-storageclass.yaml
new file mode 100644
index 0000000..232a65e
--- /dev/null
+++ b/k8s-helm-charts/shared-resources/templates/gp3-expandable-storageclass.yaml
@@ -0,0 +1,15 @@
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: gp3-expandable
+  annotations:
+    meta.helm.sh/release-name: shared-resources
+    meta.helm.sh/release-namespace: kube-system
+    storageclass.kubernetes.io/is-default-class: "true"
+  labels:
+    app.kubernetes.io/managed-by: Helm
+provisioner: ebs.csi.aws.com
+allowVolumeExpansion: true
+volumeBindingMode: WaitForFirstConsumer
+parameters:
+  type: gp3
diff --git a/k8s-values/values.kube-prometheus-stack.yaml b/k8s-values/values.kube-prometheus-stack.yaml
index deef437..f2f5628 100644
--- a/k8s-values/values.kube-prometheus-stack.yaml
+++ b/k8s-values/values.kube-prometheus-stack.yaml
@@ -66,11 +66,11 @@ prometheus:
     storageSpec:
       volumeClaimTemplate:
         spec:
-          storageClassName: gp2
+          storageClassName: gp3-expandable
           accessModes: ["ReadWriteOnce"]
           resources:
             requests:
-              storage: 8Gi
+              storage: 16Gi
     thanos:
       objectStorageConfig:
         existingSecret:
diff --git a/k8s-values/values.thanos-stack.yaml b/k8s-values/values.thanos-stack.yaml
index c2e5794..215cb23 100644
--- a/k8s-values/values.thanos-stack.yaml
+++ b/k8s-values/values.thanos-stack.yaml
@@ -14,6 +14,12 @@ queryFrontend:
   enabled: false
 storegateway:
   enabled: true
+  persistence:
+    enabled: true
+    storageClass: gp3-expandable
+    accessModes:
+      - ReadWriteOnce
+    size: 16Gi
   resources:
     limits:
       memory: "2.5Gi"