diff --git a/data.nix b/data.nix
index a808460..617150b 100644
--- a/data.nix
+++ b/data.nix
@@ -74,14 +74,14 @@ rec {
       initrdPubKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGtYwVhfmdHRK8YcaRQ3JGSIOK55lEMNSPh33Z0iI+pO";
       publicIP = "168.119.184.134";
       jakstIP = "100.89.176.5";
+      system = "aarch64-linux";
+      supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-armv8-a"];
     };
     "fwminex.motiejus.jakst" = rec {
       extraHostNames = [jakstIP vno1IP];
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHlWSZ/H6DR5i5aCrlrEQLVF9MXNvls/pjlLPLaav3f+";
       jakstIP = "100.89.176.6";
       vno1IP = "192.168.189.10";
-      supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-armv8-a"];
-      system = "aarch64-linux";
     };
     "mxp10.motiejus.jakst" = {
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIy9IR7Jq3hRZ5JgwfmeCgSKFrdgujnZt79uxDPVi3tu";
diff --git a/modules/services/remote-builder/default.nix b/modules/services/remote-builder/default.nix
index b4ceeeb..e8515fd 100644
--- a/modules/services/remote-builder/default.nix
+++ b/modules/services/remote-builder/default.nix
@@ -15,6 +15,7 @@
       system = lib.mkOption {type = enum ["aarch64-linux" "x86_64-linux"];};
       hostName = lib.mkOption {type = str;};
       sshKey = lib.mkOption {type = path;};
+      supportedFeatures = lib.mkOption {type = listOf str;};
     };
   };