diff --git a/templates/compose/navidrome.yaml b/templates/compose/navidrome.yaml
index f5a3a9e89..7d01a6374 100644
--- a/templates/compose/navidrome.yaml
+++ b/templates/compose/navidrome.yaml
@@ -6,22 +6,20 @@
 
 services:
   navidrome:
-    image: 'deluan/navidrome:latest'
-    ports:
-      - '4533:4533'
+    image: deluan/navidrome:latest
     restart: unless-stopped
     environment:
       - SERVICE_FQDN_NAVIDROME_4533
+      - ND_BASEURL=${SERVICE_FQDN_NAVIDROME}
       - 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'
+      - "./data:/data"
+      - "./music:/music:ro"
     healthcheck:
-      test: ['CMD', 'wget', '--spider', '--quiet', 'http://127.0.0.1:4533/ping']
+      test: ["CMD", "wget", "--spider", "--quiet", "http://127.0.0.1:4533/ping"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/templates/service-templates.json b/templates/service-templates.json
index 16d1b6c49..76c414a38 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -2085,6 +2085,20 @@
         "minversion": "0.0.0",
         "port": "5678"
     },
+    "navidrome": {
+        "documentation": "https://www.navidrome.org/docs/?utm_source=coolify.io",
+        "slogan": "Standalone server, that allows you to browse and listen to your music collection using a web browser or any Subsonic-compatible client.",
+        "compose": "c2VydmljZXM6CiAgbmF2aWRyb21lOgogICAgaW1hZ2U6ICdkZWx1YW4vbmF2aWRyb21lOmxhdGVzdCcKICAgIHJlc3RhcnQ6IHVubGVzcy1zdG9wcGVkCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fTkFWSURST01FXzQ1MzMKICAgICAgLSAnTkRfQkFTRVVSTD0ke1NFUlZJQ0VfRlFETl9OQVZJRFJPTUV9JwogICAgICAtICdORF9TQ0FOU0NIRURVTEU9JHtORF9TQ0FOU0NIRURVTEU6LTFofScKICAgICAgLSAnTkRfTE9HTEVWRUw9JHtORF9MT0dMRVZFTDotaW5mb30nCiAgICAgIC0gJ05EX1NFU1NJT05USU1FT1VUPSR7TkRfU0VTU0lPTlRJTUVPVVQ6LTI0aH0nCiAgICAgIC0gJ05EX0VOQUJMRUlOU0lHSFRTQ09MTEVDVE9SPSR7TkRfRU5BQkxFSU5TSUdIVFNDT0xMRUNUT1I6LWZhbHNlfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJy4vZGF0YTovZGF0YScKICAgICAgLSAnLi9tdXNpYzovbXVzaWM6cm8nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gd2dldAogICAgICAgIC0gJy0tc3BpZGVyJwogICAgICAgIC0gJy0tcXVpZXQnCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTo0NTMzL3BpbmcnCiAgICAgIGludGVydmFsOiAxMHMKICAgICAgdGltZW91dDogNXMKICAgICAgcmV0cmllczogNQo=",
+        "tags": [
+            "media",
+            "server",
+            "music",
+            "subsonic"
+        ],
+        "logo": "svgs/navidrome.svg",
+        "minversion": "0.0.0",
+        "port": "4533"
+    },
     "neon-ws-proxy": {
         "documentation": "https://neon.tech?utm_source=coolify.io",
         "slogan": "The database you love, on a serverless platform designed to help you build reliable and scalable applications faster.",