diff --git a/src/cli/onefuzz/api.py b/src/cli/onefuzz/api.py
index dd0287066..0b541eecf 100644
--- a/src/cli/onefuzz/api.py
+++ b/src/cli/onefuzz/api.py
@@ -644,35 +644,35 @@ class Tasks(Endpoint):
         target_exe: str,
         containers: List[Tuple[enums.ContainerType, primitives.Container]],
         *,
-        pool_name: str,
-        reboot_after_setup: bool = False,
-        vm_count: int = 1,
+        analyzer_env: Optional[Dict[str, str]] = None,
+        analyzer_exe: Optional[str] = None,
+        analyzer_options: Optional[List[str]] = None,
+        check_asan_log: bool = False,
+        check_debugger: bool = True,
+        check_retry_count: Optional[int] = None,
+        debug: Optional[List[enums.TaskDebugFlag]] = None,
         duration: int = 24,
+        ensemble_sync_delay: Optional[int] = None,
+        generator_exe: Optional[str] = None,
+        generator_options: Optional[List[str]] = None,
+        pool_name: str,
+        prereq_tasks: Optional[List[UUID]] = None,
+        reboot_after_setup: bool = False,
+        rename_output: bool = False,
+        stats_file: Optional[str] = None,
+        stats_format: Optional[enums.StatsFormat] = None,
+        supervisor_env: Optional[Dict[str, str]] = None,
+        supervisor_exe: Optional[str] = None,
+        supervisor_input_marker: Optional[str] = None,
+        supervisor_options: Optional[List[str]] = None,
+        tags: Optional[Dict[str, str]] = None,
+        task_wait_for_files: Optional[enums.ContainerType] = None,
         target_env: Optional[Dict[str, str]] = None,
         target_options: Optional[List[str]] = None,
         target_options_merge: bool = False,
         target_timeout: Optional[int] = None,
-        rename_output: bool = False,
-        check_asan_log: bool = False,
-        check_debugger: bool = True,
-        check_retry_count: Optional[int] = None,
         target_workers: Optional[int] = None,
-        supervisor_exe: Optional[str] = None,
-        supervisor_env: Optional[Dict[str, str]] = None,
-        supervisor_options: Optional[List[str]] = None,
-        supervisor_input_marker: Optional[str] = None,
-        stats_file: Optional[str] = None,
-        stats_format: Optional[enums.StatsFormat] = None,
-        generator_exe: Optional[str] = None,
-        generator_options: Optional[List[str]] = None,
-        task_wait_for_files: Optional[enums.ContainerType] = None,
-        analyzer_exe: Optional[str] = None,
-        analyzer_options: Optional[List[str]] = None,
-        analyzer_env: Optional[Dict[str, str]] = None,
-        tags: Optional[Dict[str, str]] = None,
-        prereq_tasks: Optional[List[UUID]] = None,
-        debug: Optional[List[enums.TaskDebugFlag]] = None,
-        ensemble_sync_delay: Optional[int] = None,
+        vm_count: int = 1,
     ) -> models.Task:
         """
         Create a task
@@ -710,40 +710,40 @@ class Tasks(Endpoint):
             )
 
         config = models.TaskConfig(
+            containers=containers_submit,
+            debug=debug,
             job_id=job_id_expanded,
+            pool=models.TaskPool(count=vm_count, pool_name=pool_name),
             prereq_tasks=prereq_tasks,
+            tags=tags,
             task=models.TaskDetails(
-                type=task_type,
+                analyzer_env=analyzer_env,
+                analyzer_exe=analyzer_exe,
+                analyzer_options=analyzer_options,
+                check_asan_log=check_asan_log,
+                check_debugger=check_debugger,
+                check_retry_count=check_retry_count,
                 duration=duration,
-                target_exe=target_exe,
+                ensemble_sync_delay=ensemble_sync_delay,
+                generator_exe=generator_exe,
+                generator_options=generator_options,
+                reboot_after_setup=reboot_after_setup,
+                rename_output=rename_output,
+                stats_file=stats_file,
+                stats_format=stats_format,
+                supervisor_env=supervisor_env,
+                supervisor_exe=supervisor_exe,
+                supervisor_input_marker=supervisor_input_marker,
+                supervisor_options=supervisor_options,
                 target_env=target_env,
+                target_exe=target_exe,
                 target_options=target_options,
                 target_options_merge=target_options_merge,
                 target_timeout=target_timeout,
                 target_workers=target_workers,
-                rename_output=rename_output,
-                supervisor_exe=supervisor_exe,
-                supervisor_options=supervisor_options,
-                supervisor_env=supervisor_env,
-                supervisor_input_marker=supervisor_input_marker,
-                analyzer_exe=analyzer_exe,
-                analyzer_env=analyzer_env,
-                analyzer_options=analyzer_options,
-                stats_file=stats_file,
-                stats_format=stats_format,
-                generator_exe=generator_exe,
-                generator_options=generator_options,
+                type=task_type,
                 wait_for_files=task_wait_for_files,
-                reboot_after_setup=reboot_after_setup,
-                check_asan_log=check_asan_log,
-                check_debugger=check_debugger,
-                check_retry_count=check_retry_count,
-                ensemble_sync_delay=ensemble_sync_delay,
             ),
-            pool=models.TaskPool(count=vm_count, pool_name=pool_name),
-            containers=containers_submit,
-            tags=tags,
-            debug=debug,
         )
 
         return self.create_with_config(config)