diff --git a/ops/nixos/bvm-nixosmgmt/default.nix b/ops/nixos/bvm-nixosmgmt/default.nix
index 9b2ee4599f..e443992889 100644
--- a/ops/nixos/bvm-nixosmgmt/default.nix
+++ b/ops/nixos/bvm-nixosmgmt/default.nix
@@ -25,7 +25,7 @@
   environment.etc."rundeck.nodes.yaml" = let
     content = builtins.mapAttrs (name: value: {
       nodename = name;
-      hostname = value.config.networking.fqdn;
+      hostname = value.config.my.rundeck.hostname;
       tags = lib.concatStringsSep "," value.config.my.rundeck.tags;
       username = "deployer";
       osFamily = "unix";
diff --git a/ops/nixos/lib/common.nix b/ops/nixos/lib/common.nix
index 5721cbb47b..deb0c8614d 100644
--- a/ops/nixos/lib/common.nix
+++ b/ops/nixos/lib/common.nix
@@ -11,6 +11,10 @@ in
 {
   imports = [ ../../../third_party/home-manager/nixos ];
 
+  options.my.rundeck.hostname = lib.mkOption {
+    type = lib.types.str;
+    default = config.networking.fqdn;
+  };
   options.my.rundeck.expectedOnline = lib.mkOption {
     type = lib.types.bool;
     default = true;
diff --git a/ops/nixos/marukuru/default.nix b/ops/nixos/marukuru/default.nix
index 5be3573f18..dd27420a6d 100644
--- a/ops/nixos/marukuru/default.nix
+++ b/ops/nixos/marukuru/default.nix
@@ -66,6 +66,7 @@ in {
 
   services.openssh.ports = [ 20022 ];
   my.deploy.args = "-p 20022";
+  my.rundeck.hostname = "${config.networking.fqdn}:20022";
 
   networking.firewall = {
     interfaces.docker0.allowedTCPPorts = [ 25 ];
diff --git a/ops/nixos/swann/default.nix b/ops/nixos/swann/default.nix
index c9926fac82..f8e9b291b0 100644
--- a/ops/nixos/swann/default.nix
+++ b/ops/nixos/swann/default.nix
@@ -34,7 +34,7 @@ in {
   # Networking!
   networking = {
     hostName = "swann"; # Define your hostname.
-    domain = "house.as205479.net";
+    domain = "int.as205479.net";
     nameservers = ["8.8.8.8" "8.8.4.4"];
     useDHCP = false;
     interfaces = {
diff --git a/ops/nixos/totoro/default.nix b/ops/nixos/totoro/default.nix
index ad784e9e5f..4b0e12c641 100644
--- a/ops/nixos/totoro/default.nix
+++ b/ops/nixos/totoro/default.nix
@@ -67,7 +67,7 @@ in {
   # Networking!
   networking = {
     hostName = "totoro"; # Define your hostname.
-    domain = "lukegb.xyz";
+    domain = "int.as205479.net";
     hostId = "676c08c4";
     useDHCP = false;
     interfaces.br-ext.useDHCP = true;