diff --git a/bitnami/nginx-ingress-controller/Chart.yaml b/bitnami/nginx-ingress-controller/Chart.yaml
index 5db0514eaf..d3d88c3207 100644
--- a/bitnami/nginx-ingress-controller/Chart.yaml
+++ b/bitnami/nginx-ingress-controller/Chart.yaml
@@ -1,5 +1,5 @@
 name: nginx-ingress-controller
-version: 2.0.0
+version: 2.0.1
 appVersion: 0.18.0
 description: Chart for the nginx Ingress controller
 keywords:
diff --git a/bitnami/nginx-ingress-controller/templates/_helpers.tpl b/bitnami/nginx-ingress-controller/templates/_helpers.tpl
index 77a9a9e794..6285744faf 100644
--- a/bitnami/nginx-ingress-controller/templates/_helpers.tpl
+++ b/bitnami/nginx-ingress-controller/templates/_helpers.tpl
@@ -65,3 +65,10 @@ Return the proper nginx-ingress-controller image name
 {{- $tag := .Values.image.tag | toString -}}
 {{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository $tag -}}
 {{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "nginx-ingress-controller.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
\ No newline at end of file
diff --git a/bitnami/nginx-ingress-controller/templates/controller-daemonset.yaml b/bitnami/nginx-ingress-controller/templates/controller-daemonset.yaml
index 162755b61e..62d44d0361 100644
--- a/bitnami/nginx-ingress-controller/templates/controller-daemonset.yaml
+++ b/bitnami/nginx-ingress-controller/templates/controller-daemonset.yaml
@@ -28,6 +28,7 @@ spec:
     {{- end }}
       labels:
         app: {{ template "nginx-ingress.name" . }}
+        chart: {{ template "nginx-ingress-controller.chart" . }}
         component: "{{ .Values.name }}"
         release: {{ .Release.Name }}
         {{- if .Values.podLabels }}
diff --git a/bitnami/nginx-ingress-controller/templates/controller-deployment.yaml b/bitnami/nginx-ingress-controller/templates/controller-deployment.yaml
index be0d23243d..7b62f443fb 100644
--- a/bitnami/nginx-ingress-controller/templates/controller-deployment.yaml
+++ b/bitnami/nginx-ingress-controller/templates/controller-deployment.yaml
@@ -28,6 +28,7 @@ spec:
       {{- end }}
       labels:
         app: {{ template "nginx-ingress.name" . }}
+        chart: {{ template "nginx-ingress-controller.chart" . }}
         component: "{{ .Values.name }}"
         release: {{ .Release.Name }}
         {{- if .Values.podLabels }}