diff --git a/systems/aarch64-linux/raspberry-pi/configuration.nix b/systems/aarch64-linux/raspberry-pi/configuration.nix
index 30ab34c..b9337eb 100644
--- a/systems/aarch64-linux/raspberry-pi/configuration.nix
+++ b/systems/aarch64-linux/raspberry-pi/configuration.nix
@@ -12,11 +12,6 @@
       ip = "192.168.178.105";
       role = "server";
     };
-    user = {
-      # default name baked into the ARM ISO image
-      name = "nixos";
-      signingKey = "92166C2B83447076";
-    };
     modules.adguard.enable = true;
   };
 
diff --git a/systems/x86_64-linux/cyberoffice/configuration.nix b/systems/x86_64-linux/cyberoffice/configuration.nix
index f74168c..17b4284 100644
--- a/systems/x86_64-linux/cyberoffice/configuration.nix
+++ b/systems/x86_64-linux/cyberoffice/configuration.nix
@@ -16,13 +16,6 @@
       ip = "192.168.178.200";
       role = "server";
     };
-    # TODO make the user module optional. Servers don't need a dedicated user
-    user = {
-      # default name baked into the ISO image
-      name = "nixos";
-      # TODO make this optional. Signing is not required on servers.
-      signingKey = "394546A47BB40E12";
-    };
     modules = {
       disko = {
         enable = true;
diff --git a/systems/x86_64-linux/watchtower/configuration.nix b/systems/x86_64-linux/watchtower/configuration.nix
index cdbcb5f..86544b2 100644
--- a/systems/x86_64-linux/watchtower/configuration.nix
+++ b/systems/x86_64-linux/watchtower/configuration.nix
@@ -10,13 +10,6 @@
       ip = "192.168.178.210";
       role = "server";
     };
-    # TODO make the user module optional. Servers don't need a dedicated user
-    user = {
-      # default name baked into the ISO image
-      name = "nixos";
-      # TODO make this optional. Signing is not required on servers.
-      signingKey = "394546A47BB40E12";
-    };
     modules = {
       disko = {
         enable = true;