diff --git a/.github/workflows/publish_helm_charts.yml b/.github/workflows/publish_helm_charts.yml
index 50e415e..609857d 100644
--- a/.github/workflows/publish_helm_charts.yml
+++ b/.github/workflows/publish_helm_charts.yml
@@ -1,5 +1,4 @@
 name: Release Charts
-
 on:
   push:
     branches:
diff --git a/charts/metaflow/charts/metaflow-service/Chart.yaml b/charts/metaflow/charts/metaflow-service/Chart.yaml
index 6286484..4a96b17 100644
--- a/charts/metaflow/charts/metaflow-service/Chart.yaml
+++ b/charts/metaflow/charts/metaflow-service/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v2.4.13
 description: A Helm chart to deploy Metadata Service for Metaflow
 name: metaflow-service
 type: application
-version: 0.2.0
+version: 0.2.4
 maintainers:
   - name: Savin Goyal
     email: savin@outerbounds.co
diff --git a/charts/metaflow/charts/metaflow-service/templates/deployment.yaml b/charts/metaflow/charts/metaflow-service/templates/deployment.yaml
index 0ac31e6..ea5694b 100644
--- a/charts/metaflow/charts/metaflow-service/templates/deployment.yaml
+++ b/charts/metaflow/charts/metaflow-service/templates/deployment.yaml
@@ -67,6 +67,10 @@ spec:
           {{- end }}
           env:
             {{- include "metaflow-service.metadatadbEnvVars" . | nindent 12 }}
+            {{- range .Values.env }}
+            - name: {{ .name | quote }}
+              value: {{ .value | quote }}
+            {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/metaflow/charts/metaflow-service/templates/ingress.yaml b/charts/metaflow/charts/metaflow-service/templates/ingress.yaml
index 1d31cb8..46e2a07 100644
--- a/charts/metaflow/charts/metaflow-service/templates/ingress.yaml
+++ b/charts/metaflow/charts/metaflow-service/templates/ingress.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "metaflow-service.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- $kubeVersion := default "1.14.0" (lookup "version" "") -}}
+{{- $kubeVersion := default "1.14.0" .Capabilities.KubeVersion.GitVersion -}}
 {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" $kubeVersion)) }}
   {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
   {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
diff --git a/charts/metaflow/charts/metaflow-ui/Chart.yaml b/charts/metaflow/charts/metaflow-ui/Chart.yaml
index 2901bfd..b2d96ad 100644
--- a/charts/metaflow/charts/metaflow-ui/Chart.yaml
+++ b/charts/metaflow/charts/metaflow-ui/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v2.4.13
 description: A Helm chart to deploy Metaflow UI components.
 name: metaflow-ui
 type: application
-version: 0.3.0
+version: 0.4.0
 maintainers:
   - name: Savin Goyal
     email: savin@outerbounds.co
diff --git a/charts/metaflow/charts/metaflow-ui/templates/_helpers.tpl b/charts/metaflow/charts/metaflow-ui/templates/_helpers.tpl
index 54d3231..74550d5 100644
--- a/charts/metaflow/charts/metaflow-ui/templates/_helpers.tpl
+++ b/charts/metaflow/charts/metaflow-ui/templates/_helpers.tpl
@@ -56,7 +56,6 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
 {{- define "metaflow-ui.labelsStatic" -}}
-{{ include "metaflow-ui.labels" . }}
 {{ include "metaflow-ui.selectorLabelsStatic" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
diff --git a/charts/metaflow/charts/metaflow-ui/templates/backend_deployment.yaml b/charts/metaflow/charts/metaflow-ui/templates/backend_deployment.yaml
index 65c2ddd..411f867 100644
--- a/charts/metaflow/charts/metaflow-ui/templates/backend_deployment.yaml
+++ b/charts/metaflow/charts/metaflow-ui/templates/backend_deployment.yaml
@@ -70,12 +70,20 @@ spec:
             - name: METAFLOW_SERVICE_URL
               value: {{ .Values.uiBackend.metaflowServiceURL | quote }}
             - name: METAFLOW_DEFAULT_DATASTORE
-              value: "s3"
+              value: {{ .Values.uiBackend.defaultMetastore }}
             - name: METAFLOW_DEFAULT_METADATA
               value: "service"
             {{- include "metaflow-ui.metadatadbEnvVars" . | nindent 12 }}
           resources:
             {{- toYaml .Values.uiBackend.resources | nindent 12 }}
+          {{- with .Values.uiBackend.volumeMounts }}
+          volumeMounts:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+      {{- with .Values.uiBackend.volumes }}
+      volumes:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/metaflow/charts/metaflow-ui/values.yaml b/charts/metaflow/charts/metaflow-ui/values.yaml
index 498000a..30e1505 100644
--- a/charts/metaflow/charts/metaflow-ui/values.yaml
+++ b/charts/metaflow/charts/metaflow-ui/values.yaml
@@ -31,6 +31,16 @@ uiBackend:
     # requests:
     #   cpu: 100m
     #   memory: 128Mi
+  
+  volumes: []
+  # volumes:
+  #   - name: x
+  #     secret:
+  #       name: x
+  volumeMounts: []
+  # volumeMounts:
+  #   - mountPath: /x
+  #     name: x
 
   service:
     type: ClusterIP
@@ -38,6 +48,7 @@ uiBackend:
 
   replicaCount: 1
 
+  defaultMetastore: "s3"
   metaflowDatastoreSysRootS3: ""
     # The root S3 bucket prefix that will be used by metaflow