diff --git a/charts/evm-bridge-withdrawer/templates/configmaps.yaml b/charts/evm-bridge-withdrawer/templates/configmaps.yaml
index 540d7f5..4af64ab 100644
--- a/charts/evm-bridge-withdrawer/templates/configmaps.yaml
+++ b/charts/evm-bridge-withdrawer/templates/configmaps.yaml
@@ -13,6 +13,7 @@ data:
   ASTRIA_BRIDGE_WITHDRAWER_SEQUENCER_GRPC_ENDPOINT: "{{ tpl .Values.config.sequencerGrpcEndpoint . }}"
   ASTRIA_BRIDGE_WITHDRAWER_SEQUENCER_BRIDGE_ADDRESS: "{{ .Values.config.sequencerBridgeAddress }}"
   ASTRIA_BRIDGE_WITHDRAWER_FEE_ASSET_DENOMINATION: "{{ .Values.config.feeAssetDenom }}"
+  ASTRIA_BRIDGE_WITHDRAWER_USE_COMPAT_ADDRESS: "{{ .Values.config.useCompatAddress }}"
 
   ASTRIA_BRIDGE_WITHDRAWER_ROLLUP_ASSET_DENOMINATION: "{{ .Values.config.rollupAssetDenom }}"
   ASTRIA_BRIDGE_WITHDRAWER_ETHEREUM_CONTRACT_ADDRESS: "{{ .Values.config.evmContractAddress }}"
@@ -33,7 +34,6 @@ data:
   OTEL_SERVICE_NAME: "{{ tpl .Values.otel.serviceName . }}"
   {{- if not .Values.global.dev }}
   {{- else }}
-  ASTRIA_BRIDGE_WITHDRAWER_USE_COMPAT_ADDRESS: "{{ .Values.config.useCompatAddress }}"
   {{- end }}
 ---
 {{- if not .Values.secretProvider.enabled }}
diff --git a/charts/graph-node/Chart.yaml b/charts/graph-node/Chart.yaml
index c7b30ad..5a866a2 100644
--- a/charts/graph-node/Chart.yaml
+++ b/charts/graph-node/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: graph-node
 description: A Helm chart for Graph Node deployment
-version: 0.1.0
+version: 0.2.0
 appVersion: "0.0.1"
 
 maintainers:
diff --git a/charts/graph-node/templates/volumes.yaml b/charts/graph-node/templates/volumes.yaml
index 4d82f71..ca86a1b 100644
--- a/charts/graph-node/templates/volumes.yaml
+++ b/charts/graph-node/templates/volumes.yaml
@@ -1,8 +1,8 @@
 {{/* We need to manually create a PersistentVolume when local. */}}
 {{/* In prod, a PV will be created by the StorageClass' provisioner using dynamic provisioning feature.  */}}
 {{- if and .Values.ipfs.storage.enabled }}
-  {{- range $key, $value := .Values.storage.entities }}
-    {{- if $.Values.storage.local }}
+  {{- range $key, $value := .Values.ipfs.storage.entities }}
+    {{- if $.Values.ipfs.storage.local }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -41,7 +41,7 @@ metadata:
     "app.kubernetes.io/managed-by": {{ $.Release.Service | quote }}
     "helm.sh/chart": {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}
 spec:
-  {{- if $.Values.storage.local }}
+  {{- if $.Values.ipfs.storage.local }}
   storageClassName: {{ .Values.persistence.storageClass }}
   {{- end }}
   {{- if $value.storageClassName }}
@@ -56,22 +56,25 @@ spec:
   {{- end }}
 {{- end }}
 {{- if and .Values.postgres.storage.enabled }}
-  {{- range $key, $value := .Values.storage.entities }}
-    {{- if $.Values.storage.local }}
+  {{- range $key, $value := .Values.postgres.storage.entities }}
+    {{- if $.Values.postgres.storage.local }}
 apiVersion: v1
-kind: PersistentVolume
+kind: PersistentVolumeClaim
 metadata:
-  name: postgres-pvc
+  name: ipfs-pvc
 spec:
   capacity:
     storage: {{ $value.size }}
   volumeMode: Filesystem
-  accessModes:
-    - ReadWriteOnce
   persistentVolumeReclaimPolicy: Retain
   storageClassName: {{ .Values.persistence.storageClass }}
+  accessModes:
+    - ReadWriteOnce
   local:
     path: {{ $value.path }}
+  resources:
+    requests:
+      storage: {{ .Values.ipfs.storage.size }}
   nodeAffinity:
     required:
       nodeSelectorTerms:
@@ -93,7 +96,7 @@ metadata:
     "app.kubernetes.io/managed-by": {{ $.Release.Service | quote }}
     "helm.sh/chart": {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}
 spec:
-  {{- if $.Values.storage.local }}
+  {{- if $.Values.postgres.storage.local }}
   storageClassName: {{ .Values.persistence.storageClass }}
   {{- end }}
   {{- if $value.storageClassName }}