diff --git a/charts/stable/authentik/Chart.yaml b/charts/stable/authentik/Chart.yaml
index 365a6587154..392f0887b8c 100644
--- a/charts/stable/authentik/Chart.yaml
+++ b/charts/stable/authentik/Chart.yaml
@@ -40,5 +40,5 @@ sources:
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/authentik
   - https://goauthentik.io/docs/
 type: application
-version: 40.8.0
+version: 40.8.1
 
diff --git a/charts/stable/authentik/templates/_config.tpl b/charts/stable/authentik/templates/_config.tpl
index 454418ad312..93cde4c31ab 100644
--- a/charts/stable/authentik/templates/_config.tpl
+++ b/charts/stable/authentik/templates/_config.tpl
@@ -11,6 +11,13 @@ server:
     AUTHENTIK_LISTEN__HTTP: {{ printf "0.0.0.0:%v" .Values.service.http.ports.http.port | quote }}
     AUTHENTIK_LISTEN__METRICS: {{ printf "0.0.0.0:%v" .Values.service.servermetrics.ports.servermetrics.port | quote }}
 
+{{/* Worker-only config */}}
+worker:
+  enabled: true
+  data:
+    AUTHENTIK_LISTEN__METRICS: {{ printf "0.0.0.0:%v" .Values.service.workermetrics.ports.workermetrics.port | quote }}
+
+{{/* Shared config for server and worker */}}
 server-worker:
   enabled: true
   data:
diff --git a/charts/stable/authentik/templates/common.yaml b/charts/stable/authentik/templates/common.yaml
index f60f125473f..16382c638fc 100644
--- a/charts/stable/authentik/templates/common.yaml
+++ b/charts/stable/authentik/templates/common.yaml
@@ -82,16 +82,5 @@
   {{- $_ := set .Values.metrics.ldapmetrics "enabled" false -}}
 {{- end -}}
 
-{{/* FIXME: See values.yaml */}}
-{{- $_ := set .Values.service.servermetrics "enabled" false -}}
-{{- $_ := set .Values.service.proxymetrics "enabled" false -}}
-{{- $_ := set .Values.service.radiusmetrics "enabled" false -}}
-{{- $_ := set .Values.service.ldapmetrics "enabled" false -}}
-
-{{- $_ := set .Values.metrics.servermetrics "enabled" false -}}
-{{- $_ := set .Values.metrics.proxymetrics "enabled" false -}}
-{{- $_ := set .Values.metrics.radiusmetrics "enabled" false -}}
-{{- $_ := set .Values.metrics.ldapmetrics "enabled" false -}}
-
 {{/* Render the templates */}}
 {{ include "tc.v1.common.loader.apply" . }}
diff --git a/charts/stable/authentik/values.yaml b/charts/stable/authentik/values.yaml
index 406a3df84c5..d193ff3c9a9 100644
--- a/charts/stable/authentik/values.yaml
+++ b/charts/stable/authentik/values.yaml
@@ -145,6 +145,8 @@ workload:
                 name: server-worker
             - configMapRef:
                 name: server-worker
+            - configMapRef:
+                name: worker
           args:
             - worker
           probes:
@@ -372,6 +374,17 @@ service:
         enabled: true
         protocol: http
         port: 10231
+  # Worker Metrics
+  workermetrics:
+    enabled: true
+    type: ClusterIP
+    targetSelector: worker
+    ports:
+      workermetrics:
+        enabled: true
+        protocol: http
+        port: 10235
+        targetSelector: worker
   # Radius Metrics
   radiusmetrics:
     enabled: true
@@ -459,37 +472,49 @@ cnpg:
     database: authentik
 
 metrics:
-  # FIXME: Metrics do not work yet
   servermetrics:
     enabled: true
     type: servicemonitor
     endpoints:
-      - port: "{{ .Values.service.servermetrics.ports.servermetrics.port }}"
+      - port: "servermetrics"
         path: /metrics
+    targetSelector: servermetrics
+    prometheusRule:
+      enabled: false
+  workermetrics:
+    enabled: true
+    type: servicemonitor
+    endpoints:
+      - port: "workermetrics"
+        path: /metrics
+    targetSelector: workermetrics
     prometheusRule:
       enabled: false
   radiusmetrics:
     enabled: true
     type: servicemonitor
     endpoints:
-      - port: "{{ .Values.service.radiusmetrics.ports.radiusmetrics.port }}"
+      - port: "radiusmetrics"
         path: /metrics
+    targetSelector: radiusmetrics
     prometheusRule:
       enabled: false
   ldapmetrics:
     enabled: true
     type: servicemonitor
     endpoints:
-      - port: "{{ .Values.service.ldapmetrics.ports.ldapmetrics.port }}"
+      - port: "ldapmetrics"
         path: /metrics
+    targetSelector: ldapmetrics
     prometheusRule:
       enabled: false
   proxymetrics:
     enabled: true
     type: servicemonitor
     endpoints:
-      - port: "{{ .Values.service.proxymetrics.ports.proxymetrics.port }}"
+      - port: "proxymetrics"
         path: /metrics
+    targetSelector: proxymetrics
     prometheusRule:
       enabled: false
 updated: true