diff --git a/hosts/azalea/default.nix b/hosts/azalea/default.nix
index a660ee4..706e02f 100644
--- a/hosts/azalea/default.nix
+++ b/hosts/azalea/default.nix
@@ -13,7 +13,7 @@
   security.pam.services.sudo_local.touchIdAuth = true;
   # system.configurationRevision = self.rev or self.dirtyRev or null;
   system = {
-    primaryUser = "liv";
+    primaryUser = username;
     stateVersion = 6;
     defaults = {
       dock = {
diff --git a/hosts/dandelion/default.nix b/hosts/dandelion/default.nix
index f35e219..a6afbc0 100644
--- a/hosts/dandelion/default.nix
+++ b/hosts/dandelion/default.nix
@@ -2,6 +2,7 @@
   lib,
   pkgs,
   config,
+  username,
   ...
 }:
 {
@@ -11,7 +12,7 @@
     ./../../modules/services/dandelion.nix
   ];
 
-  users.users.liv.openssh.authorizedKeys.keys = [
+  users.users.${username}.openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOLdcB5JFWx6OK2BAr8J0wPHNhr2VP2/Ci6fv3a+DPfo liv@violet" # allow violet to log in over ssh to do back ups
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDi8gt51xGRzLSqaNr1LKSdrJ0VHps8U8FME71YCrs6K liv@posy" # allow posy to log in over ssh to mount music folder
   ];
diff --git a/modules/core/sshd.nix b/modules/core/sshd.nix
index 4846674..c6d9df9 100644
--- a/modules/core/sshd.nix
+++ b/modules/core/sshd.nix
@@ -1,4 +1,9 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  username,
+  ...
+}:
 {
   services.openssh = {
     enable = true;
@@ -13,7 +18,7 @@
 
   networking.firewall.allowedTCPPorts = config.services.openssh.ports;
 
-  users.users.liv.openssh.authorizedKeys.keys = [
+  users.users.${username}.openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGXi00z/rxVrWLKgYr+tWIsbHsSQO75hUMSTThNm5wUw liv@sakura" # sakura
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHv2zxCy22KU1tZOH2hA1p8fWVpOSrTYF68+3E5r330O liv@ichiyo" # ichiyo
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKQtG69zrMFsoHForwZEi66y1tPvctqg1OgjQFrF3OI+ liv@iris" # iris