diff --git a/templates/server-config-configmap.yaml b/templates/server-config-configmap.yaml
index 1ab62f7..5ee5234 100644
--- a/templates/server-config-configmap.yaml
+++ b/templates/server-config-configmap.yaml
@@ -10,6 +10,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
 data:
-  extra-from-values.hcl: |-
-{{ tpl .Values.server.extraConfig . | indent 4 }}
+  statefulconfig-from-values.hcl: |-
+{{ tpl .Values.server.storageConfig . | indent 4 }}
 {{- end }}
diff --git a/templates/server-storage-configmap.yaml b/templates/server-storage-configmap.yaml
new file mode 100644
index 0000000..f0998eb
--- /dev/null
+++ b/templates/server-storage-configmap.yaml
@@ -0,0 +1,15 @@
+# StatefulSet to run the actual vault server cluster.
+{{- if (or (and (ne (.Values.consulHA.enabled | toString) "-") .Values.consulHA.enabled) (and (eq (.Values.consulHA.enabled | toString) "-") .Values.global.enabled)) }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "vault.fullname" . }}-server-storage-config
+  labels:
+    app: {{ template "vault.name" . }}
+    chart: {{ template "vault.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+  storageconfig-from-values.hcl: |-
+{{ tpl .Values.consulHA.storageConfig . | indent 4 }}
+{{- end }}