diff --git a/config/services/hydra/nix-config.nix b/config/services/hydra/nix-config.nix
index 03bb8f6..410b29f 100644
--- a/config/services/hydra/nix-config.nix
+++ b/config/services/hydra/nix-config.nix
@@ -19,7 +19,7 @@
       maxJobs = 2;
       speedFactor = 24;
       systems = [ "aarch64-linux" ];
-      supportedFeatures = base ++ aarch64;
+      supportedFeatures = base ++ aarch64 ++ [ "aarch64-linux-native" ];
       sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
     }
     {
@@ -28,7 +28,7 @@
       maxJobs = 2;
       speedFactor = 20;
       systems = [ "riscv64-linux" ];
-      supportedFeatures = base ++ riscv64;
+      supportedFeatures = base ++ riscv64 ++ [ "riscv64-linux-native" ];
       sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
     }
   ] ++ lib.forEach (lib.range 0 11) (num: {
@@ -39,7 +39,8 @@
       systems = [ "i686-linux" "x86_64-linux" ]
         ++ lib.optionals (lib.mod num 5 == 0) [ "aarch64-linux" "riscv64-linux" ];
       supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" ] ++ x86-64
-        ++ lib.optionals (lib.mod num 5 == 0) (aarch64 ++ riscv64);
+        ++ lib.optionals (lib.mod num 5 == 0) (aarch64 ++ riscv64
+          ++ [ "aarch64-linux-qemu" "riscv64-linux-qemu" "x86_64-linux-native" "i686-linux-native" ]);
       sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
   });
   nixpkgs.config.allowUnsupportedSystem = true;
diff --git a/pkgs/build-worker-oci/default.nix b/pkgs/build-worker-oci/default.nix
index edba41f..63ade14 100644
--- a/pkgs/build-worker-oci/default.nix
+++ b/pkgs/build-worker-oci/default.nix
@@ -32,6 +32,7 @@ dockerTools.buildLayeredImage {
       "big-parallel"
       "nixos-test"
       "uid-range"
+
       "gccarch-x86-64"
       "gccarch-x86-64-v2"
       "gccarch-x86-64-v3"
@@ -42,6 +43,11 @@ dockerTools.buildLayeredImage {
       "gccarch-rv64imac"
       "gccarch-rv64imacfd"
       "gccarch-rv64gc"
+
+      "riscv64-linux-qemu"
+      "aarch64-linux-qemu"
+      "x86_64-linux-native"
+      "i686-linux-native"
     ];
   in ''
     mkdir -p /root