diff --git a/terraform/hydra.nix b/terraform/hydra.nix
index 1ecda77..4a044d2 100644
--- a/terraform/hydra.nix
+++ b/terraform/hydra.nix
@@ -205,10 +205,90 @@ in
       email_notifications = false;
     };
 
-    resource.hydra_jobset.yureka-staging-test = {
+    resource.hydra_jobset.nixos-staging-next-small = {
       project = config.resource.hydra_project.forkos.name;
       state = "enabled";
       visible = true;
+      name = "nixos-staging-next-small";
+      type = "legacy";
+      description = "nixos jobset for the staging-next branch";
+
+      nix_expression = {
+        file = "nixos/release-small.nix";
+        input = "nixpkgs";
+      };
+
+      check_interval = 0;
+      scheduling_shares = 3000;
+      keep_evaluations = 3;
+
+      email_notifications = false;
+
+      input = [
+        {
+          name = "nixpkgs";
+          type = "git";
+          value = "https://cl.forkos.org/nixpkgs staging-next";
+          notify_committers = false;
+        }
+        {
+          name = "officialRelease";
+          type = "boolean";
+          value = "false";
+          notify_committers = false;
+        }
+        {
+          name = "supportedSystems";
+          type = "nix";
+          value = ''[ "x86_64-linux" ]'';
+        }
+      ];
+    };
+
+    resource.hydra_jobset.nixpkgs-staging-next = {
+      project = config.resource.hydra_project.forkos.name;
+      state = "enabled";
+      visible = true;
+      name = "nixpkgs-staging-next";
+      type = "legacy";
+      description = "nixpkgs jobset for the staging-next branch";
+
+      nix_expression = {
+        file = "pkgs/top-level/release.nix";
+        input = "nixpkgs";
+      };
+
+      check_interval = 0;
+      scheduling_shares = 3000;
+      keep_evaluations = 3;
+
+      email_notifications = false;
+
+      input = [
+        {
+          name = "nixpkgs";
+          type = "git";
+          value = "https://cl.forkos.org/nixpkgs staging-next";
+          notify_committers = false;
+        }
+        {
+          name = "officialRelease";
+          type = "boolean";
+          value = "false";
+          notify_committers = false;
+        }
+        {
+          name = "supportedSystems";
+          type = "nix";
+          value = ''[ "x86_64-linux" ]'';
+        }
+      ];
+    };
+
+    resource.hydra_jobset.yureka-staging-test = {
+      project = config.resource.hydra_project.forkos.name;
+      state = "disabled";
+      visible = false;
       name = "yureka-staging-test";
       type = "legacy";
       description = "staging branch for yureka-nixos";