diff --git a/README.md b/README.md
index 48bf5c33..1ebd7572 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,9 @@
 
 To provision a new host:
 
-* add that host to the SSH config in programs.ssh
 * create a config for that host that contains a deploy.ssh.host
 * run `./nyx install <hostname>`.
 
 To rebuild a host:
 
-* run `./nyx build <hostname> <method>` where method is optional, can be... switch or boot or such.
+* run `./nyx deploy <hostname> <method>` where method is optional, can be... switch or boot or such.
diff --git a/config/hosts/samhain/configuration.nix b/config/hosts/samhain/configuration.nix
index 35c00b9f..7bda79c7 100644
--- a/config/hosts/samhain/configuration.nix
+++ b/config/hosts/samhain/configuration.nix
@@ -11,6 +11,7 @@
   ];
 
   deploy.profiles = [ "gui" "sway" "kat" "private" ];
+  deploy.groups = [ "gui" ];
   deploy.ssh.host = "192.168.1.135";
 
   # graphics tablet
diff --git a/config/hosts/yule/configuration.nix b/config/hosts/yule/configuration.nix
index 6ba24790..725141c2 100644
--- a/config/hosts/yule/configuration.nix
+++ b/config/hosts/yule/configuration.nix
@@ -4,6 +4,7 @@
   imports = [ ./hardware.nix ../../services/zfs.nix ];
 
   deploy.profiles = [ "gui" "sway" "kat" "laptop" "private" ];
+  deploy.groups = [ "gui" ];
   deploy.ssh.host = "192.168.1.92";
 
   boot.loader.systemd-boot.enable = true;
diff --git a/modules/nixos/deploy/default.nix b/modules/nixos/deploy/default.nix
index b9175fec..4cc61212 100644
--- a/modules/nixos/deploy/default.nix
+++ b/modules/nixos/deploy/default.nix
@@ -59,7 +59,7 @@ in {
       #!${pkgs.runtimeShell}
       set -xeo pipefail
       export PATH=${with pkgs; lib.makeBinPath [ coreutils openssh nix ]}
-      export NIX_SSHOPTS="$NIX_SSHOPTS -p${toString cfg.ssh.port}"
+      export NIX_SSHOPTS="-p${toString cfg.ssh.port}"
       nix build ${
         builtins.unsafeDiscardStringContext config.system.build.toplevel.drvPath
       } -o result-${config.networking.hostName}