diff --git a/docs/command-replacements.md b/docs/command-replacements.md
index acf96f47f..c538fe8d9 100644
--- a/docs/command-replacements.md
+++ b/docs/command-replacements.md
@@ -47,19 +47,25 @@ If you need `supervisor_options` to expand to: `"a", "b", "c", "d"`, you should
 
 These are currently used in the following tasks:
 
-* libfuzzer\_fuzz: `target_exe`, `target_options`, `input_corpus`, `crashes`
-* libfuzzer\_crash\_report: `target_exe`, `target_options`, `input`
-* libfuzzer\_merge: `target_exe`, `target_options`, `input_corpus`
+* libfuzzer\_fuzz: `target_exe`, `target_options`, `input_corpus`, `crashes`,
+  `setup_dir`
+* libfuzzer\_crash\_report: `target_exe`, `target_options`, `input`,
+  `setup_dir`
+* libfuzzer\_merge: `target_exe`, `target_options`, `input_corpus`, `setup_dir`
 * libfuzzer\_coverage: None
 * generic\_analysis: `input`, `target_exe`, `target_options`, `analyzer_exe`,
   `analyzer_options`, `output_dir`, `tools_dir`, `job_id`, `task_id`,
-  `crashes_account`, `crashes_container`, `reports_dir`, `microsoft_telemetry_key`, `instance_telemetry_key`
+  `crashes_account`, `crashes_container`, `reports_dir`,
+  `microsoft_telemetry_key`, `instance_telemetry_key`, `setup_dir`
 * generic\_generator: `generated_inputs`, `input_corpus`, `tools_dir`,
   `generator_exe`, `generator_options`, `target_exe`, `target_options`,
-  `input`, `job_id`, `task_id`, `microsoft_telemetry_key`, `instance_telemetry_key`
+  `input`, `job_id`, `task_id`, `microsoft_telemetry_key`,
+  `instance_telemetry_key`, `setup_dir`
 * generic\_supervisor: `crashes`, `runtime_dir`, `target_exe`, `target_options`,
   `input_corpus`, `input`, `supervisor_exe`, `supervisor_options`, `tools_dir`,
-  `job_id`, `task_id`, `crashes_account`, `crashes_container`, `reports_dir`, `microsoft_telemetry_key`, `instance_telemetry_key`
+  `job_id`, `task_id`, `crashes_account`, `crashes_container`, `reports_dir`,
+  `microsoft_telemetry_key`, `instance_telemetry_key`, `setup_dir`
 * generic\_merge: `input`, `input_corpus`, `output_dir`, `target_exe`,
   `target_options`, `supervisor_exe`, `supervisor_options`, `tools_dir`,
-  `job_id`, `task_id`, `microsoft_telemetry_key`, `instance_telemetry_key`
+  `job_id`, `task_id`, `microsoft_telemetry_key`, `instance_telemetry_key`,
+  `setup_dir`
diff --git a/src/agent/onefuzz-agent/src/tasks/fuzz/generator.rs b/src/agent/onefuzz-agent/src/tasks/fuzz/generator.rs
index 727312a93..6f14acf35 100644
--- a/src/agent/onefuzz-agent/src/tasks/fuzz/generator.rs
+++ b/src/agent/onefuzz-agent/src/tasks/fuzz/generator.rs
@@ -148,6 +148,7 @@ impl GeneratorTask {
         utils::reset_tmp_dir(&output_dir).await?;
         let (mut generator, generator_path) = {
             let expand = Expand::new()
+                .setup_dir(&self.config.common.setup_dir)
                 .generated_inputs(&output_dir)
                 .input_corpus(&corpus_dir)
                 .generator_exe(&self.config.generator_exe)