diff --git a/bitnami/fluentd/Chart.yaml b/bitnami/fluentd/Chart.yaml
index ca1184e7d..49c66ace3 100644
--- a/bitnami/fluentd/Chart.yaml
+++ b/bitnami/fluentd/Chart.yaml
@@ -8,7 +8,7 @@ dependencies:
     tags:
       - bitnami-common
     version: 1.x.x
-description: Fluentd collects events from various data sources and writes them to files, RDBMS, NoSQL, IaaS, SaaS, Hadoop and so on. 
+description: Fluentd collects events from various data sources and writes them to files, RDBMS, NoSQL, IaaS, SaaS, Hadoop and so on.
 engine: gotpl
 home: https://github.com/bitnami/charts/tree/master/bitnami/fluentd
 icon: https://bitnami.com/assets/stacks/fluentd/img/fluentd-stack-220x234.png
@@ -25,4 +25,4 @@ name: fluentd
 sources:
   - https://github.com/bitnami/bitnami-docker-fluentd
   - https://www.fluentd.org/
-version: 5.0.3
+version: 5.0.4
diff --git a/bitnami/fluentd/templates/forwarder-psp.yaml b/bitnami/fluentd/templates/forwarder-psp.yaml
index 5b425676e..ed8e66ab0 100644
--- a/bitnami/fluentd/templates/forwarder-psp.yaml
+++ b/bitnami/fluentd/templates/forwarder-psp.yaml
@@ -33,22 +33,22 @@ spec:
   hostIPC: false
   hostPID: false
   runAsUser:
-    {{- if eq (int .Values.forwarder.securityContext.runAsUser) 0 }}
+    {{- if eq (int .Values.forwarder.podSecurityContext.runAsUser) 0 }}
     rule: 'RunAsAny'
     {{- else }}
     rule: 'MustRunAs'
     ranges:
-      - min: {{ .Values.forwarder.securityContext.runAsUser }}
-        max: {{ .Values.forwarder.securityContext.runAsUser }}
+      - min: {{ .Values.forwarder.podSecurityContext.runAsUser }}
+        max: {{ .Values.forwarder.podSecurityContext.runAsUser }}
     {{- end }}
   runAsGroup:
-    {{- if eq (int .Values.forwarder.securityContext.runAsGroup) 0 }}
+    {{- if eq (int .Values.forwarder.podSecurityContext.runAsGroup) 0 }}
     rule: 'RunAsAny'
     {{- else }}
     rule: 'MustRunAs'
     ranges:
-      - min: {{ .Values.forwarder.securityContext.runAsGroup }}
-        max: {{ .Values.forwarder.securityContext.runAsGroup }}
+      - min: {{ .Values.forwarder.podSecurityContext.runAsGroup }}
+        max: {{ .Values.forwarder.podSecurityContext.runAsGroup }}
     {{- end }}
   seLinux:
     rule: 'RunAsAny'
@@ -58,13 +58,13 @@ spec:
       - min: 1
         max: 65535
   fsGroup:
-    {{- if eq (int .Values.forwarder.securityContext.fsGroup) 0 }}
+    {{- if eq (int .Values.forwarder.podSecurityContext.fsGroup) 0 }}
     rule: 'RunAsAny'
     {{- else }}
     rule: 'MustRunAs'
     ranges:
-      - min: {{ .Values.forwarder.securityContext.fsGroup }}
-        max: {{ .Values.forwarder.securityContext.fsGroup }}
+      - min: {{ .Values.forwarder.podSecurityContext.fsGroup }}
+        max: {{ .Values.forwarder.podSecurityContext.fsGroup }}
     {{- end }}
   readOnlyRootFilesystem: {{ .Values.forwarder.containerSecurityContext.readOnlyRootFilesystem }}
   {{- end }}
diff --git a/bitnami/fluentd/templates/ingress.yaml b/bitnami/fluentd/templates/ingress.yaml
index 45951ea02..f1f9d5bf1 100644
--- a/bitnami/fluentd/templates/ingress.yaml
+++ b/bitnami/fluentd/templates/ingress.yaml
@@ -21,8 +21,8 @@ metadata:
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
     {{- end }}
 spec:
-  {{- if and .Values.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }}
-  ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
+  {{- if and .Values.aggregator.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }}
+  ingressClassName: {{ .Values.aggregator.ingress.ingressClassName | quote }}
   {{- end }}
   rules:
     {{- if .Values.aggregator.ingress.hostname }}