diff --git a/templates/helm/templates/blockscout.yaml b/templates/helm/templates/blockscout.yaml
index 8835cd4..67dec93 100644
--- a/templates/helm/templates/blockscout.yaml
+++ b/templates/helm/templates/blockscout.yaml
@@ -213,7 +213,11 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 100Mi
+      storage: {{ .Values.blockscout.db.storage }}
+  {{ if .Values.blockscout.db.storageClassName }}
+  storageClassName: {{ .Values.blockscout.db.storageClassName }}
+  {{ end }}
+  volumeMode: Filesystem
 
 ---
 
diff --git a/templates/helm/templates/env.yaml b/templates/helm/templates/env.yaml
index 347ff7b..4e8b1e2 100644
--- a/templates/helm/templates/env.yaml
+++ b/templates/helm/templates/env.yaml
@@ -25,11 +25,11 @@ spec:
     creationPolicy: Owner
   dataFrom:
   - extract:
-      {{- if .Values.externalSecret.prefix }}
+      {{ if .Values.externalSecret.prefix }}
       key: {{ .Values.externalSecret.prefix }}/private-keys
-      {{- else }}
+      {{ else }}
       key: {{ $.Release.Namespace }}/{{ $.Release.Name }}/private-keys
-      {{- end }}
+      {{ end }}
 {{ else }}
 apiVersion: v1
 kind: Secret
diff --git a/templates/helm/templates/genesis-pvc.yaml b/templates/helm/templates/genesis-pvc.yaml
index 30d352a..d2a2566 100644
--- a/templates/helm/templates/genesis-pvc.yaml
+++ b/templates/helm/templates/genesis-pvc.yaml
@@ -8,4 +8,8 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 100Mi
+      storage: {{ .Values.genesis.volume.storage }}
+  {{ if .Values.genesis.volume.storageClassName }}
+  storageClassName: {{ .Values.genesis.volume.storageClassName }}
+  {{ end }}
+  volumeMode: Filesystem
diff --git a/templates/helm/templates/gp3-extensible.yaml b/templates/helm/templates/gp3-extensible.yaml
new file mode 100644
index 0000000..8d8c2c7
--- /dev/null
+++ b/templates/helm/templates/gp3-extensible.yaml
@@ -0,0 +1,11 @@
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: {{ .Release.Name }}-gp3
+  namespace: {{ .Release.Namespace }}
+parameters:
+  fsType: ext4
+  type: gp3
+provisioner: ebs.csi.aws.com
+reclaimPolicy: {{ .Values.volumeReclaimPolicy }}
+allowVolumeExpansion: true
diff --git a/templates/helm/templates/node.yaml b/templates/helm/templates/node.yaml
index b941f87..8582f98 100644
--- a/templates/helm/templates/node.yaml
+++ b/templates/helm/templates/node.yaml
@@ -137,7 +137,11 @@ spec:
         - ReadWriteOnce
       resources:
         requests:
-          storage: 100Mi
+          storage: {{ .Values.nodes.opGeth.volume.storage }}
+      {{ if .Values.nodes.opGeth.volume.storageClassName }}
+      storageClassName: {{ .Values.nodes.opGeth.volume.storageClassName }}
+      {{ end }}
+      volumeMode: Filesystem
   - metadata:
       name: op-node-volume
     spec:
@@ -145,7 +149,11 @@ spec:
         - ReadWriteOnce
       resources:
         requests:
-          storage: 100Mi
+          storage: {{ .Values.nodes.opNode.volume.storage }}
+      {{ if .Values.nodes.opNode.volume.storageClassName }}
+      storageClassName: {{ .Values.nodes.opNode.volume.storageClassName }}
+      {{ end }}
+      volumeMode: Filesystem
 
 ---
 
diff --git a/templates/helm/templates/sequencer.yaml b/templates/helm/templates/sequencer.yaml
index b5a938b..137ea12 100644
--- a/templates/helm/templates/sequencer.yaml
+++ b/templates/helm/templates/sequencer.yaml
@@ -200,7 +200,11 @@ spec:
         - ReadWriteOnce
       resources:
         requests:
-          storage: 100Mi
+          storage: {{ .Values.sequencer.opGeth.volume.storage }}
+      {{ if .Values.sequencer.opGeth.volume.storageClassName }}
+      storageClassName: {{ .Values.sequencer.opGeth.volume.storageClassName }}
+      {{ end }}
+      volumeMode: Filesystem
   - metadata:
       name: op-node-volume
     spec:
@@ -208,7 +212,11 @@ spec:
         - ReadWriteOnce
       resources:
         requests:
-          storage: 100Mi
+          storage: {{ .Values.sequencer.opNode.volume.storage }}
+      {{ if .Values.sequencer.opNode.volume.storageClassName }}
+      storageClassName: {{ .Values.sequencer.opNode.volume.storageClassName }}
+      {{ end }}
+      volumeMode: Filesystem
 
 ---
 
diff --git a/templates/helm/values.yaml b/templates/helm/values.yaml
index 629b94e..478261d 100644
--- a/templates/helm/values.yaml
+++ b/templates/helm/values.yaml
@@ -1,6 +1,14 @@
 externalSecret:
   enabled: false
 
+genesis:
+  volume:
+    storage: 100Mi
+  genesisDeployer:
+    image: &genesis-deployer-image ghcr.io/planetarium/mothership-l2launcher-genesis-deployer:latest
+  genesisInitPredeploy:
+    image: &genesis-init-predeploy-image ghcr.io/planetarium/mothership-l2launcher-genesis-init-predeploy:latest
+
 nodes:
   replicas: 1
   opGeth:
@@ -9,25 +17,29 @@ nodes:
       rpc: 8545
       wsrpc: 8546
       authrpc: 8551
+    volume: &op-geth-volume
+      storage: 100Gi
   opNode:
     image: &op-node-image us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:v1.4.2
     port: &op-node-port
       rpc: 8547
       p2p: 9222
-  genesisDeployer:
-    image: &genesis-deployer-image ghcr.io/planetarium/mothership-l2launcher-genesis-deployer:latest
-  genesisInitPredeploy:
-    image: &genesis-init-predeploy-image ghcr.io/planetarium/mothership-l2launcher-genesis-init-predeploy:latest
+    volume: &op-node-volume
+      storage: 100Mi
 
 sequencer:
   opGeth:
     image: *op-geth-image
     port:
       <<: *op-geth-port
+    volume:
+      <<: *op-geth-volume
   opNode:
     image: *op-node-image
     port:
       <<: *op-node-port
+    volume:
+      <<: *op-node-volume
   genesisDeployer:
     image: *genesis-deployer-image
   genesisInitPredeploy:
@@ -45,3 +57,5 @@ opProposer:
 
 blockscout:
   port: 5000
+  db:
+      storage: 10Gi