diff --git a/cluster/apps/media/flood/helm-release.yaml b/cluster/apps/media/flood/helm-release.yaml
index b178dd89d..40dbe1af0 100644
--- a/cluster/apps/media/flood/helm-release.yaml
+++ b/cluster/apps/media/flood/helm-release.yaml
@@ -2,25 +2,32 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: flood
+  name: &app flood
   namespace: media
 spec:
-  interval: 5m
+  interval: 15m
   chart:
     spec:
-      # renovate: registryUrl=https://k8s-at-home.com/charts/
-      chart: flood
-      version: 6.3.2
+      chart: kah-common-chart
+      version: 1.1.2
       sourceRef:
         kind: HelmRepository
         name: k8s-at-home-charts
         namespace: flux-system
-      interval: 5m
+      interval: 15m
+  install:
+    createNamespace: true
+    remediation:
+      retries: 5
+  upgrade:
+    remediation:
+      retries: 5
   values:
+    global:
+      nameOverride: *app
     image:
       repository: jesec/flood
       tag: 4.7.0
-      pullPolicy: IfNotPresent
 
     env:
       FLOOD_OPTION_RUNDIR: /data
@@ -38,12 +45,13 @@ spec:
       data:
         enabled: true
         existingClaim: flood-config
+        mountPath: /data
 
     service:
       main:
-        annotations:
-          prometheus.io/probe: "true"
-          prometheus.io/protocol: http
+        ports:
+          http:
+            port: 3000
 
     ingress:
       main:
@@ -52,16 +60,14 @@ spec:
         annotations:
           nginx.ingress.kubernetes.io/auth-url: "http://authelia.networking.svc.cluster.local/api/verify"
           nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}"
-          # traefik.ingress.kubernetes.io/router.entrypoints: "websecure"
-          # traefik.ingress.kubernetes.io/router.middlewares: networking-forward-auth@kubernetescrd
         hosts:
-          - host: flood.${SECRET_CLUSTER_DOMAIN}
+          - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}"
             paths:
               - path: /
                 pathType: Prefix
         tls:
           - hosts:
-              - "flood.${SECRET_CLUSTER_DOMAIN}"
+              - *host
 
     resources:
       requests:
diff --git a/cluster/apps/media/lidarr/helm-release.yaml b/cluster/apps/media/lidarr/helm-release.yaml
index 8afd9502c..dcb47b2d1 100644
--- a/cluster/apps/media/lidarr/helm-release.yaml
+++ b/cluster/apps/media/lidarr/helm-release.yaml
@@ -2,25 +2,33 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: lidarr
+  name: &app lidarr
   namespace: media
 spec:
-  interval: 5m
+  interval: 15m
   chart:
     spec:
-      # renovate: registryUrl=https://k8s-at-home.com/charts/
-      chart: lidarr
-      version: 14.1.3
+      chart: kah-common-chart
+      version: 1.1.2
       sourceRef:
         kind: HelmRepository
         name: k8s-at-home-charts
         namespace: flux-system
-      interval: 5m
+      interval: 15m
+  install:
+    createNamespace: true
+    remediation:
+      retries: 5
+  upgrade:
+    remediation:
+      retries: 5
   values:
+    global:
+      nameOverride: *app
+
     image:
       repository: ghcr.io/k8s-at-home/lidarr-develop
       tag: v1.0.2.2592
-      pullPolicy: IfNotPresent
 
     env:
       TZ: "${TIMEZONE}"
@@ -34,6 +42,7 @@ spec:
       config:
         enabled: true
         existingClaim: lidarr-config
+        mountPath: /config
       music:
         enabled: true
         type: nfs
@@ -47,6 +56,12 @@ spec:
         path: /mnt/storage/downloads
         mountPath: /mnt/storage/downloads
 
+    service:
+      main:
+        ports:
+          http:
+            port: 8686
+
     ingress:
       main:
         enabled: true
@@ -57,27 +72,16 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}"
           nginx.ingress.kubernetes.io/configuration-snippet: |
             proxy_set_header Accept-Encoding "";
-            sub_filter '</head>' '<link rel="stylesheet" type="text/css" href="https://theme-park.${SECRET_CLUSTER_DOMAIN}/css/base/sabnzbd/nord.css"></head>';
+            sub_filter '</head>' '<link rel="stylesheet" type="text/css" href="https://theme-park.${SECRET_CLUSTER_DOMAIN}/css/base/lidarr/nord.css"></head>';
             sub_filter_once on;
         hosts:
-          - host: "lidarr.${SECRET_CLUSTER_DOMAIN}"
+          - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}"
             paths:
               - path: /
                 pathType: Prefix
         tls:
           - hosts:
-              - "lidarr.${SECRET_CLUSTER_DOMAIN}"
-      api:
-        enabled: true
-        ingressClassName: "nginx"
-        hosts:
-          - host: "lidarr.${SECRET_CLUSTER_DOMAIN}"
-            paths:
-              - path: /api
-                pathType: Prefix
-        tls:
-          - hosts:
-              - "lidarr.${SECRET_CLUSTER_DOMAIN}"
+              - *host
 
     resources:
       requests:
@@ -85,8 +89,3 @@ spec:
         cpu: 500m
       limits:
         memory: 1500Mi
-
-    metrics:
-      enabled: true
-      prometheusRule:
-        enabled: true
diff --git a/cluster/apps/media/prowlarr/helm-release.yaml b/cluster/apps/media/prowlarr/helm-release.yaml
index d7ec928ae..c307df900 100644
--- a/cluster/apps/media/prowlarr/helm-release.yaml
+++ b/cluster/apps/media/prowlarr/helm-release.yaml
@@ -2,21 +2,30 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: prowlarr
+  name: &app prowlarr
   namespace: media
 spec:
-  interval: 5m
+  interval: 15m
   chart:
     spec:
-      # renovate: registryUrl=https://k8s-at-home.com/charts/
-      chart: prowlarr
-      version: 4.4.2
+      chart: kah-common-chart
+      version: 1.1.2
       sourceRef:
         kind: HelmRepository
         name: k8s-at-home-charts
         namespace: flux-system
-      interval: 5m
+      interval: 15m
+  install:
+    createNamespace: true
+    remediation:
+      retries: 5
+  upgrade:
+    remediation:
+      retries: 5
   values:
+    global:
+      nameOverride: *app
+
     image:
       repository: ghcr.io/k8s-at-home/prowlarr-nightly
       tag: v0.4.3.1898
@@ -29,12 +38,13 @@ spec:
       config:
         enabled: true
         existingClaim: prowlarr-config
+        mountPath: /config
 
     service:
       main:
-        annotations:
-          prometheus.io/probe: "true"
-          prometheus.io/protocol: http
+        ports:
+          http:
+            port: 9696
 
     ingress:
       main:
@@ -45,16 +55,16 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}"
           nginx.ingress.kubernetes.io/configuration-snippet: |
             proxy_set_header Accept-Encoding "";
-            sub_filter '</head>' '<link rel="stylesheet" type="text/css" href="https://theme-park.${SECRET_CLUSTER_DOMAIN}/css/base/sabnzbd/nord.css"></head>';
+            sub_filter '</head>' '<link rel="stylesheet" type="text/css" href="https://theme-park.${SECRET_CLUSTER_DOMAIN}/css/base/prowlarr/nord.css"></head>';
             sub_filter_once on;
         hosts:
-          - host: "prowlarr.${SECRET_CLUSTER_DOMAIN}"
+          - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}"
             paths:
               - path: /
                 pathType: Prefix
         tls:
           - hosts:
-              - "prowlarr.${SECRET_CLUSTER_DOMAIN}"
+              - *host
 
     resources:
       requests:
diff --git a/cluster/apps/media/radarr/helm-release.yaml b/cluster/apps/media/radarr/helm-release.yaml
index d109c117e..0560f2dbc 100644
--- a/cluster/apps/media/radarr/helm-release.yaml
+++ b/cluster/apps/media/radarr/helm-release.yaml
@@ -2,26 +2,33 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: radarr
+  name: &app radarr
   namespace: media
 spec:
-  interval: 5m
+  interval: 15m
   chart:
     spec:
-      # renovate: registryUrl=https://k8s-at-home.com/charts/
-      chart: radarr
-      version: 16.2.3
+      chart: kah-common-chart
+      version: 1.1.2
       sourceRef:
         kind: HelmRepository
         name: k8s-at-home-charts
         namespace: flux-system
-      interval: 5m
+      interval: 15m
+  install:
+    createNamespace: true
+    remediation:
+      retries: 5
+  upgrade:
+    remediation:
+      retries: 5
   values:
-    controllerType: deployment
+    global:
+      nameOverride: *app
+
     image:
       repository: ghcr.io/k8s-at-home/radarr
       tag: v4.1.0.6175
-      pullPolicy: IfNotPresent
 
     env:
       TZ: "${TIMEZONE}"
@@ -35,6 +42,7 @@ spec:
       config:
         enabled: true
         existingClaim: radarr-config
+        mountPath: /config
       downloads:
         enabled: true
         type: nfs
@@ -48,6 +56,12 @@ spec:
         path: /mnt/storage/video
         mountPath: /mnt/storage/video
 
+    service:
+      main:
+        ports:
+          http:
+            port: 7878
+
     ingress:
       main:
         enabled: true
@@ -58,27 +72,16 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}"
           nginx.ingress.kubernetes.io/configuration-snippet: |
             proxy_set_header Accept-Encoding "";
-            sub_filter '</head>' '<link rel="stylesheet" type="text/css" href="https://theme-park.${SECRET_CLUSTER_DOMAIN}/css/base/sabnzbd/nord.css"></head>';
+            sub_filter '</head>' '<link rel="stylesheet" type="text/css" href="https://theme-park.${SECRET_CLUSTER_DOMAIN}/css/base/radarr/nord.css"></head>';
             sub_filter_once on;
         hosts:
-          - host: "radarr.${SECRET_CLUSTER_DOMAIN}"
+          - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}"
             paths:
               - path: /
                 pathType: Prefix
         tls:
           - hosts:
-              - "radarr.${SECRET_CLUSTER_DOMAIN}"
-      api:
-        enabled: true
-        ingressClassName: "nginx"
-        hosts:
-          - host: "radarr.${SECRET_CLUSTER_DOMAIN}"
-            paths:
-              - path: /api
-                pathType: Prefix
-        tls:
-          - hosts:
-              - "radarr.${SECRET_CLUSTER_DOMAIN}"
+              - *host
 
     resources:
       requests:
@@ -86,8 +89,3 @@ spec:
         cpu: 500m
       limits:
         memory: 1500Mi
-
-    metrics:
-      enabled: true
-      prometheusRule:
-        enabled: true
diff --git a/cluster/apps/media/readarr/helm-release.yaml b/cluster/apps/media/readarr/helm-release.yaml
index ca8e1f3a7..4be090fdf 100644
--- a/cluster/apps/media/readarr/helm-release.yaml
+++ b/cluster/apps/media/readarr/helm-release.yaml
@@ -2,26 +2,33 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: readarr
+  name: &app readarr
   namespace: media
 spec:
-  interval: 5m
+  interval: 15m
   chart:
     spec:
-      # renovate: registryUrl=https://k8s-at-home.com/charts/
-      chart: readarr
-      version: 6.3.2
+      chart: kah-common-chart
+      version: 1.1.2
       sourceRef:
         kind: HelmRepository
         name: k8s-at-home-charts
         namespace: flux-system
-      interval: 5m
+      interval: 15m
+  install:
+    createNamespace: true
+    remediation:
+      retries: 5
+  upgrade:
+    remediation:
+      retries: 5
   values:
-    controllerType: deployment
+    global:
+      nameOverride: *app
+
     image:
       repository: ghcr.io/k8s-at-home/readarr
       tag: v0.1.1.1352
-      pullPolicy: IfNotPresent
 
     env:
       TZ: "${TIMEZONE}"
@@ -30,6 +37,7 @@ spec:
       config:
         enabled: true
         existingClaim: readarr-config
+        mountPath: /config
       books:
         enabled: true
         type: nfs
@@ -45,9 +53,9 @@ spec:
 
     service:
       main:
-        annotations:
-          prometheus.io/probe: "true"
-          prometheus.io/protocol: http
+        ports:
+          http:
+            port: 8787
 
     ingress:
       main:
@@ -58,29 +66,16 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}"
           nginx.ingress.kubernetes.io/configuration-snippet: |
             proxy_set_header Accept-Encoding "";
-            sub_filter '</head>' '<link rel="stylesheet" type="text/css" href="https://theme-park.${SECRET_CLUSTER_DOMAIN}/css/base/sabnzbd/nord.css"></head>';
+            sub_filter '</head>' '<link rel="stylesheet" type="text/css" href="https://theme-park.${SECRET_CLUSTER_DOMAIN}/css/base/readarr/nord.css"></head>';
             sub_filter_once on;
         hosts:
-          - host: "readarr.${SECRET_CLUSTER_DOMAIN}"
+          - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}"
             paths:
               - path: /
                 pathType: Prefix
         tls:
           - hosts:
-              - "readarr.${SECRET_CLUSTER_DOMAIN}"
-      api:
-        enabled: true
-        ingressClassName: "nginx"
-        # annotations:
-        #  traefik.ingress.kubernetes.io/router.entrypoints: "websecure"
-        hosts:
-          - host: "readarr.${SECRET_CLUSTER_DOMAIN}"
-            paths:
-              - path: /api
-                pathType: Prefix
-        tls:
-          - hosts:
-              - "readarr.${SECRET_CLUSTER_DOMAIN}"
+              - *host
 
     resources:
       requests:
diff --git a/cluster/apps/media/sonarr/helm-release.yaml b/cluster/apps/media/sonarr/helm-release.yaml
index e4c9788ac..8da362017 100644
--- a/cluster/apps/media/sonarr/helm-release.yaml
+++ b/cluster/apps/media/sonarr/helm-release.yaml
@@ -2,28 +2,37 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: sonarr
+  name: &app sonarr
   namespace: media
 spec:
-  interval: 5m
+  interval: 15m
   chart:
     spec:
-      # renovate: registryUrl=https://k8s-at-home.com/charts/
-      chart: sonarr
-      version: 16.2.3
+      chart: kah-common-chart
+      version: 1.1.2
       sourceRef:
         kind: HelmRepository
         name: k8s-at-home-charts
         namespace: flux-system
-      interval: 5m
+      interval: 15m
+  install:
+    createNamespace: true
+    remediation:
+      retries: 5
+  upgrade:
+    remediation:
+      retries: 5
   values:
-    controllerType: deployment
+    global:
+      nameOverride: *app
+
     image:
       repository: ghcr.io/k8s-at-home/sonarr
       tag: v3.0.8.1507
-      pullPolicy: IfNotPresent
+
     env:
       TZ: "${TIMEZONE}"
+
     podSecurityContext:
       runAsUser: 568
       runAsGroup: 568
@@ -33,6 +42,7 @@ spec:
       config:
         enabled: true
         existingClaim: sonarr-config
+        mountPath: /config
       downloads:
         enabled: true
         type: nfs
@@ -46,6 +56,12 @@ spec:
         path: /mnt/storage/video
         mountPath: /mnt/storage/video
 
+    service:
+      main:
+        ports:
+          http:
+            port: 8989
+
     ingress:
       main:
         enabled: true
@@ -56,27 +72,16 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: "https://login.${SECRET_CLUSTER_DOMAIN}"
           nginx.ingress.kubernetes.io/configuration-snippet: |
             proxy_set_header Accept-Encoding "";
-            sub_filter '</head>' '<link rel="stylesheet" type="text/css" href="https://theme-park.${SECRET_CLUSTER_DOMAIN}/css/base/sabnzbd/nord.css"></head>';
+            sub_filter '</head>' '<link rel="stylesheet" type="text/css" href="https://theme-park.${SECRET_CLUSTER_DOMAIN}/css/base/sonarr/nord.css"></head>';
             sub_filter_once on;
         hosts:
-          - host: "sonarr.${SECRET_CLUSTER_DOMAIN}"
+          - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}"
             paths:
               - path: /
                 pathType: Prefix
         tls:
           - hosts:
-              - "sonarr.${SECRET_CLUSTER_DOMAIN}"
-      api:
-        enabled: true
-        ingressClassName: "nginx"
-        hosts:
-          - host: "sonarr.${SECRET_CLUSTER_DOMAIN}"
-            paths:
-              - path: /api
-                pathType: Prefix
-        tls:
-          - hosts:
-              - "sonarr.${SECRET_CLUSTER_DOMAIN}"
+              - *host
 
     resources:
       requests:
@@ -84,8 +89,3 @@ spec:
         cpu: 500m
       limits:
         memory: 1500Mi
-
-    metrics:
-      enabled: true
-      prometheusRule:
-        enabled: true