diff --git a/systems/aarch64-linux/kb-senfnvp/default.nix b/systems/aarch64-linux/kb-senfnvp/default.nix
index 78afab5..530d9d0 100644
--- a/systems/aarch64-linux/kb-senfnvp/default.nix
+++ b/systems/aarch64-linux/kb-senfnvp/default.nix
@@ -5,6 +5,12 @@
     ./hardware.nix
   ];
 
+  # Configure Nix
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix.settings.trusted-users=[ "remotebuild" ];
+  nix.package = pkgs.lix;
+
+  # Networking
   networking.hostName = "kb-senfnvp"; 
   networking.networkmanager.enable = true;
   networking.nameservers = [
@@ -29,6 +35,15 @@
     extraGroups = [ "wheel" ];
   };
 
+  users.users.remotebuild = {
+    isNormalUser = true;
+    createHome = true;
+    homeMode = "400";
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJV9cwMXlbaBdg2gReSnLxH3EV5cyFoSi21f5fZhPfdC kb@Ohybke"
+    ];
+  };
+
   environment.systemPackages = with pkgs; [
     git
     wget
diff --git a/systems/x86_64-linux/Ohybke/default.nix b/systems/x86_64-linux/Ohybke/default.nix
index bfc2009..c1d3747 100644
--- a/systems/x86_64-linux/Ohybke/default.nix
+++ b/systems/x86_64-linux/Ohybke/default.nix
@@ -15,6 +15,23 @@
     "electron-27.3.11"
   ];
 
+  # Distributed Builds
+  nix.buildMachines = [
+    {
+      hostname = "senfnvp.kb-one.de";
+      systems = [ "aarch64-linux" ];
+      protocol = "ssh-ng";
+      maxJobs = 10;
+      speedFactor = 2;
+      supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" ];
+      mandatoryFeatures = [];
+    }
+  ];
+  nix.distributedBuilds = true;
+  nix.extraOptions = ''
+    builders-use-substitutes = true
+  '';
+
   # NAS Test-Config
   suites.nas.enable = false;