diff --git a/charts/vault-raft-snapshot-agent/Chart.yaml b/charts/vault-raft-snapshot-agent/Chart.yaml
index 68f3266..84076fe 100644
--- a/charts/vault-raft-snapshot-agent/Chart.yaml
+++ b/charts/vault-raft-snapshot-agent/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: vault-raft-snapshot-agent
 type: application
-version: 0.3.0
-appVersion: "v0.8.0"
+version: 0.4.0
+appVersion: "v0.9.0"
 description: Vault Raft Snapshot Agent takes periodic snapshots of Vault's Raft database and stores them on a local volume or an remote S3 bucket
 keywords:
 - vault-raft-snapshot-agent
diff --git a/charts/vault-raft-snapshot-agent/templates/configmap.yaml b/charts/vault-raft-snapshot-agent/templates/configmap.yaml
index d769678..8232c85 100644
--- a/charts/vault-raft-snapshot-agent/templates/configmap.yaml
+++ b/charts/vault-raft-snapshot-agent/templates/configmap.yaml
@@ -12,9 +12,9 @@ metadata:
 data:
   snapshots.yaml: |-
     {{- $config := deepCopy .Values.config -}}
-    {{- if $config.uploaders.local.enabled -}}
-    {{- $_ := set $config.uploaders "local" (pick $config.uploaders.local "path") -}}
+    {{- if $config.snapshots.storages.local.enabled -}}
+    {{- $_ := set $config.snapshots.storages "local" (pick $config.snapshots.storages.local "path") -}}
     {{- else -}}
-    {{- $_ := unset $config.uploaders "local" -}}
+    {{- $_ := unset $config.snapshots.storages "local" -}}
     {{- end -}}
     {{- toYaml $config | nindent 4 -}}
diff --git a/charts/vault-raft-snapshot-agent/templates/deployment.yaml b/charts/vault-raft-snapshot-agent/templates/deployment.yaml
index 10b0b28..99fdcad 100644
--- a/charts/vault-raft-snapshot-agent/templates/deployment.yaml
+++ b/charts/vault-raft-snapshot-agent/templates/deployment.yaml
@@ -52,8 +52,8 @@ spec:
             - mountPath: /etc/vault.d/
               name: config
               readOnly: true
-            {{- if .Values.config.uploaders.local.enabled }}
-            - mountPath: {{ .Values.config.uploaders.local.path }}
+            {{- if .Values.config.snapshots.storages.local.enabled }}
+            - mountPath: {{ .Values.config.snapshots.storages.local.path }}
               name: snapshots
             {{- end }}
             {{- range $volume := .Values.deployment.extraVolumes }}
@@ -67,9 +67,9 @@ spec:
         - name: config
           configMap:
             name: {{ include "vault-raft-snapshot-agent.fullname" . }}
-        {{- if .Values.config.uploaders.local.enabled }}
+        {{- if .Values.config.snapshots.storages.local.enabled }}
         - name: snapshots
-          {{- with .Values.config.uploaders.local.volume }}
+          {{- with .Values.config.snapshots.storages.local.volume }}
           {{- if .persistentVolumeClaim }}
           persistentVolumeClaim:
             claimName: {{ include "vault-raft-snapshot-agent.fullname" $ }}
diff --git a/charts/vault-raft-snapshot-agent/templates/persistent-volume-claim.yaml b/charts/vault-raft-snapshot-agent/templates/persistent-volume-claim.yaml
index cd58747..2449856 100644
--- a/charts/vault-raft-snapshot-agent/templates/persistent-volume-claim.yaml
+++ b/charts/vault-raft-snapshot-agent/templates/persistent-volume-claim.yaml
@@ -1,4 +1,4 @@
-{{- $localUploader := .Values.config.uploaders.local -}}
+{{- $localUploader := .Values.config.snapshots.storages.local -}}
 {{- if and $localUploader.enabled (default false (dig "volume" "persistentVolumeClaim" dict $localUploader).create) -}}
 {{- $pvc := $localUploader.volume.persistentVolumeClaim -}}
 ---
diff --git a/charts/vault-raft-snapshot-agent/values.yaml b/charts/vault-raft-snapshot-agent/values.yaml
index dac9dc7..e53036b 100644
--- a/charts/vault-raft-snapshot-agent/values.yaml
+++ b/charts/vault-raft-snapshot-agent/values.yaml
@@ -55,17 +55,17 @@ config:
   snapshots:
     frequency: 1h
     retain: 72
-  uploaders:
-    local:
-      # -- Enables/disables the local storage of snaphots.
-      #    If disabled the corresponding volume and volume-mounts will not be created
-      enabled: true
-      # @ignored
-      path: /vault/snapshots
-      # -- Defines the kind of volume used to store the snapshots locally.
-      #    If you specify `persistentVolumeClaim` the chart can generate the
-      #    PVC for you. Just specify the claim as you would [normally do](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#claims-as-volumes)
-      #    and add the property `create: true` and the relevant properties of your [PersistentVolumeClaimSpec]()
-      #    as key of `persistentVolumeClaim`.
-      volume:
-        emptyDir: {}
+    storages:
+      local:
+        # -- Enables/disables the local storage of snaphots.
+        #    If disabled the corresponding volume and volume-mounts will not be created
+        enabled: true
+        # @ignored
+        path: /vault/snapshots
+        # -- Defines the kind of volume used to store the snapshots locally.
+        #    If you specify `persistentVolumeClaim` the chart can generate the
+        #    PVC for you. Just specify the claim as you would [normally do](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#claims-as-volumes)
+        #    and add the property `create: true` and the relevant properties of your [PersistentVolumeClaimSpec]()
+        #    as key of `persistentVolumeClaim`.
+        volume:
+          emptyDir: {}