diff --git a/bitnami/node-exporter/Chart.yaml b/bitnami/node-exporter/Chart.yaml
index b2b1da3e2..0beed23bd 100644
--- a/bitnami/node-exporter/Chart.yaml
+++ b/bitnami/node-exporter/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 0.18.1
 description: Prometheus exporter for hardware and OS metrics exposed by UNIX kernels, with pluggable metric collectors.
 name: node-exporter
-version: 0.1.4
+version: 0.2.0
 keywords:
   - prometheus
   - node-exporter
diff --git a/bitnami/node-exporter/README.md b/bitnami/node-exporter/README.md
index 4dc3a9918..ed659c880 100644
--- a/bitnami/node-exporter/README.md
+++ b/bitnami/node-exporter/README.md
@@ -76,6 +76,7 @@ The following table lists the configurable parameters of the Node Exporter chart
 | `securityContext.fsGroup`            | Group ID for the container filesystem                                                                    | `1001`                                                                    |
 | `service.type`                       | Kubernetes service type                                                                                  | `ClusterIP`                                                               |
 | `service.port`                       | Node Exporter service port                                                                               | `9100`                                                                    |
+| `service.targetPort`                 | Node Exporter container target port                                                                      | `9100`                                                                    |
 | `service.clusterIP`                  | Specific cluster IP when service type is cluster IP. Use `None` for headless service                     | `nil`                                                                     |
 | `service.nodePort`                   | Kubernetes Service nodePort                                                                              | `nil`                                                                     |
 | `service.loadBalancerIP`             | `loadBalancerIP` if service type is `LoadBalancer`                                                       | `nil`                                                                     |
diff --git a/bitnami/node-exporter/templates/daemonset.yaml b/bitnami/node-exporter/templates/daemonset.yaml
index ebb795038..273000272 100644
--- a/bitnami/node-exporter/templates/daemonset.yaml
+++ b/bitnami/node-exporter/templates/daemonset.yaml
@@ -37,7 +37,7 @@ spec:
           args:
             - --path.procfs=/host/proc
             - --path.sysfs=/host/sys
-            - --web.listen-address=0.0.0.0:9100
+            - --web.listen-address=0.0.0.0:{{ .Values.service.targetPort }}
             {{- range $key, $value := .Values.extraArgs }}
             {{- if $value }}
             - --{{ $key }}={{ $value }}
@@ -47,7 +47,7 @@ spec:
             {{- end }}
           ports:
             - name: metrics
-              containerPort: 9100
+              containerPort: {{ .Values.service.targetPort }}
               protocol: TCP
           livenessProbe:
             httpGet:
diff --git a/bitnami/node-exporter/values.yaml b/bitnami/node-exporter/values.yaml
index f49431dba..23e76d122 100644
--- a/bitnami/node-exporter/values.yaml
+++ b/bitnami/node-exporter/values.yaml
@@ -92,6 +92,7 @@ service:
   ## Kubernetes service type and port number
   ##
   type: ClusterIP
+  targetPort: 9100
   port: 9100
   # clusterIP: None