diff --git a/lib/benchpark/system.py b/lib/benchpark/system.py
index ee527788d..e04c3f4a4 100644
--- a/lib/benchpark/system.py
+++ b/lib/benchpark/system.py
@@ -12,6 +12,7 @@
 
 import benchpark.paths
 from benchpark.directives import ExperimentSystemBase
+from benchpark.directives import variant
 import benchpark.repo
 from benchpark.runtime import RuntimeResources
 
@@ -73,6 +74,13 @@ class System(ExperimentSystemBase):
         Tuple["benchpark.variant.Variant", "benchpark.spec.ConcreteSystemSpec"],
     ]
 
+    variant(
+        "scheduler",
+        default="mpi",
+        values=("mpi",),
+        description="Base generates scripts without the scheduler commands",
+    )
+
     def __init__(self, spec):
         self.spec: "benchpark.spec.ConcreteSystemSpec" = spec
         super().__init__()
@@ -83,7 +91,7 @@ def initialize(self):
         self.sys_cores_per_node = None
         self.sys_gpus_per_node = None
         self.sys_mem_per_node = None
-        self.scheduler = None
+        self.scheduler = self.spec.variants["scheduler"][0]
         self.timeout = "120"
         self.queue = None
 
diff --git a/systems/tioga/system.py b/systems/tioga/system.py
index 3a58a0b57..1450fa426 100644
--- a/systems/tioga/system.py
+++ b/systems/tioga/system.py
@@ -33,8 +33,12 @@ class Tioga(System):
 
     def initialize(self):
         super().initialize()
-
-        self.scheduler = "flux"
+        variant(
+            "scheduler",
+            values=("flux", "mpi"),
+            default="flux",
+            description="Scheduler to use on the system",
+        )
         self.sys_cores_per_node = "64"
         self.sys_gpus_per_node = "4"