diff --git a/fluentd/templates/configmap-etc.yaml b/fluentd/templates/configmap-etc.yaml
index 4d88e1f8c..ee28709e3 100644
--- a/fluentd/templates/configmap-etc.yaml
+++ b/fluentd/templates/configmap-etc.yaml
@@ -23,5 +23,5 @@ metadata:
   name: {{ printf "%s-%s" $envAll.Release.Name "fluentd-etc" | quote }}
 type: Opaque
 data:
-  fluent.conf: {{ .Values.conf.fluentd.template | b64enc }}
+{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.fluentd.template "key" "fluent.conf" "format" "Secret") | indent 2 }}
 {{- end }}
diff --git a/fluentd/values.yaml b/fluentd/values.yaml
index cd95a2b46..e740a1a0e 100644
--- a/fluentd/values.yaml
+++ b/fluentd/values.yaml
@@ -59,10 +59,11 @@ dependencies:
 
 conf:
   fluentd:
+    # This field is now rendered as a helm template!
     template: |
       <source>
         @type prometheus
-        port 24231
+        port {{ tuple "fluentd" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
       </source>
 
       <source>
diff --git a/tools/deployment/common/fluentd-daemonset.sh b/tools/deployment/common/fluentd-daemonset.sh
index e17bbac29..f78114ac7 100755
--- a/tools/deployment/common/fluentd-daemonset.sh
+++ b/tools/deployment/common/fluentd-daemonset.sh
@@ -40,10 +40,11 @@ deployment:
   type: DaemonSet
 conf:
   fluentd:
+    # This field is now rendered as a helm template!
     template: |
       <source>
         @type prometheus
-        port 24231
+        port {{ tuple "fluentd" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
       </source>
 
       <source>