diff --git a/thomflix-argocd-apps/templates/sonarr-chart.yaml b/thomflix-argocd-apps/templates/sonarr-chart.yaml
new file mode 100644
index 0000000..760966b
--- /dev/null
+++ b/thomflix-argocd-apps/templates/sonarr-chart.yaml
@@ -0,0 +1,58 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: sonarr
+  namespace: {{ .Values.argocd.namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "0"
+    notifications.argoproj.io/subscribe.on-sync-succeeded.telegram: "-1002270587578"
+spec:
+  project: {{ .Values.argocd.project }}
+  source:
+    repoURL: "tccr.io/truecharts"
+    chart: sonarr
+    targetRevision: 23.x
+    helm:
+      releaseName: sonarr
+      valuesObject:
+        persistence:
+          config:
+            type: pvc
+            storageClass: {{ .Values.generalConfigStorageClass }}
+            namespace: {{ .Values.mainNamespace }}
+            accessModes: ReadWriteOnce
+            size: 100Mi
+            enabled: true
+            targetSelector:
+              main:
+                main:
+                  mountPath: /config
+          data:
+            enabled: true
+            type: pvc
+            existingClaim: thomflix-media
+            namespace: {{ .Values.mainNamespace }}
+            targetSelector:
+              main:
+                main:
+                  subPath: "data"
+                  mountPath: "/data"
+        metrics:
+          main:
+            enabled: false
+  destination:
+    server: {{ .Values.mainDestination }}
+    namespace: {{ .Values.mainNamespace }}
+  syncPolicy:
+    automated:
+      prune: true           # Automatically remove resources no longer in the repo
+      selfHeal: true        # Automatically self-heal when drift is detected
+    syncOptions:
+      - ApplyOutOfSyncOnly=true
+      - ServerSideApply=true
+      - CreateNamespace=true
+  ignoreDifferences:
+  - group: apps
+    kind: Deployment
+    jsonPointers:
+    - /spec/template/spec/hostUsers
diff --git a/thomflix-postinstall/templates/sonarr-ingress.yaml b/thomflix-postinstall/templates/sonarr-ingress.yaml
new file mode 100644
index 0000000..b8881bb
--- /dev/null
+++ b/thomflix-postinstall/templates/sonarr-ingress.yaml
@@ -0,0 +1,16 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: sonarr-thomflix
+  annotations:
+    tailscale.com/tags: "tag:k8s,tag:thomflix"
+spec:
+  defaultBackend:
+    service:
+      name: sonarr
+      port:
+        number: 8989
+  ingressClassName: tailscale
+  tls:
+    - hosts:
+        - {{ .Values.tailscaleIngresses.sonarrHostname }}
diff --git a/thomflix-postinstall/values.yaml b/thomflix-postinstall/values.yaml
index 27a6aab..5774c81 100644
--- a/thomflix-postinstall/values.yaml
+++ b/thomflix-postinstall/values.yaml
@@ -1,2 +1,3 @@
 tailscaleIngresses:
   jackettHostname: thomflix-jackett
+  sonarrHostname: thomflix-sonarr