diff --git a/charts/armada/templates/deployment-api.yaml b/charts/armada/templates/deployment-api.yaml
index 53171fcd..b1fb57fc 100644
--- a/charts/armada/templates/deployment-api.yaml
+++ b/charts/armada/templates/deployment-api.yaml
@@ -152,6 +152,9 @@ spec:
               value: {{ .Values.conf.tiller.history_max | quote }}
           command:
             - /tiller
+{{- if .Values.conf.tiller.storage }}
+            - --storage={{ .Values.conf.tiller.storage | quote }}
+{{- end }}
             - -logtostderr
             - -v
             - {{ .Values.conf.tiller.verbosity | quote }}
diff --git a/charts/armada/values.yaml b/charts/armada/values.yaml
index e5147a52..b6369696 100644
--- a/charts/armada/values.yaml
+++ b/charts/armada/values.yaml
@@ -209,6 +209,7 @@ conf:
     port: 44134
     verbosity: 5
     trace: false
+    storage: null
     namespace: kube-system
     # Limit the maximum number of revisions saved per release. 0 for no limit.
     history_max: 0
diff --git a/charts/tiller/templates/deployment-tiller.yaml b/charts/tiller/templates/deployment-tiller.yaml
index dfb5e117..e32ab919 100644
--- a/charts/tiller/templates/deployment-tiller.yaml
+++ b/charts/tiller/templates/deployment-tiller.yaml
@@ -75,6 +75,9 @@ spec:
               value: {{ .Values.deployment.tiller_history | quote }}
           command:
             - /tiller
+{{- if .Values.conf.tiller.storage }}
+            - --storage={{ .Values.conf.tiller.storage | quote }}
+{{- end }}
             - -logtostderr
             - -v
             - {{ .Values.conf.tiller.verbosity | quote }}
diff --git a/charts/tiller/values.yaml b/charts/tiller/values.yaml
index d701eba6..8774196a 100644
--- a/charts/tiller/values.yaml
+++ b/charts/tiller/values.yaml
@@ -44,6 +44,7 @@ deployment:
 conf:
   tiller:
     verbosity: 5
+    storage: null
     trace: false
     # Note: Defaulting to the (default) kubernetes grace period, as anything
     # greater than that will have no effect.