diff --git a/navidrome/data/.gitkeep b/navidrome/data/.gitkeep
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/navidrome/data/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/navidrome/docker-compose.yml b/navidrome/docker-compose.yml
new file mode 100644
index 0000000000..e924ad19ad
--- /dev/null
+++ b/navidrome/docker-compose.yml
@@ -0,0 +1,16 @@
+services:
+  app_proxy:
+    environment:
+      APP_HOST: navidrome_server_1
+      APP_PORT: 4533
+      PROXY_AUTH_ADD: "false"
+
+  server:
+    image: deluan/navidrome:0.52.5@sha256:b154aebe8b33bae82c500ad0a3eb743e31da54c3bfb4e7cc3054b9a919b685c7
+    restart: on-failure
+    environment:
+      - PUID=1000
+      - PGID=1000
+    volumes:
+      - ${APP_DATA_DIR}/data:/data
+      - ${UMBREL_ROOT}/data/storage/downloads/music:/music
diff --git a/navidrome/umbrel-app.yml b/navidrome/umbrel-app.yml
new file mode 100644
index 0000000000..88bfcf58ec
--- /dev/null
+++ b/navidrome/umbrel-app.yml
@@ -0,0 +1,55 @@
+manifestVersion: 1
+id: navidrome
+category: media
+name: Navidrome
+version: "0.52.5"
+tagline: Your personal streaming service
+description: >-
+  Navidrome is an open source web-based music collection server and streamer.
+  It gives you freedom to listen to your music collection from any browser or mobile device. It's like your personal Spotify!
+
+
+  Features:
+
+  - Handles very large music collections
+
+  - Streams virtually any audio format available
+
+  - Reads and uses all your beautifully curated metadata
+
+  - Great support for compilations (Various Artists albums) and box sets (multi-disc albums)
+
+  - Multi-user, each user has their own play counts, playlists, favourites, etc...
+
+  - Very low resource usage
+
+  - Multi-platform, runs on macOS, Linux and Windows. Docker images are also provided
+
+  - Ready to use binaries for all major platforms, including Raspberry Pi
+
+  - Automatically monitors your library for changes, importing new files and reloading new metadata
+
+  - Themeable, modern and responsive Web interface based on Material UI
+
+  - Compatible with all Subsonic/Madsonic/Airsonic clients
+
+  - Transcoding on the fly. Can be set per user/player. Opus encoding is supported
+
+  - Translated to various languages
+
+developer: Navidrome
+website: https://www.navidrome.org/
+dependencies: []
+repo: https://github.com/navidrome/navidrome
+support: https://github.com/navidrome/navidrome/discussions
+port: 4533
+gallery:
+  - 1.jpg
+  - 2.jpg
+  - 3.jpg
+path: ""
+permissions:
+  - STORAGE_DOWNLOADS
+releaseNotes: ""
+submitter: owmsoton
+submission: https://github.com/getumbrel/umbrel-apps/pull/1232