diff --git a/servapps/Navidrome/cosmos-compose.json b/servapps/Navidrome/cosmos-compose.json
new file mode 100644
index 00000000..885f14fe
--- /dev/null
+++ b/servapps/Navidrome/cosmos-compose.json
@@ -0,0 +1,71 @@
+{
+  "cosmos-installer": {
+    "form": [
+      {
+        "name": "musicPath",
+        "label": "What is the path to your music? (leave empty to not mount anything)",
+        "initialValue": "{DefaultDataPath}/music",
+        "type": "text"
+      },
+      {
+        "name": "dataPath",
+        "label": "What is the path to your data? (leave empty to not mount anything)",
+        "initialValue": "{DefaultDataPath}/data",
+        "type": "text"
+      }
+    ]
+  },
+  "services": {
+    "navidrome": {
+      "image": "deluan/navidrome:latest",
+      "container_name": "{ServiceName}",
+      "user": "1000:1000",
+      "ports": ["4533:4533"],
+      "restart": "unless-stopped",
+      "environment": {
+        "ND_SCANSCHEDULE": "1h",
+        "ND_LOGLEVEL": "info",
+        "ND_SESSIONTIMEOUT": "24h",
+        "ND_BASEURL": ""
+      },
+      "labels": {
+        "cosmos-force-network-secured": "true",
+        "cosmos-auto-update": "true",
+        "cosmos-icon": "https://github.com/navidrome/navidrome/blob/master/ui/public/android-chrome-512x512.png"
+      },
+      "volumes": [
+        {
+          "source": "{Context.dataPath}",
+          "target": "/data",
+          "type": "volume",
+          "if": "Context.dataPath"
+        },
+        {
+          "source": "{Context.musicPath}",
+          "target": "/music:ro",
+          "type": "bind",
+          "if": "Context.musicPath"
+        }
+      ],
+      "routes": [
+        {
+          "name": "{ServiceName}",
+          "description": "Expose {ServiceName} to the web",
+          "useHost": true,
+          "target": "http://{ServiceName}:4533",
+          "mode": "SERVAPP",
+          "Timeout": 14400000,
+          "ThrottlePerMinute": 12000,
+          "BlockCommonBots": true,
+          "SmartShield": {
+            "Enabled": true
+          },
+          "AuthEnabled": true,
+          "AuthAdmin": {
+            "if": "Context.adminOnly"
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/servapps/Navidrome/description.json b/servapps/Navidrome/description.json
new file mode 100644
index 00000000..8a70b0ba
--- /dev/null
+++ b/servapps/Navidrome/description.json
@@ -0,0 +1,9 @@
+{
+  "name": "Navidrome",
+  "longDescription": "<p>Navidrome is an open-source music server and streamer that allows you to manage, listen to, and stream your music collection from anywhere. With Navidrome, you can organize your music library, create playlists, and access your favorite songs via a web interface.</p><p>Key features of Navidrome include a user-friendly web interface, support for various audio formats, album artwork display, and the ability to scrobble your music plays to Last.fm. It provides an excellent solution for music enthusiasts who want to have their music library at their fingertips.</p><p>Navidrome is cross-platform, making it accessible on Windows, Linux, and macOS. It's also available as a Docker container for easy deployment.</p>",
+  "description": "Navidrome is an open-source music server and streamer that lets you manage, listen to, and stream your music collection through a user-friendly web interface. It supports various audio formats and offers Last.fm scrobbling. Navidrome is cross-platform and available as a Docker container.",
+  "tags": ["music server", "music streamer", "open-source", "cross-platform", "audio formats", "Last.fm", "web interface", "music management", "playlists", "Docker", "Windows", "Linux", "macOS"],
+  "repository": "https://github.com/deluan/navidrome",
+  "image": "https://hub.docker.com/r/deluan/navidrome",
+  "supported_architectures": ["amd64", "arm64"]
+}
diff --git a/servapps/Navidrome/icon.png b/servapps/Navidrome/icon.png
new file mode 100644
index 00000000..01612b24
Binary files /dev/null and b/servapps/Navidrome/icon.png differ
diff --git a/servapps/Navidrome/screenshots/1.png b/servapps/Navidrome/screenshots/1.png
new file mode 100644
index 00000000..a84d370c
Binary files /dev/null and b/servapps/Navidrome/screenshots/1.png differ
diff --git a/servapps/Navidrome/screenshots/2.png b/servapps/Navidrome/screenshots/2.png
new file mode 100644
index 00000000..f55ed662
Binary files /dev/null and b/servapps/Navidrome/screenshots/2.png differ