diff --git a/stable/metabase/Chart.yaml b/stable/metabase/Chart.yaml
index 15f9b20e22..f71b10b538 100644
--- a/stable/metabase/Chart.yaml
+++ b/stable/metabase/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: The easy, open source way for everyone in your company to ask questions
   and learn from data.
 name: metabase
-version: 0.7.0
+version: 0.8.0
 appVersion: v0.32.9
 maintainers:
 - name: pmint93
diff --git a/stable/metabase/README.md b/stable/metabase/README.md
index 263138f99c..ef9a3d12b7 100644
--- a/stable/metabase/README.md
+++ b/stable/metabase/README.md
@@ -81,6 +81,9 @@ The following table lists the configurable parameters of the Metabase chart and
 | ingress.tls            | Ingress TLS configuration                                   | null              |
 | log4jProperties        | Custom `log4j.properties` file                              | null              |
 | resources              | Server resource requests and limits                         | {}                |
+| nodeSelector           | Node labels for pod assignment                              | {}                |
+| tolerations            | Toleration labels for pod assignment                        | []                |
+| affinity               | Affinity settings for pod assignment                        | {}                |
 
 The above parameters map to the env variables defined in [metabase](http://github.com/metabase/metabase). For more information please refer to the [metabase documentations](http://www.metabase.com/docs/v0.24.2/).
 
diff --git a/stable/metabase/templates/deployment.yaml b/stable/metabase/templates/deployment.yaml
index 2e74b40a35..3c971bc8db 100644
--- a/stable/metabase/templates/deployment.yaml
+++ b/stable/metabase/templates/deployment.yaml
@@ -124,9 +124,17 @@ spec:
           {{- end}}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
-    {{- if .Values.nodeSelector }}
+    {{- with .Values.nodeSelector }}
       nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
     {{- end }}
       volumes:
         {{- if .Values.log4jProperties}}
diff --git a/stable/metabase/values.yaml b/stable/metabase/values.yaml
index f4ee8e8f5c..de4664bfa4 100644
--- a/stable/metabase/values.yaml
+++ b/stable/metabase/values.yaml
@@ -92,3 +92,18 @@ resources: {}
   # requests:
   #  cpu: 100m
   #  memory: 128Mi
+
+## Node labels for pod assignment
+## ref: https://kubernetes.io/docs/user-guide/node-selection/
+#
+nodeSelector: {}
+
+## Tolerations for pod assignment
+## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+##
+tolerations: []
+
+## Affinity for pod assignment
+## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+##
+affinity: {}