diff --git a/cluster/apps/download/radarr/helm-release.yaml b/cluster/apps/download/radarr/helm-release.yaml
index 93d6e4b..83ced94 100644
--- a/cluster/apps/download/radarr/helm-release.yaml
+++ b/cluster/apps/download/radarr/helm-release.yaml
@@ -18,15 +18,51 @@ spec:
     image:
       repository: lscr.io/linuxserver/radarr
       tag: latest
+
+    # Metrics sidecar
+    sidecars:
+      exportarr:
+        image: ghcr.io/onedr0p/exportarr:latest
+        args:
+        - radarr
+        ports:
+        - name: metrics
+          containerPort: 9000
+        env:
+        - name: URL
+          value: "http://localhost"
+        - name: CONFIG
+          value: "/config/config.xml"
+        - name: PORT
+          value: 9000
+        - name: ENABLE_ADDITIONAL_METRICS
+          value: "true"
+        - name: ENABLE_UNKNOWN_QUEUE_ITEMS
+          value: "true"
+        volumeMounts:
+        - name: config
+          mountPath: /config
+          readOnly: true
+      
     env:
       TZ: America/New_York
       PGID: "1000"
       PUID: "1000"
+
     service:
       main:
+        labels:
+          app: radarr-service
+
         ports:
           http:
             port: 7878
+
+          metrics:
+            enabled: true
+            port: 9000
+            protocol: HTTP
+
     probes:
       liveness:
         enabled: false
@@ -41,6 +77,7 @@ spec:
 #          failureThreshold: 3
       startup:
         enabled: false
+
     ingress:
       main:
         enabled: true
@@ -57,6 +94,7 @@ spec:
           - hosts:
               - *host
             secretName: wildcard-main-tls
+
     persistence:
       config:
         enabled: true
diff --git a/cluster/apps/download/radarr/kustomization.yaml b/cluster/apps/download/radarr/kustomization.yaml
index ea3145d..3f72535 100644
--- a/cluster/apps/download/radarr/kustomization.yaml
+++ b/cluster/apps/download/radarr/kustomization.yaml
@@ -1,4 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ./helm-release.yaml
\ No newline at end of file
+- ./helm-release.yaml
+- ./radarr-exportarr-metrics.yaml
\ No newline at end of file
diff --git a/cluster/apps/download/radarr/radarr-exportarr-metrics.yaml b/cluster/apps/download/radarr/radarr-exportarr-metrics.yaml
new file mode 100644
index 0000000..d4479c5
--- /dev/null
+++ b/cluster/apps/download/radarr/radarr-exportarr-metrics.yaml
@@ -0,0 +1,16 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: radarr-exportarr
+  namespace: download
+  labels:
+    release: kube-prometheus-stack
+spec:
+  selector:
+    matchLabels:
+      app: radarr-service
+  endpoints:
+  - port: metrics
+    interval: 3m
+    scrapeTimeout: 1m
+    path: /metrics
\ No newline at end of file
diff --git a/cluster/apps/download/sonarr/helm-release.yaml b/cluster/apps/download/sonarr/helm-release.yaml
index 53e9e5f..4f0acfa 100644
--- a/cluster/apps/download/sonarr/helm-release.yaml
+++ b/cluster/apps/download/sonarr/helm-release.yaml
@@ -37,6 +37,8 @@ spec:
           value: 9000
         - name: ENABLE_ADDITIONAL_METRICS
           value: "true"
+        - name: ENABLE_UNKNOWN_QUEUE_ITEMS
+          value: "true"
         volumeMounts:
         - name: config
           mountPath: /config
diff --git a/cluster/apps/download/sonarr/kustomization.yaml b/cluster/apps/download/sonarr/kustomization.yaml
index 33b5dad..c57d177 100644
--- a/cluster/apps/download/sonarr/kustomization.yaml
+++ b/cluster/apps/download/sonarr/kustomization.yaml
@@ -1,6 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ./sonarr-exportarr.sops.yaml
 - ./helm-release.yaml
 - ./sonarr-exportarr-metrics.yaml
\ No newline at end of file
diff --git a/cluster/apps/download/sonarr/sonarr-exportarr.sops.yaml b/cluster/apps/download/sonarr/sonarr-exportarr.sops.yaml
deleted file mode 100644
index 11759e9..0000000
--- a/cluster/apps/download/sonarr/sonarr-exportarr.sops.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-    name: sonarr-exportarr-secret
-    namespace: download
-stringData:
-    APIKEY: ENC[AES256_GCM,data:f5PgZzaqPzW+SWyO4c4G9KqmkIred90GU5tmmYMA1eY=,iv:ZKss/oayfpavRDf6S8XoAw9bMea59bej92939jwnbvE=,tag:X7ENiPQQmxtjU7N/8AquDQ==,type:str]
-    URL: ENC[AES256_GCM,data:6DuakWUy1SAjZivVF6r/AaMBBT9i,iv:X53Lw45HbXcAMQSxOcOiZGrdOPXo5lt1ggk637tD3AQ=,tag:kyHA46HZm/ZFT3ikf08XoA==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age: []
-    lastmodified: "2023-05-04T17:54:00Z"
-    mac: ENC[AES256_GCM,data:13LAQvU+g3zh5D6chE/umIGOrV1e2AX4iKpgrTLpSWuohgtLsxLFfYTGsKMkhmMZXt7a+T5R1L1HSLBjilHqSatTJx/lRz5AyZ5a2g5D4quJvWS/GEuyL4pzsJ1xmQRbX3fwiQQlTwQcdyVmuzCBH3vv7FsrLqDhhqI7PAYivdI=,iv:vR/HSzoD2yBgtHvoRzhAkZZdzNgGsofapJIUUqubiic=,tag:+Meh3+uzj6qRgjvH2Ec7rg==,type:str]
-    pgp:
-        - created_at: "2023-05-04T17:53:59Z"
-          enc: |
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMAzKleRwoSoixAQ//TpnOVvM5S+Q/FHbmra+QcxyQo4aQ/4Jt4k2FKXEIZFW7
-            RLVd1dfb67RKzCWSzP8xv3cXlLb80CTguEmQmAXuC8gzFrtVQTKmRZKzd/en1s6h
-            W0VDdVMge2G+NFjWlPAko3Kg+MCwtPgTVdiYccB4ZHZf5AN0CPbGemYSdd32UYVj
-            Rwx4mHMR0ZsXlLpSHAfSTOXGXkHX8friIIJo7Xxst1kdEOWCsYTljIG6SqqsH07d
-            LySUTwbGZLyFG/OUlSG9gUO8jOwN82pYtsubL19MUPQ4CJYisOKXjNgDdUbITDNN
-            3O0mKmPQcclMnEw0/yTH/etGBNRVft9hRgVlGX8veJxNfryJcKncNSQ+ZUcoN4gV
-            9acX3IXvHlFy+PKtRTuTrYsYEzNs33O48HfMSwcaGNnDNQNDo1jUN86IaYAv3E/Y
-            hxTIjgsLC/k0l0Lzk0zIqCI94uaNIfbUCcgDDaPfh5DQ/aaxt4ZGE5JlWUUoj6nB
-            SOiEwOuuLvLS7/4pGbSxNjcKLQCYXX2UEji5Y3RxkS83MhenXbKCYD2ZCeWNKVqT
-            Jx9Dt307AqhtDJtzFl0jvUG39dmQpKHo+vi+qmeMNbSh5VEqngUvZ/KN3Rtnst0R
-            BWKhn/lzlBWlEkglbZep1B2Tsq4QuBBg9XKACKTQslzLT4EZxFrumiyybXH01s/U
-            ZgEJAhBYiUts5IcnEWJb8haP2cUkltgHshUE35kRSNiWVGY7CHDjxIok8zGqiE2L
-            ltNneLO9BVCn7ekEQjGLzitEwSwTXm68JRolR8siBI1sw2pg7cZOnDfxY2u5O5oL
-            bZUkK4ctiA==
-            =NADI
-            -----END PGP MESSAGE-----
-          fp: 2CC2B3631D5C3393901335DB68F95C5D753EE1E5
-        - created_at: "2023-05-04T17:53:59Z"
-          enc: |
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMA4WLYkVpP8xtAQ/+J6P9FE/yGAeQAi5nORs+eXIbjUouKzjJ0Ax4T8eD7YQE
-            ZwbzSCEZ0UruChdGWDEDLOezFPZ7h3PkW+Zp0itrUAzsPqVnqz1zA1tZmc//ex4h
-            ccL1CD7LZNYXZMPjRZoyg/bF3AyebMPNKEgUOhIYpLtunck/uFY+D1PL32MwfcVv
-            nHaavrEQnLfYknvGSZRq/aAUztjFvcVfnt1TdC8mw5CFK4YfDG0cMjb7uS4Jzay0
-            KHAyqSU7X4SrbKrreV8qHVcwDhCEdZf9/Jaoyxl7rrDYBfsgawa35Mg1F+BNebqL
-            jMRrbgU3r+D+T9rf/wKFkzI39m+wFrVYNc6Wk0cwWzKvMqCN52o7eLIHIcf4m4EJ
-            uPvfjxTZczsQn2vjbWqcbVOonIoh075JxKRedfavygQkeiCzczq5sW7fl/BCKRuF
-            F9vW9uIjEosvscYvDBPTTD+Obt3PphxthA/FYG0/WyHR1xNBC4bJCFCm/HeUTWrR
-            ACy0xRu9VQ8BJw9XZTR456xa/ndSOdSJGC0R5FeTdT7p/ESLL4CGrQme1M0ITKRy
-            /lmbwSYhDey6KTCTRxLkR/ikwg3qUCYLcvivfz6XhN/uNTBh4YzDcW228P7WkZN5
-            18300iXK5KzTxU3EPa6SHhtmAouAuVzorAH48vq1pVodcbCxCD6Rrq+BUrAaIqnU
-            ZgEJAhA0R38li6TrcwJ1YnasziEKGfbNQ53ZAXfiL8kV6P+G3JtOPeoY85e5coX9
-            o84NUJAPbwHrm+wwzFYf4iBnwb1je8zAcTIuoVkGCZwp6yOuEqwV2HUq4ABycMAm
-            dviqt3YzJw==
-            =r5D8
-            -----END PGP MESSAGE-----
-          fp: 8DF31C9F48A24F525FFB1815FC96C52B59328E95
-    encrypted_regex: ^(data|stringData)$
-    version: 3.7.3