diff --git a/systems/default.nix b/systems/default.nix
index fc31babc..6b202f00 100644
--- a/systems/default.nix
+++ b/systems/default.nix
@@ -65,6 +65,7 @@
         autoRollback = mkOptionDefault true;
         magicRollback = mkOptionDefault true;
         fastConnection = mkOptionDefault false;
+        hostname = mkOptionDefault "${machine}.local.gensokyo.zone";
         profiles.system = {
           user = "root";
           path = inputs.deploy-rs.lib.${system}.activate.nixos inputs.self.nixosConfigurations.${machine};
diff --git a/systems/hakurei/default.nix b/systems/hakurei/default.nix
index 1bdc4637..ea396fa3 100644
--- a/systems/hakurei/default.nix
+++ b/systems/hakurei/default.nix
@@ -1,5 +1,4 @@
 _: {
-  deploy.hostname = "hakurei.local.gensokyo.zone";
   arch = "x86_64";
   type = "NixOS";
   modules = [
diff --git a/systems/mediabox/default.nix b/systems/mediabox/default.nix
index dbafc582..ea396fa3 100644
--- a/systems/mediabox/default.nix
+++ b/systems/mediabox/default.nix
@@ -1,5 +1,4 @@
 _: {
-  deploy.hostname = "mediabox.local.gensokyo.zone";
   arch = "x86_64";
   type = "NixOS";
   modules = [