diff --git a/bitnami/metrics-server/Chart.yaml b/bitnami/metrics-server/Chart.yaml
index 22fad677f..ccbd3aa9d 100644
--- a/bitnami/metrics-server/Chart.yaml
+++ b/bitnami/metrics-server/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: metrics-server
-version: 3.0.1
+version: 3.1.0
 appVersion: 0.3.3
 description: Metrics Server is a cluster-wide aggregator of resource usage data. Metrics Server collects metrics from the Summary API, exposed by Kubelet on each node.
 keywords:
diff --git a/bitnami/metrics-server/README.md b/bitnami/metrics-server/README.md
index 4eef1810f..53f3b335e 100644
--- a/bitnami/metrics-server/README.md
+++ b/bitnami/metrics-server/README.md
@@ -58,6 +58,7 @@ The following tables lists the configurable parameters of the Metrics Server cha
 | `nameOverride`           | String to partially override metrics-server.fullname template with a string (will prepend the release name) | `nil`  |
 | `fullnameOverride`       | String to fully override metrics-server.fullname template with a string                                     | `nil`  |
 | `securePort`             | Port where metrics-server will be running                                   | `8443`                                 |
+| `extraArgs`              | Extra arguments to pass to metrics-server on start up                       | {}                                     |
 | `service.type`           | Kubernetes Service type                                                     | `ClusterIP`                            |
 | `service.port`           | Kubernetes Service port                                                     | `443`                                  |
 | `service.annotations`    | Annotations for the Service                                                 | {}                                     |
diff --git a/bitnami/metrics-server/templates/deployment.yaml b/bitnami/metrics-server/templates/deployment.yaml
index b591d0499..d45c29fd1 100644
--- a/bitnami/metrics-server/templates/deployment.yaml
+++ b/bitnami/metrics-server/templates/deployment.yaml
@@ -36,3 +36,6 @@ spec:
         command:
         - metrics-server
         - --secure-port={{ .Values.securePort }}
+      {{- range $key, $value := .Values.extraArgs }}
+        - --{{ $key }}={{ $value }}
+      {{- end }}
diff --git a/bitnami/metrics-server/values.yaml b/bitnami/metrics-server/values.yaml
index 48cf7bcad..d77519237 100644
--- a/bitnami/metrics-server/values.yaml
+++ b/bitnami/metrics-server/values.yaml
@@ -57,6 +57,15 @@ apiService:
 ##
 securePort: 8443
 
+## Extra arguments to pass to the metrics-server
+## ref: https://github.com/kubernetes-incubator/metrics-server/blob/master/README.md#flags
+##
+## extraArgs:
+##   kubelet-insecure-tls: true
+##   kubelet-preferred-address-types: InternalIP
+##
+extraArgs: {}
+
 service:
   type: ClusterIP
   port: 443