diff --git a/config/services/hydra/nix-config.nix b/config/services/hydra/nix-config.nix
index 7f86aa0..5b77fac 100644
--- a/config/services/hydra/nix-config.nix
+++ b/config/services/hydra/nix-config.nix
@@ -23,8 +23,8 @@
       sshUser = "nix-ssh";
       maxJobs = 8;
       speedFactor = 18;
-      systems = [ "x86_64-linux" ];
-      supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-x86-64-v3" ];
+      systems = [ "x86_64-linux" "riscv64-linux" ];
+      supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-x86-64" "gccarch-x86-64-v2" "gccarch-x86-64-v3" ];
       sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
     }
     {
@@ -32,8 +32,8 @@
       sshUser = "nix-ssh";
       maxJobs = 8;
       speedFactor = 18;
-      systems = [ "x86_64-linux" ];
-      supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-x86-64-v3" ];
+      systems = [ "x86_64-linux" "riscv64-linux" ];
+      supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-x86-64" "gccarch-x86-64-v2" "gccarch-x86-64-v3" ];
       sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
     }
   ];