diff --git a/.env b/.env
index c753c21..6f6e55b 100644
--- a/.env
+++ b/.env
@@ -53,4 +53,6 @@ LOKI_INTERNAL_PORT=3100
 GRAFANA_EXTERNAL_PORT=3600
 GRAFANA_INTERNAL_PORT=3000
 STASH_EXTERNAL_PORT=9999
-STASH_INTERNAL_PORT=9999
\ No newline at end of file
+STASH_INTERNAL_PORT=9999
+NAVIDROME_EXTERNAL_PORT=4533
+NAVIDROME_INTERNAL_PORT=4533
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 6c7cecf..d0cd289 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -470,6 +470,23 @@ services:
       - base
     restart: unless-stopped
 
+  navidrome:
+    image: deluan/navidrome
+    container_name: navidrome
+    ports:
+      - "${NAVIDROME_EXTERNAL_PORT}:${NAVIDROME_INTERNAL_PORT}"
+    env_file:
+      - navidrome.env
+    user: "${PUID}:${PGID}"
+    volumes:
+      - "${DOCKER_STORAGE_PATH}/navidrome:/data"
+      - "${STORAGE_PATH}/media/music2:/music"
+    networks:
+      - public
+    profiles:
+      - base
+    restart: unless-stopped
+
 networks:
   loki:
   caddy:
diff --git a/navidrome.env b/navidrome.env
new file mode 100644
index 0000000..a6d9f19
--- /dev/null
+++ b/navidrome.env
@@ -0,0 +1,7 @@
+ND_LASTFM_APIKEY=29e22ee836a0cb51cfaacb72d605e30d
+ND_LASTFM_SECRET=10aa58294eeffa142685e78a0cd78ad6
+ND_SPOTIFY_ID=9d6a1b14a4134df5b4447fa46c4bf275
+ND_SPOTIFY_SECRET=27aed3e91dc34d7593d99ad4febea939
+ND_DEVACTIVITYPANEL=false
+ND_SEARCHFULLSTRING=true
+ND_ENABLESHARING=true
\ No newline at end of file