diff --git a/system/core/nix.nix b/system/core/nix.nix
index abd0a152..c20e72d8 100644
--- a/system/core/nix.nix
+++ b/system/core/nix.nix
@@ -15,6 +15,7 @@
       ];
       trusted-users = [
         "root"
+        "nixremote"
         "@wheel"
       ];
 
@@ -28,6 +29,11 @@
         system = "x86_64-linux";
         protocol = "ssh-ng";
       }
+      {
+        hostName = "lilith-pc";
+        system = "x86_64-linux";
+        protocol = "ssh-ng";
+      }
     ];
   };
 }
diff --git a/system/core/users.nix b/system/core/users.nix
index aa2029db..eceae09e 100644
--- a/system/core/users.nix
+++ b/system/core/users.nix
@@ -1,14 +1,28 @@
-{ config, ...}: let 
-    host = config.networking.hostName;
-  in {
+{ config, ... }:
+let
+  host = config.networking.hostName;
+in
+{
   users.mutableUsers = false;
   users.users = {
     lilith = {
       isNormalUser = true;
       uid = 1000;
-      extraGroups = [ "wheel" "networkmanager" ];
+      extraGroups = [
+        "wheel"
+        "networkmanager"
+      ];
       hashedPasswordFile = config.sops.secrets."user/password".path;
     };
+
+    remotebuilder = {
+      isNormalUser = false;
+      group = "users";
+      extraGroups = [ ];
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN7RJ1q5TczmSDge2U2lXrZVtRzOM/D+Bodwrc6h3EjA"
+      ];
+    };
   };
 
   sops.secrets = {
@@ -26,5 +40,10 @@
       path = "/home/lilith/.ssh/id_ed25519.pub";
       owner = "lilith";
     };
+    "ssh/nixremote/private" = {
+      sopsFile = ../../secrets/default.yaml;
+      path = "/root/.ssh/nixremote";
+      owner = "root";
+    };
   };
 }