diff --git a/projects/music/project.yaml b/projects/music/project.yaml
index 72c02bc0..41f69f95 100644
--- a/projects/music/project.yaml
+++ b/projects/music/project.yaml
@@ -1,11 +1,9 @@
 config:
   description: Music Streaming
   syncWave: 100
-  repo: k8s-at-home
 
 apps:
-- name: navidrome
-  chart: navidrome
+- name: airsonic
+  chart: airsonic
+  repo: k8s-at-home
   targetRevision: 6.3.2
-  include:
-  - ingress-internal
diff --git a/projects/music/values/airsonic.yaml b/projects/music/values/airsonic.yaml
new file mode 100644
index 00000000..3e9ece14
--- /dev/null
+++ b/projects/music/values/airsonic.yaml
@@ -0,0 +1,59 @@
+image:
+  repository: airsonicadvanced/airsonic-advanced
+  tag: latest
+  pullPolicy: Always
+
+env:
+  JAVA_OPTS: "-Dserver.use-forward-headers=true"
+
+ingress:
+  main:
+    enabled: true
+    annotations:
+      cert-manager.io/cluster-issuer: vault-issuer
+      traefik.ingress.kubernetes.io/router.tls: 'true'
+    hosts:
+    - host: music.dc
+      paths:
+      - path: /
+        pathType: Prefix
+    tls:
+    - secretName: music-tls
+      hosts:
+      - music.dc
+
+securityContext:
+  privileged: false
+
+podSecurityContext:
+  runAsUser: 1000
+  runAsGroup: 1000
+  fsGroup: 1000
+
+persistence:
+  music:
+    enabled: true
+    mountPath: /var/music
+    type: hostPath
+    hostPath: /data/media/music
+
+  config:
+    enabled: true
+    mountPath: /var/airsonic
+    size: 1Gi
+    accessMode: ReadWriteOnce
+  playlists:
+    enabled: true
+    mountPath: /var/playlists
+    size: 1Gi
+    accessMode: ReadWriteOnce
+  podcasts:
+    enabled: true
+    mountPath: /var/podcasts
+    size: 1Gi
+    accessMode: ReadWriteOnce
+  media:
+    enabled: true
+    mountPath: /var/media
+    size: 1Gi
+    accessMode: ReadWriteOnce
diff --git a/projects/music/values/navidrome.yaml b/projects/music/values/navidrome.yaml
deleted file mode 100644
index 440858ce..00000000
--- a/projects/music/values/navidrome.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-image:
-  repository: deluan/navidrome
-  tag: 0.47.5
-
-ingress:
-  main:
-    enabled: true
-    annotations:
-      cert-manager.io/cluster-issuer: vault-issuer
-      traefik.ingress.kubernetes.io/router.tls: 'true'
-    hosts:
-    - host: music.dc
-      paths:
-      - path: /
-        pathType: Prefix
-    tls:
-    - secretName: music-tls
-      hosts:
-      - music.dc
-env:
-  # -- Set the container timezone
-  TZ: UTC
-  # -- Log level. Useful for troubleshooting.
-  ND_LOGLEVEL: info
-  # -- How long Navidrome will wait before closing web ui idle sessions
-  ND_SESSIONTIMEOUT: 24h
-  # -- Enables transcoding configuration in the UI
-  ND_ENABLETRANSCODINGCONFIG: "true"
-  # -- Folder where your music library is stored.
-  ND_MUSICFOLDER: /music
-
-  ND_SCANSCHEDULE: "0"
-  ND_LASTFM_ENABLED: "false"
-  ND_ENABLEEXTERNALSERVICES: "false"
-  ND_LISTENBRAINZ_ENABLED: "false"
-
-securityContext:
-  privileged: false
-
-podSecurityContext:
-  runAsUser: 1000
-  runAsGroup: 1000
-  fsGroup: 1000
-
-persistence:
-  config:
-    enabled: true
-    mountPath: /data
-    storageClass: local-path
-    accessMode: ReadWriteOnce
-    size: 1Gi
-  music:
-    enabled: true
-    type: hostPath
-    mountPath: /music
-    hostPath: /data/media/music