diff --git a/templates/group_vars_mash_servers b/templates/group_vars_mash_servers
index aad0149..f95fc87 100644
--- a/templates/group_vars_mash_servers
+++ b/templates/group_vars_mash_servers
@@ -2727,6 +2727,16 @@ hubsite_service_miniflux_description: "An opinionated feed reader"
 hubsite_service_miniflux_priority: 1000
 # /role-specific:miniflux
 
+# role-specific:navidrome
+# Navidrome
+hubsite_service_navidrome_enabled: "{{ navidrome_enabled }}"
+hubsite_service_navidrome_name: Navidrome
+hubsite_service_navidrome_url: "https://{{ navidrome_hostname }}{{ navidrome_path_prefix }}"
+hubsite_service_navidrome_logo_location: "{{ role_path }}/assets/navidrome.png"
+hubsite_service_navidrome_description: "A Subsonic-API compatible music server"
+hubsite_service_navidrome_priority: 1000
+# /role-specific:navidrome
+
 # role-specific:n8n
 # n8n
 hubsite_service_n8n_enabled: "{{ n8n_enabled }}"
@@ -3045,6 +3055,19 @@ mash_playbook_hubsite_service_list_auto_itemized:
     }}
   # /role-specific:languagetool
 
+  # role-specific:linkding
+  - |-
+    {{
+      ({
+        'name': hubsite_service_linkding_name,
+        'url': hubsite_service_linkding_url,
+        'logo_location': hubsite_service_linkding_logo_location,
+        'description': hubsite_service_linkding_description,
+        'priority': hubsite_service_linkding_priority,
+      } if hubsite_service_linkding_enabled else omit)
+    }}
+  # /role-specific:linkding
+
   # role-specific:miniflux
   - |-
     {{
@@ -3058,6 +3081,19 @@ mash_playbook_hubsite_service_list_auto_itemized:
     }}
   # /role-specific:miniflux
 
+  # role-specific:navidrome
+  - |-
+    {{
+      ({
+        'name': hubsite_service_navidrome_name,
+        'url': hubsite_service_navidrome_url,
+        'logo_location': hubsite_service_navidrome_logo_location,
+        'description': hubsite_service_navidrome_description,
+        'priority': hubsite_service_navidrome_priority,
+      } if hubsite_service_navidrome_enabled else omit)
+    }}
+  # /role-specific:navidrome
+
   # role-specific:n8n
   - |-
     {{
@@ -3084,19 +3120,6 @@ mash_playbook_hubsite_service_list_auto_itemized:
     }}
   # /role-specific:nextcloud
 
-  # role-specific:linkding
-  - |-
-    {{
-      ({
-        'name': hubsite_service_linkding_name,
-        'url': hubsite_service_linkding_url,
-        'logo_location': hubsite_service_linkding_logo_location,
-        'description': hubsite_service_linkding_description,
-        'priority': hubsite_service_linkding_priority,
-      } if hubsite_service_linkding_enabled else omit)
-    }}
-  # /role-specific:linkding
-
   # role-specific:owncast
   - |-
     {{