diff --git a/charts/enterprise/traefik/Chart.yaml b/charts/enterprise/traefik/Chart.yaml
index 0bd46d05613..69747220411 100644
--- a/charts/enterprise/traefik/Chart.yaml
+++ b/charts/enterprise/traefik/Chart.yaml
@@ -23,7 +23,7 @@ sources:
   - https://github.com/traefik/traefik-helm-chart
   - https://traefik.io/
 type: application
-version: 17.0.12
+version: 17.0.13
 annotations:
   truecharts.org/catagories: |
     - network
diff --git a/charts/enterprise/traefik/templates/_args.tpl b/charts/enterprise/traefik/templates/_args.tpl
index 7acee2f60ac..cf1e35a1d49 100644
--- a/charts/enterprise/traefik/templates/_args.tpl
+++ b/charts/enterprise/traefik/templates/_args.tpl
@@ -24,25 +24,29 @@ args:
   {{- end }}
   - "--api.dashboard=true"
   - "--ping=true"
-  {{- if .Values.metrics }}
-  {{- if .Values.metrics.datadog }}
+  {{- if .Values.traefikMetrics }}
+  {{- if .Values.traefikMetrics.datadog }}
   - "--metrics.datadog=true"
-  - "--metrics.datadog.address={{ .Values.metrics.datadog.address }}"
+  - "--metrics.datadog.address={{ .Values.traefikMetrics.datadog.address }}"
   {{- end }}
-  {{- if .Values.metrics.influxdb }}
+  {{- if .Values.traefikMetrics.influxdb }}
   - "--metrics.influxdb=true"
-  - "--metrics.influxdb.address={{ .Values.metrics.influxdb.address }}"
-  - "--metrics.influxdb.protocol={{ .Values.metrics.influxdb.protocol }}"
+  - "--metrics.influxdb.address={{ .Values.traefikMetrics.influxdb.address }}"
+  - "--metrics.influxdb.protocol={{ .Values.traefikMetrics.influxdb.protocol }}"
   {{- end }}
-  {{- if .Values.metrics.prometheus }}
+  {{- if .Values.traefikMetrics.statsd }}
+  - "--metrics.statsd=true"
+  - "--metrics.statsd.address={{ .Values.traefikMetrics.statsd.address }}"
+  {{- if or .Values.traefikMetrics.prometheus }}
   - "--metrics.prometheus=true"
   - "--metrics.prometheus.entrypoint=metrics"
   {{- end }}
-  {{- if .Values.metrics.statsd }}
-  - "--metrics.statsd=true"
-  - "--metrics.statsd.address={{ .Values.metrics.statsd.address }}"
   {{- end }}
   {{- end }}
+  {{- if or .Values.metrics.main.enabled }}
+  - "--metrics.prometheus=true"
+  - "--metrics.prometheus.entrypoint=metrics"
+  {{- end }}
   {{- if .Values.providers.kubernetesCRD.enabled }}
   - "--providers.kubernetescrd"
   {{- end }}
diff --git a/charts/enterprise/traefik/values.yaml b/charts/enterprise/traefik/values.yaml
index da317fc579c..54ec179c8db 100644
--- a/charts/enterprise/traefik/values.yaml
+++ b/charts/enterprise/traefik/values.yaml
@@ -144,8 +144,6 @@ globalArguments:
 # All available options available on https://docs.traefik.io/reference/static-configuration/cli/
 ## Use curly braces to pass values: `helm install --set="additionalArguments={--providers.kubernetesingress.ingressclass=traefik-internal,--log.level=DEBUG}"`
 additionalArguments:
-  - "--metrics.prometheus"
-  - "--ping"
   - "--serverstransport.insecureskipverify=true"
   - "--providers.kubernetesingress.allowexternalnameservices=true"