diff --git a/kubernetes/apps/default/sonarr/app/externalsecret.yaml b/kubernetes/apps/default/sonarr/app/externalsecret.yaml
index 714b76721..4960f9060 100644
--- a/kubernetes/apps/default/sonarr/app/externalsecret.yaml
+++ b/kubernetes/apps/default/sonarr/app/externalsecret.yaml
@@ -14,13 +14,12 @@ spec:
     template:
       data:
         # App
-        SONARR__API_KEY: "{{ .SONARR__API_KEY }}"
-        SONARR__POSTGRES_HOST: &dbHost postgres16-rw.database.svc.cluster.local
-        SONARR__POSTGRES_PORT: "5432"
-        SONARR__POSTGRES_USER: &dbUser "{{ .SONARR__POSTGRES_USER }}"
-        SONARR__POSTGRES_PASSWORD: &dbPass "{{ .SONARR__POSTGRES_PASSWORD }}"
-        SONARR__POSTGRES_MAIN_DB: sonarr_main
-        SONARR__POSTGRES_LOG_DB: sonarr_log
+        SONARR__AUTH__APIKEY: "{{ .SONARR__API_KEY }}"
+        SONARR__POSTGRES__HOST: &dbHost postgres16-rw.database.svc.cluster.local
+        SONARR__POSTGRES__PORT: "5432"
+        SONARR__POSTGRES__USER: &dbUser "{{ .SONARR__POSTGRES_USER }}"
+        SONARR__POSTGRES__PASSWORD: &dbPass "{{ .SONARR__POSTGRES_PASSWORD }}"
+        SONARR__POSTGRES__MAINDB: sonarr_main
         PUSHOVER_TOKEN: "{{ .PUSHOVER_API_TOKEN }}"
         PUSHOVER_USER_KEY: "{{ .PUSHOVER_USER_KEY }}"
         # Postgres Init
diff --git a/kubernetes/apps/default/sonarr/app/helmrelease.yaml b/kubernetes/apps/default/sonarr/app/helmrelease.yaml
index 4da85dd09..e1e2be602 100644
--- a/kubernetes/apps/default/sonarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/sonarr/app/helmrelease.yaml
@@ -54,16 +54,14 @@ spec:
               tag: 4.0.5.1801@sha256:5c4022bd2b0d5c751b8dcb262abc61df917e778405cf4739d5f3d77b81e2f8a3
             env:
               TZ: "${TIMEZONE}"
-              PUSHOVER_APP_URL: &host "{{ .Release.Name }}.${SECRET_EXTERNAL_DOMAIN}"
-              PUSHOVER_DEBUG: "false"
-              PUSHOVER_PRIORITY: "0"
-              SONARR__AUTHENTICATION_METHOD: External
-              SONARR__AUTHENTICATION_REQUIRED: DisabledForLocalAddresses
-              SONARR__INSTANCE_NAME: Sonarr
-              SONARR__PORT: &port 8080
-              SONARR__APPLICATION_URL: "https://{{ .Release.Name }}.${SECRET_EXTERNAL_DOMAIN}"
-              SONARR__LOG_LEVEL: info
-              SONARR__THEME: dark
+              SONARR__APP__INSTANCENAME: Sonarr
+              SONARR__APP__THEME: dark
+              SONARR__AUTH__METHOD: External
+              SONARR__AUTH__REQUIRED: DisabledForLocalAddresses
+              SONARR__LOG__DBENABLED: "False"
+              SONARR__LOG__LEVEL: info
+              SONARR__SERVER__PORT: &port 8080
+              SONARR__UPDATE__BRANCH: develop
             envFrom: *envFrom
             probes:
               liveness: &probes