diff --git a/bitnami/node-exporter/Chart.yaml b/bitnami/node-exporter/Chart.yaml
index 9d50849ef..61d6bebef 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.0
+version: 0.1.1
 keywords:
   - prometheus
   - node-exporter
diff --git a/bitnami/node-exporter/templates/_helpers.tpl b/bitnami/node-exporter/templates/_helpers.tpl
index 68f9c30e5..4dfbbbdba 100644
--- a/bitnami/node-exporter/templates/_helpers.tpl
+++ b/bitnami/node-exporter/templates/_helpers.tpl
@@ -83,6 +83,14 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 {{- end -}}
 
+{{/*
+matchLabels
+*/}}
+{{- define "node-exporter.matchLabels" -}}
+app.kubernetes.io/name: {{ include "node-exporter.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
+
 {{/*
 Create the name of the service account to use
 */}}
@@ -94,14 +102,6 @@ Create the name of the service account to use
 {{- end -}}
 {{- end -}}
 
-{{/*
-matchLabels
-*/}}
-{{- define "node-exporter.matchLabels" -}}
-app.kubernetes.io/name: {{ include "node-exporter.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
 {{/*
 Return the proper Docker Image Registry Secret Names for Node Exporter image
 */}}
diff --git a/bitnami/node-exporter/templates/service.yaml b/bitnami/node-exporter/templates/service.yaml
index ba736e909..a56330cfe 100644
--- a/bitnami/node-exporter/templates/service.yaml
+++ b/bitnami/node-exporter/templates/service.yaml
@@ -30,5 +30,7 @@ spec:
       targetPort: metrics
       {{- if and .Values.service.nodePort (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) }}
       nodePort: {{ .Values.service.nodePort }}
+      {{- else if eq .Values.service.type "ClusterIP" }}
+      nodePort: null
       {{- end }}
   selector: {{- include "node-exporter.matchLabels" . | nindent 4 }}