diff --git a/charts/stable/lidarr/Chart.yaml b/charts/stable/lidarr/Chart.yaml
index 39b21fad..a64998e5 100644
--- a/charts/stable/lidarr/Chart.yaml
+++ b/charts/stable/lidarr/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.8.0.1886
 description: Looks and smells like Sonarr but made for music
 name: lidarr
-version: 7.3.1
+version: 7.4.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - lidarr
diff --git a/charts/stable/lidarr/ci/ct-exportarr-values.yaml b/charts/stable/lidarr/ci/ct-exportarr-values.yaml
new file mode 100644
index 00000000..bcec2bdd
--- /dev/null
+++ b/charts/stable/lidarr/ci/ct-exportarr-values.yaml
@@ -0,0 +1,25 @@
+# Test exportarr
+persistence:
+  config:
+    enabled: true
+    emptyDir: true
+
+additionalContainers:
+- name: exportarr
+  image: ghcr.io/onedr0p/exportarr:v0.6.0
+  imagePullPolicy: IfNotPresent
+  args: ["exportarr", "lidarr"]
+  env:
+  - name: PORT
+    value: "32123"
+  - name: URL
+    value: "http://localhost"
+  - name: CONFIG
+    value: "/config/config.xml"
+  ports:
+  - name: exportarr
+    containerPort: 32123
+  volumeMounts:
+  - name: config
+    mountPath: /config
+    readOnly: true
diff --git a/charts/stable/lidarr/templates/podmonitor.yaml b/charts/stable/lidarr/templates/podmonitor.yaml
new file mode 100644
index 00000000..dc673908
--- /dev/null
+++ b/charts/stable/lidarr/templates/podmonitor.yaml
@@ -0,0 +1,24 @@
+{{- if .Values.prometheus.podMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.prometheus.podMonitor.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+  podMetricsEndpoints:
+  - port: exportarr
+    {{- with .Values.prometheus.podMonitor.interval }}
+    interval: {{ . }}
+    {{- end }}
+    {{- with .Values.prometheus.podMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ . }}
+    {{- end }}
+    path: /metrics
+{{- end }}
diff --git a/charts/stable/lidarr/values.yaml b/charts/stable/lidarr/values.yaml
index db9dbbe0..b9c7319b 100644
--- a/charts/stable/lidarr/values.yaml
+++ b/charts/stable/lidarr/values.yaml
@@ -67,3 +67,33 @@ persistence:
     ## Do not delete the pvc upon helm uninstall
     # skipuninstall: false
     # existingClaim: ""
+
+# Enable gathering Prometheus metrics
+prometheus:
+  podMonitor:
+    enabled: false
+    interval: 1m
+    scrapeTimeout: 1m30s
+    additionalLabels: {}
+
+# # When using the prometheus.podMonitor the following
+# # container is required
+# additionalContainers:
+# - name: exportarr
+#   image: ghcr.io/onedr0p/exportarr:v0.6.0
+#   imagePullPolicy: IfNotPresent
+#   args: ["exportarr", "lidarr"]
+#   env:
+#   - name: PORT
+#     value: "32123"
+#   - name: URL
+#     value: "http://localhost"
+#   - name: CONFIG
+#     value: "/config/config.xml"
+#   ports:
+#   - name: exportarr
+#     containerPort: 32123
+#   volumeMounts:
+#   - name: config
+#     mountPath: /config
+#     readOnly: true
diff --git a/charts/stable/radarr/Chart.yaml b/charts/stable/radarr/Chart.yaml
index 72820a00..7b5c300a 100644
--- a/charts/stable/radarr/Chart.yaml
+++ b/charts/stable/radarr/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 3.0.2.4552
 description: A fork of Sonarr to work with movies à la Couchpotato
 name: radarr
-version: 9.3.1
+version: 9.4.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - radarr
diff --git a/charts/stable/radarr/ci/ct-exportarr-values.yaml b/charts/stable/radarr/ci/ct-exportarr-values.yaml
new file mode 100644
index 00000000..f7743991
--- /dev/null
+++ b/charts/stable/radarr/ci/ct-exportarr-values.yaml
@@ -0,0 +1,25 @@
+# Test exportarr
+persistence:
+  config:
+    enabled: true
+    emptyDir: true
+
+additionalContainers:
+- name: exportarr
+  image: ghcr.io/onedr0p/exportarr:v0.6.0
+  imagePullPolicy: IfNotPresent
+  args: ["exportarr", "radarr"]
+  env:
+  - name: PORT
+    value: "32123"
+  - name: URL
+    value: "http://localhost"
+  - name: CONFIG
+    value: "/config/config.xml"
+  ports:
+  - name: exportarr
+    containerPort: 32123
+  volumeMounts:
+  - name: config
+    mountPath: /config
+    readOnly: true
diff --git a/charts/stable/radarr/templates/podmonitor.yaml b/charts/stable/radarr/templates/podmonitor.yaml
new file mode 100644
index 00000000..dc673908
--- /dev/null
+++ b/charts/stable/radarr/templates/podmonitor.yaml
@@ -0,0 +1,24 @@
+{{- if .Values.prometheus.podMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.prometheus.podMonitor.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+  podMetricsEndpoints:
+  - port: exportarr
+    {{- with .Values.prometheus.podMonitor.interval }}
+    interval: {{ . }}
+    {{- end }}
+    {{- with .Values.prometheus.podMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ . }}
+    {{- end }}
+    path: /metrics
+{{- end }}
diff --git a/charts/stable/radarr/values.yaml b/charts/stable/radarr/values.yaml
index d67af9d9..a6cc9934 100644
--- a/charts/stable/radarr/values.yaml
+++ b/charts/stable/radarr/values.yaml
@@ -67,3 +67,33 @@ persistence:
     ## Do not delete the pvc upon helm uninstall
     # skipuninstall: false
     # existingClaim: ""
+
+# Enable gathering Prometheus metrics
+prometheus:
+  podMonitor:
+    enabled: false
+    interval: 1m
+    scrapeTimeout: 1m30s
+    additionalLabels: {}
+
+# # When using the prometheus.podMonitor the following
+# # container is required
+# additionalContainers:
+# - name: exportarr
+#   image: ghcr.io/onedr0p/exportarr:v0.6.0
+#   imagePullPolicy: IfNotPresent
+#   args: ["exportarr", "radarr"]
+#   env:
+#   - name: PORT
+#     value: "32123"
+#   - name: URL
+#     value: "http://localhost"
+#   - name: CONFIG
+#     value: "/config/config.xml"
+#   ports:
+#   - name: exportarr
+#     containerPort: 32123
+#   volumeMounts:
+#   - name: config
+#     mountPath: /config
+#     readOnly: true
diff --git a/charts/stable/sonarr/Chart.yaml b/charts/stable/sonarr/Chart.yaml
index 0421b8d1..1e9d47db 100644
--- a/charts/stable/sonarr/Chart.yaml
+++ b/charts/stable/sonarr/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 3.0.4.993
 description: Smart PVR for newsgroup and bittorrent users
 name: sonarr
-version: 9.3.1
+version: 9.4.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - sonarr
diff --git a/charts/stable/sonarr/ci/ct-exportarr-values.yaml b/charts/stable/sonarr/ci/ct-exportarr-values.yaml
new file mode 100644
index 00000000..82738a7d
--- /dev/null
+++ b/charts/stable/sonarr/ci/ct-exportarr-values.yaml
@@ -0,0 +1,25 @@
+# Test exportarr
+persistence:
+  config:
+    enabled: true
+    emptyDir: true
+
+additionalContainers:
+- name: exportarr
+  image: ghcr.io/onedr0p/exportarr:v0.6.0
+  imagePullPolicy: IfNotPresent
+  args: ["exportarr", "sonarr"]
+  env:
+  - name: PORT
+    value: "32123"
+  - name: URL
+    value: "http://localhost"
+  - name: CONFIG
+    value: "/config/config.xml"
+  ports:
+  - name: exportarr
+    containerPort: 32123
+  volumeMounts:
+  - name: config
+    mountPath: /config
+    readOnly: true
diff --git a/charts/stable/sonarr/templates/podmonitor.yaml b/charts/stable/sonarr/templates/podmonitor.yaml
new file mode 100644
index 00000000..dc673908
--- /dev/null
+++ b/charts/stable/sonarr/templates/podmonitor.yaml
@@ -0,0 +1,24 @@
+{{- if .Values.prometheus.podMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.prometheus.podMonitor.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+  podMetricsEndpoints:
+  - port: exportarr
+    {{- with .Values.prometheus.podMonitor.interval }}
+    interval: {{ . }}
+    {{- end }}
+    {{- with .Values.prometheus.podMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ . }}
+    {{- end }}
+    path: /metrics
+{{- end }}
diff --git a/charts/stable/sonarr/values.yaml b/charts/stable/sonarr/values.yaml
index 6aff2add..106b2606 100644
--- a/charts/stable/sonarr/values.yaml
+++ b/charts/stable/sonarr/values.yaml
@@ -67,3 +67,33 @@ persistence:
     ## Do not delete the pvc upon helm uninstall
     # skipuninstall: false
     # existingClaim: ""
+
+# Enable gathering Prometheus metrics
+prometheus:
+  podMonitor:
+    enabled: false
+    interval: 1m
+    scrapeTimeout: 1m30s
+    additionalLabels: {}
+
+# # When using the prometheus.podMonitor the following
+# # container is required
+# additionalContainers:
+# - name: exportarr
+#   image: ghcr.io/onedr0p/exportarr:v0.6.0
+#   imagePullPolicy: IfNotPresent
+#   args: ["exportarr", "sonarr"]
+#   env:
+#   - name: PORT
+#     value: "32123"
+#   - name: URL
+#     value: "http://localhost"
+#   - name: CONFIG
+#     value: "/config/config.xml"
+#   ports:
+#   - name: exportarr
+#     containerPort: 32123
+#   volumeMounts:
+#   - name: config
+#     mountPath: /config
+#     readOnly: true