diff --git a/public/svgs/navidrome.svg b/public/svgs/navidrome.svg
new file mode 100644
index 000000000..cae50d730
--- /dev/null
+++ b/public/svgs/navidrome.svg
@@ -0,0 +1 @@
+<svg height="256.024" viewBox="0 0 67.74 67.74" width="256.024" xmlns="http://www.w3.org/2000/svg"><g stroke="#000"><circle cx="33.86958" cy="33.869496" fill="#0084ff" r="32.499" stroke-width="2.74219"/><g stroke-width="2.64583"><circle cx="33.86958" cy="33.869496" fill="#fff" r="11.573"/><path d="m161.58928 117.1873c0 10.77898-8.73809 19.51707-19.51707 19.51707m-19.51706-19.51707c0-10.77898 8.73809-19.517068 19.51706-19.517067" fill="none" stroke-linecap="round" transform="translate(-108.20242 -83.317504)"/><path d="m167.71209 117.1873c0 .32994-.006.65843-.0186.98535m-.60107 4.64276c-2.56514 11.4532-12.7932 20.01177-25.02022 20.01177m-25.63986-25.63988c0-.29458.005-.58801.0148-.88019m.49655-4.2403c2.37274-11.707 12.7215-20.519383 25.1285-20.519383" fill="none" stroke-linecap="round" transform="translate(-108.20242 -83.317504)"/><circle cx="33.86958" cy="33.869496" fill="#fff" r="2.391"/></g></g></svg>
\ No newline at end of file
diff --git a/templates/compose/navidrome.yaml b/templates/compose/navidrome.yaml
new file mode 100644
index 000000000..f5a3a9e89
--- /dev/null
+++ b/templates/compose/navidrome.yaml
@@ -0,0 +1,27 @@
+# documentation: https://www.navidrome.org/docs/
+# slogan: Standalone server, that allows you to browse and listen to your music collection using a web browser or any Subsonic-compatible client.
+# tags: media, server, music, subsonic
+# logo: svgs/navidrome.svg
+# port: 4533
+
+services:
+  navidrome:
+    image: 'deluan/navidrome:latest'
+    ports:
+      - '4533:4533'
+    restart: unless-stopped
+    environment:
+      - SERVICE_FQDN_NAVIDROME_4533
+      - ND_SCANSCHEDULE=${ND_SCANSCHEDULE:-1h}
+      - ND_LOGLEVEL=${ND_LOGLEVEL:-info}
+      - ND_SESSIONTIMEOUT=${ND_SESSIONTIMEOUT:-24h}
+      - ND_BASEURL=${ND_BASEURL:-""}
+      - ND_ENABLEINSIGHTSCOLLECTOR=${ND_ENABLEINSIGHTSCOLLECTOR:-false}
+    volumes:
+      - './data:/data'
+      - './music:/music:ro'
+    healthcheck:
+      test: ['CMD', 'wget', '--spider', '--quiet', 'http://127.0.0.1:4533/ping']
+      interval: 10s
+      timeout: 5s
+      retries: 5