diff --git a/nixos/common/modules/remote-builders.nix b/nixos/common/modules/remote-builders.nix
index 99112b33..4d223e15 100644
--- a/nixos/common/modules/remote-builders.nix
+++ b/nixos/common/modules/remote-builders.nix
@@ -1,5 +1,4 @@
 {
-    nix.settings.trusted-users = [ "albert" ];
     nix.buildMachines = [
         {
             hostName = "framework-server"; # Only availalbe on the Headscale network
diff --git a/nixos/users/albert/default.nix b/nixos/users/albert/default.nix
index c86bc380..730aca0a 100644
--- a/nixos/users/albert/default.nix
+++ b/nixos/users/albert/default.nix
@@ -17,4 +17,18 @@ in {
     packages = [ pkgs.home-manager ];
     openssh.authorizedKeys.keyFiles = [ ../../../keys/ssh/keys.txt ];
   };
+
+  # Make this user trusted
+  nix.settings.trusted-users = [ "albert" ];
+
+  # No sudo password
+  security.sudo.extraRules = [
+  { users = [ "albert" ];
+    commands = [
+      { command = "ALL";
+        options = [ "NOPASSWD" ];
+      }
+    ];
+  }
+];
 }
\ No newline at end of file