diff --git a/src/cli/onefuzz/templates/libfuzzer.py b/src/cli/onefuzz/templates/libfuzzer.py
index bd3f6c3ce..9aa8ca256 100644
--- a/src/cli/onefuzz/templates/libfuzzer.py
+++ b/src/cli/onefuzz/templates/libfuzzer.py
@@ -328,6 +328,7 @@ class Libfuzzer(Command):
         inputs: Optional[Directory] = None,
         reboot_after_setup: bool = False,
         duration: int = 24,
+        task_duration: Optional[int] = None,
         target_workers: Optional[int] = None,
         target_options: Optional[List[str]] = None,
         fuzzing_target_options: Optional[List[str]] = None,
@@ -458,7 +459,7 @@ class Libfuzzer(Command):
             target_exe=target_exe_blob_name,
             vm_count=vm_count,
             reboot_after_setup=reboot_after_setup,
-            duration=duration,
+            duration=task_duration if task_duration else duration,
             target_workers=target_workers,
             target_options=target_options,
             fuzzing_target_options=fuzzing_target_options,
@@ -625,6 +626,7 @@ class Libfuzzer(Command):
         inputs: Optional[Directory] = None,
         reboot_after_setup: bool = False,
         duration: int = 24,
+        task_duration: Optional[int] = None,
         target_workers: Optional[int] = None,
         fuzzing_target_options: Optional[List[str]] = None,
         target_env: Optional[Dict[str, str]] = None,
@@ -744,7 +746,7 @@ class Libfuzzer(Command):
             fuzzer_containers,
             pool_name=pool_name,
             reboot_after_setup=reboot_after_setup,
-            duration=duration,
+            duration=task_duration if task_duration else duration,
             vm_count=vm_count,
             target_options=fuzzing_target_options,
             target_env=target_env,
@@ -792,7 +794,7 @@ class Libfuzzer(Command):
             libfuzzer_dotnet_loader_dll,
             coverage_containers,
             pool_name=pool_name,
-            duration=duration,
+            duration=task_duration if task_duration else duration,
             vm_count=1,
             reboot_after_setup=reboot_after_setup,
             target_options=sharpfuzz_harness_target_options,
@@ -823,7 +825,7 @@ class Libfuzzer(Command):
             libfuzzer_dotnet_loader_dll,
             report_containers,
             pool_name=pool_name,
-            duration=duration,
+            duration=task_duration if task_duration else duration,
             vm_count=1,
             reboot_after_setup=reboot_after_setup,
             target_options=sharpfuzz_harness_target_options,
@@ -854,6 +856,7 @@ class Libfuzzer(Command):
         inputs: Optional[Directory] = None,
         reboot_after_setup: bool = False,
         duration: int = 24,
+        task_duration: Optional[int] = None,
         target_workers: Optional[int] = 1,
         target_options: Optional[List[str]] = None,
         fuzzing_target_options: Optional[List[str]] = None,
@@ -1005,7 +1008,7 @@ class Libfuzzer(Command):
             fuzzer_containers,
             pool_name=pool_name,
             reboot_after_setup=reboot_after_setup,
-            duration=duration,
+            duration=task_duration if task_duration else duration,
             vm_count=vm_count,
             target_options=libfuzzer_fuzz_target_options,
             target_env=target_env,
@@ -1038,7 +1041,7 @@ class Libfuzzer(Command):
             wrapper_name,
             report_containers,
             pool_name=pool_name,
-            duration=duration,
+            duration=task_duration if task_duration else duration,
             vm_count=1,
             reboot_after_setup=reboot_after_setup,
             target_options=target_options,