diff --git a/charts/stable/sonarr/Chart.yaml b/charts/stable/sonarr/Chart.yaml
index 1acf7068163..d63ae3184e9 100644
--- a/charts/stable/sonarr/Chart.yaml
+++ b/charts/stable/sonarr/Chart.yaml
@@ -22,7 +22,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/sonarr
   - https://github.com/Sonarr/Sonarr
 type: application
-version: 15.0.30
+version: 15.1.0
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/stable/sonarr/questions.yaml b/charts/stable/sonarr/questions.yaml
index e5ba8d6c8dc..d7855852f25 100644
--- a/charts/stable/sonarr/questions.yaml
+++ b/charts/stable/sonarr/questions.yaml
@@ -11,7 +11,6 @@ questions:
 # Include{podSpec}
 # Include{containerMain}
 
-
                                 - variable: env
                                   group: App Configuration
                                   label: Image Environment
@@ -34,6 +33,7 @@ questions:
                                               description: Basic
                                             - value: Forms
                                               description: Forms
+
 # Include{containerBasic}
 # Include{containerAdvanced}
 
@@ -106,6 +106,8 @@ questions:
                   default: 568
 
 # Include{resources}
+# Include{metrics}
+# Include{prometheusRule}
 # Include{advanced}
 # Include{addons}
 # Include{codeserver}
diff --git a/charts/stable/sonarr/templates/common.yaml b/charts/stable/sonarr/templates/common.yaml
index 539b471c1d2..b51394e00a4 100644
--- a/charts/stable/sonarr/templates/common.yaml
+++ b/charts/stable/sonarr/templates/common.yaml
@@ -1,6 +1 @@
-{{/* Make sure all variables are set properly */}}
-{{- include "tc.v1.common.loader.init" . }}
-
-
-{{/* Render the templates */}}
-{{ include "tc.v1.common.loader.apply" . }}
+{{ include "tc.v1.common.loader.all" . }}
diff --git a/charts/stable/sonarr/values.yaml b/charts/stable/sonarr/values.yaml
index 6dcecc27ee4..dc1d36bcb5b 100644
--- a/charts/stable/sonarr/values.yaml
+++ b/charts/stable/sonarr/values.yaml
@@ -2,25 +2,25 @@ image:
   repository: tccr.io/truecharts/sonarr
   pullPolicy: IfNotPresent
   tag: 3.0.10.1567@sha256:f420ed0b9341a5241c2278d51a7f4f59635a9c3a5670ac893542fa59052e61b2
+exportarrImage:
+  repository: tccr.io/truecharts/exportarr
+  pullPolicy: IfNotPresent
+  tag: v1.5.3@sha256:f369a43b28410f12ce1b96f52187dd5c6fb9769a137ecc6f7ab8fdcfbe7db58e
+
 service:
   main:
     ports:
       main:
         port: 8989
-persistence:
-  config:
-    enabled: true
-    mountPath: /config
-# might be supported on sonarr v4 upon released
-cnpg:
-  main:
-    enabled: false
-
-    database: sonarr
-    user: sonarr
-portal:
-  open:
+  metrics:
     enabled: true
+    type: ClusterIP
+    targetSelector: exportarr
+    ports:
+      metrics:
+        enabled: true
+        port: 8990
+        targetSelector: exportarr
 
 workload:
   main:
@@ -55,3 +55,74 @@ workload:
             #   secretKeyRef:
             #     name: cnpg-main-urls
             #     key: password
+  exportarr:
+    enabled: true
+    type: Deployment
+    strategy: RollingUpdate
+    replicas: 1
+    podSpec:
+      containers:
+        exportarr:
+          primary: true
+          enabled: true
+          imageSelector: exportarrImage
+          args:
+            - sonarr
+          probes:
+            liveness:
+              enabled: true
+              type: http
+              path: /healthz
+              port: "{{ .Values.service.metrics.ports.metrics.port }}"
+            readiness:
+              enabled: true
+              type: http
+              path: /healthz
+              port: "{{ .Values.service.metrics.ports.metrics.port }}"
+            startup:
+              enabled: true
+              type: http
+              path: /healthz
+              port: "{{ .Values.service.metrics.ports.metrics.port }}"
+          env:
+            INTERFACE: 0.0.0.0
+            PORT: "{{ .Values.service.metrics.ports.metrics.port }}"
+            URL: "http://localhost:{{ .Values.service.main.ports.main.port }}"
+            # additional metrics (slow)
+            # ENABLE_ADDITIONAL_METRICS: false
+            # enable gathering unknown queue items
+            # ENABLE_UNKNOWN_QUEUE_ITEMS: false
+            CONFIG: "/config/config.xml"
+
+persistence:
+  config:
+    enabled: true
+    targetSelector:
+      main:
+        main:
+          mountPath: /config
+      exportarr:
+        exportarr:
+          mountPath: /config
+          readOnly: true
+
+# might be supported on sonarr v4 upon released
+cnpg:
+  main:
+    enabled: false
+    database: sonarr
+    user: sonarr
+
+metrics:
+  main:
+    enabled: true
+    type: "servicemonitor"
+    endpoints:
+      - port: exportarr
+        path: /metrics
+    prometheusRule:
+      enabled: false
+
+portal:
+  open:
+    enabled: true