diff --git a/stable/metabase/Chart.yaml b/stable/metabase/Chart.yaml
index 633bc816aa..711f7090e3 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.10.4
+version: 0.10.5
 appVersion: v0.34.0
 maintainers:
 - name: pmint93
diff --git a/stable/metabase/README.md b/stable/metabase/README.md
index dab13c652f..61c4671499 100644
--- a/stable/metabase/README.md
+++ b/stable/metabase/README.md
@@ -85,6 +85,7 @@ The following table lists the configurable parameters of the Metabase chart and
 | service.loadBalancerSourceRanges | Array of Source Ranges                                      | null              |
 | service.externalPort             | Service external port                                       | 80                |
 | service.internalPort             | Service internal port, should be the same as `listen.port`  | 3000              |
+| service.nodePort                 | Service node port                                           | null              |
 | service.annotations              | Service annotations                                         | {}                |
 | ingress.enabled                  | Enable ingress controller resource                          | false             |
 | ingress.hosts                    | Ingress resource hostnames                                  | null              |
diff --git a/stable/metabase/templates/service.yaml b/stable/metabase/templates/service.yaml
index 42bd631c4a..dbcd2cd1e4 100644
--- a/stable/metabase/templates/service.yaml
+++ b/stable/metabase/templates/service.yaml
@@ -21,6 +21,9 @@ spec:
   ports:
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
+{{- if .Values.service.nodePort }}
+      nodePort: {{ .Values.service.nodePort }}
+{{- end}}
       protocol: TCP
       name: {{ .Values.service.name }}
   selector:
diff --git a/stable/metabase/values.yaml b/stable/metabase/values.yaml
index a389d25583..c2768806a1 100644
--- a/stable/metabase/values.yaml
+++ b/stable/metabase/values.yaml
@@ -78,6 +78,8 @@ service:
   type: ClusterIP
   externalPort: 80
   internalPort: 3000
+  # Used to fix NodePort when service.type: NodePort.
+  nodePort:
   annotations: {}
     # Used to add custom annotations to the Service.
     # service.beta.kubernetes.io/aws-load-balancer-internal: "0.0.0.0/0"