diff --git a/systems/nixos-fw16/default.nix b/systems/nixos-fw16/default.nix
index 3e95fcf..bd8d44d 100644
--- a/systems/nixos-fw16/default.nix
+++ b/systems/nixos-fw16/default.nix
@@ -25,6 +25,45 @@
     ./disks.nix
   ];
 
+  nix.settings.builders-use-substitutes = true;
+  nix.distributedBuilds = true;
+  nix.buildMachines = [
+    {
+      hostName = "nixremote@nixos-desk";
+      system = "x86_64-linux";
+      protocol = "ssh";
+      maxJobs = 8;
+      speedFactor = 1;
+      supportedFeatures = [
+        "benchmark"
+        "big-parallel"
+        "kvm"
+        "nixos-test"
+        "gccarch-x86-64-v3"
+        "gccarch-znver3"
+      ];
+
+      mandatoryFeatures = [ ];
+    }
+    {
+      hostName = "nixremote@nixos-pulse";
+      system = "x86_64-linux";
+      protocol = "ssh";
+      maxJobs = 8;
+      speedFactor = 1;
+      supportedFeatures = [
+        "benchmark"
+        "big-parallel"
+        "kvm"
+        "nixos-test"
+        "gccarch-x86-64-v3"
+        "gccarch-znver2"
+      ];
+
+      mandatoryFeatures = [ ];
+    }
+  ];
+
   ####################
   systemd.user = {
     services.modprobed-db = {
@@ -57,6 +96,7 @@
   services.power-profiles-daemon.enable = true;
   powerManagement.powertop.enable = true;
   programs.corectrl.gpuOverclock.enable = lib.mkForce false; # TODO Check if needed
+  programs.adb.enable = true;
   ####
 
   nix.settings.system-features = [
@@ -100,7 +140,7 @@
         configurationLimit = 8;
 
         memtest86.enable = true;
-        bootCounting.enable = true;
+        # bootCounting.enable = true; # reverted atm
       };
       efi.canTouchEfiVariables = true;
     };
@@ -231,6 +271,7 @@
     cpu-x
     fw-ectool
     sbctl # secureboot debugging/config/mgmt
+    android-tools
   ];
 
   hardware = {
diff --git a/users/default.nix b/users/default.nix
index 2419ff2..4c9fbb2 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -5,7 +5,7 @@
 , lib
 , ...
 }: {
-  nix.settings.trusted-users = ["@wheel"];
+  nix.settings.trusted-users = [ "@wheel" ];
   users.users = {
     tester = {
       isNormalUser = true;