diff --git a/os/basado/configuration.nix b/os/basado/configuration.nix
index 5590562..fb96c85 100644
--- a/os/basado/configuration.nix
+++ b/os/basado/configuration.nix
@@ -107,4 +107,17 @@ in
   services.udev.packages = [
     pkgs.android-udev-rules
   ];
+
+  nix.distributedBuilds = true;
+  nix.settings.builders-use-substitutes = true;
+  nix.buildMachines = [
+    {
+      hostName = "192.168.1.5";
+      protocol = "ssh-ng";
+      sshUser = "remotebuild";
+      sshKey = "/home/ant/.ssh/id_ed25519";
+      system = pkgs.stdenv.hostPlatform.system;
+      supportedFeatures = [ "nixos-test" "big-parallel" "kvm" "gccarch-x86-64-v3" ];
+    }
+  ];
 }
diff --git a/os/builder.nix b/os/builder.nix
index be34f52..15040f5 100644
--- a/os/builder.nix
+++ b/os/builder.nix
@@ -1,6 +1,7 @@
 { config, pkgs, ... }: 
 let sshKeys = with (import ../sshKeys.nix); [
   hs
+  basado
 ];
 in
 {
@@ -16,4 +17,5 @@ in
   users.groups.remotebuild = {};
 
   nix.settings.extra-trusted-users = [ "remotebuild" ];
+  nix.settings.extra-system-features = [ "gccarch-x86-64-v3" ];
 }
diff --git a/os/hs/configuration.nix b/os/hs/configuration.nix
index f170691..0356f36 100644
--- a/os/hs/configuration.nix
+++ b/os/hs/configuration.nix
@@ -18,6 +18,7 @@ in {
     ../common.nix
     ../forgejo.nix
     (import ../remote-disk-unlock.nix ["r8169"] sshKeys)
+    ../builder.nix
   ];
 
   boot = {
@@ -146,7 +147,6 @@ in {
 
   nix.distributedBuilds = true;
   nix.settings.builders-use-substitutes = true;
-
   nix.buildMachines = [
     {
       hostName = "192.168.1.2";