diff --git a/home/programs/ssh/shared/builder.nix b/home/programs/ssh/shared/builder.nix
index 9f81160..19a3c9a 100644
--- a/home/programs/ssh/shared/builder.nix
+++ b/home/programs/ssh/shared/builder.nix
@@ -1,7 +1,7 @@
 {
   matchBlocks = {
     "builder-sail" = {
-      hostname = "sail-ts.kempkens.io";
+      hostname = "sail.ts.kempkens.network";
       port = 22;
       user = "root";
       identityFile = "~/.ssh/Hetzner.pub";
@@ -9,11 +9,19 @@
     };
 
     "builder-attic" = {
-      hostname = "attic-ts.kempkens.io";
+      hostname = "attic.ts.kempkens.network";
       port = 22;
       user = "root";
       identityFile = "~/.ssh/Hetzner.pub";
       identitiesOnly = true;
     };
+
+    "builder-mediaserver" = {
+      hostname = "mediaserver.ts.kempkens.network";
+      port = 22;
+      user = "root";
+      identityFile = "~/.ssh/LAN.pub";
+      identitiesOnly = true;
+    };
   };
 }
diff --git a/home/programs/ssh/shared/private.nix b/home/programs/ssh/shared/private.nix
index 04a18d9..ca8377d 100644
--- a/home/programs/ssh/shared/private.nix
+++ b/home/programs/ssh/shared/private.nix
@@ -50,7 +50,7 @@
     };
 
     "sail" = {
-      hostname = "sail-ts.kempkens.io";
+      hostname = "sail.ts.kempkens.network";
       port = 22;
       user = "daniel";
       forwardAgent = true;
@@ -59,12 +59,21 @@
     };
 
     "attic" = {
-      hostname = "attic-ts.kempkens.io";
+      hostname = "attic.ts.kempkens.network";
       port = 22;
       user = "daniel";
       forwardAgent = true;
       identityFile = "~/.ssh/Hetzner.pub";
       identitiesOnly = true;
     };
+
+    "mediaserver" = {
+      hostname = "mediaserver.ts.kempkens.network";
+      port = 22;
+      user = "daniel";
+      forwardAgent = true;
+      identityFile = "~/.ssh/LAN.pub";
+      identitiesOnly = true;
+    };
   };
 }
diff --git a/system/hosts/Styx.nix b/system/hosts/Styx.nix
index 3da3f71..ffe391a 100644
--- a/system/hosts/Styx.nix
+++ b/system/hosts/Styx.nix
@@ -53,6 +53,12 @@
         systems = [ "x86_64-linux" "aarch64-linux" ];
         maxJobs = 1;
       }
+
+      {
+        hostName = "builder-mediaserver";
+        systems = [ "x86_64-linux" "aarch64-linux" ];
+        maxJobs = 1;
+      }
     ];
 
     gc = {
diff --git a/system/hosts/mediaserver.nix b/system/hosts/mediaserver.nix
index c4ab96b..1b6c301 100644
--- a/system/hosts/mediaserver.nix
+++ b/system/hosts/mediaserver.nix
@@ -11,6 +11,8 @@ in
 
     ../nixos/git.nix
 
+    ../nixos/atuin-sync.nix
+
     ../nixos/attic.nix
 
     ../nixos/tailscale.nix