diff --git a/hosts/faunus-ater/modules/media.nix b/hosts/faunus-ater/modules/media.nix
index 7d7fd6a..396b760 100644
--- a/hosts/faunus-ater/modules/media.nix
+++ b/hosts/faunus-ater/modules/media.nix
@@ -5,7 +5,7 @@
   ...
 }: let
   webdavPort = 4918;
-  navidromePort = 4533;
+  navidromePort = config.state.services.music.port;
 in {
   # User and group that owns all media-related files
   users.users.media = {
@@ -146,8 +146,10 @@ in {
     enable = true;
     settings = {
       MusicFolder = "/data/dirty/music";
-      Port = navidromePort;
       DefaultLanguage = "de";
+      Address = "0.0.0.0";
+      Port = navidromePort;
+      BaseUrl = "https://music.tammena.me";
     };
   };
 
diff --git a/state.nix b/state.nix
index b31bba3..8d39d43 100644
--- a/state.nix
+++ b/state.nix
@@ -72,5 +72,10 @@
       port = 8333;
       external = false;
     };
+    music = {
+      host = "faunus-ater";
+      port = 4533;
+      external = true;
+    };
   };
 }