diff --git a/hosts/glyph/services/default.nix b/hosts/glyph/services/default.nix
index 468d631a..f02bfdc6 100644
--- a/hosts/glyph/services/default.nix
+++ b/hosts/glyph/services/default.nix
@@ -13,6 +13,7 @@
     ./filebrowser.nix
     ./jellyfin.nix
     ./loki.nix
+    ./music-assistant.nix
     ./navidrome.nix
     ./nfs.nix
     ./ntfy.nix
@@ -127,6 +128,7 @@
   };
   services.grafana-mcp = {
     enable = true;
+    port = 8096;
     grafanaUrl = "https://grafana.zx.dev";
     tokenFile = config.age.secrets.grafana-mcp-token.path;
   };
@@ -136,6 +138,7 @@
   };
   services.obsidian-vault-mcp = {
     enable = true;
+    port = 8098;
     inherit (config.rc.obsidian-sync) vaultPath;
   };
   services.mcpjungle = {
@@ -153,7 +156,7 @@
       description = "Kagi web search and page summarization";
     };
     servers.grafana = {
-      url = "http://127.0.0.1:8095/mcp";
+      url = "http://127.0.0.1:8096/mcp";
       description = "Grafana dashboards, Loki logs, and Prometheus metrics";
     };
     servers.graphite = {
@@ -161,7 +164,7 @@
       description = "Graphite CLI for stacked PRs and code review";
     };
     servers.obsidian-vault = {
-      url = "http://127.0.0.1:8097/mcp";
+      url = "http://127.0.0.1:8098/mcp";
       description = "Read and write files in the Obsidian vault";
     };
     servers.context7 = {
diff --git a/hosts/glyph/services/music-assistant.nix b/hosts/glyph/services/music-assistant.nix
new file mode 100644
index 00000000..dc62414b
--- /dev/null
+++ b/hosts/glyph/services/music-assistant.nix
@@ -0,0 +1,12 @@
+_: {
+  services.music-assistant = {
+    enable = true;
+    openFirewall = true;
+    providers = [
+      "opensubsonic" # Navidrome integration
+      "airplay"
+      "musicbrainz"
+      "coverartarchive"
+    ];
+  };
+}