diff --git a/darwin/shiro/configuration.nix b/darwin/shiro/configuration.nix
index d4144261..701fb342 100644
--- a/darwin/shiro/configuration.nix
+++ b/darwin/shiro/configuration.nix
@@ -43,10 +43,10 @@
     ];
   };
   users.users.remotebuilder = {
-    isSystemUser = true;
+    # isSystemUser = true;
     description = "User for Nix remote builds";
-    uid = 700;
-    home = "/var/lib/remotebuilder";
+    # uid = 700;
+    home = "/var/remotebuilder";
     createHome = true;
     shell = "/bin/bash";
     openssh.authorizedKeys.keyFiles = [
diff --git a/deploy.nix b/deploy.nix
index ab920469..e9c61bb3 100644
--- a/deploy.nix
+++ b/deploy.nix
@@ -37,24 +37,24 @@
         user = "root";
       };
     };
-    # kuro = {
-    #   hostname = "kuro";
-    #   interactiveSudo = true;
-    #   profiles.system = {
-    #     sshUser = "fs0c131y";
-    #     path = deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.kuro;
-    #     user = "root";
-    #   };
-    # };
-    # shiro = {
-    #   hostname = "shiro";
-    #   interactiveSudo = true;
-    #   profiles.system = {
-    #     sshUser = "servius";
-    #     path = deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.shiro;
-    #     user = "root";
-    #   };
-    # };
+    kuro = {
+      hostname = "kuro";
+      interactiveSudo = true;
+      profiles.system = {
+        sshUser = "fs0c131y";
+        path = deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.kuro;
+        user = "root";
+      };
+    };
+    shiro = {
+      hostname = "shiro";
+      interactiveSudo = true;
+      profiles.system = {
+        sshUser = "servius";
+        path = deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.shiro;
+        user = "root";
+      };
+    };
     # deck = {
     #   hostname = "steamdeck";
     #   profiles.system = {