diff --git a/apis/workflows/v1/job.proto b/apis/workflows/v1/job.proto
index 408ae0c..4f09155 100644
--- a/apis/workflows/v1/job.proto
+++ b/apis/workflows/v1/job.proto
@@ -14,11 +14,6 @@ option features.field_presence = IMPLICIT;
 
 // SubmitJobRequest submits and schedules a job for execution. The job can have multiple root tasks.
 message SubmitJobRequest {
-  // The root tasks for the job.
-  repeated SingleTaskSubmission legacy_tasks = 1 [(buf.validate.field).repeated = {
-    min_items: 1
-    max_items: 64
-  }];
   // The root tasks for the job.
   TaskSubmissions tasks = 5;
   // The name of the job.
@@ -27,6 +22,15 @@ message SubmitJobRequest {
   string trace_parent = 3 [(buf.validate.field).string.min_len = 1];
   // Optional. The ID of the automation that submits this job.
   tilebox.v1.ID automation_id = 4;
+
+  // The root tasks for the job. This field is deprecated and will be removed in the future. Kept around for backwards
+  // compatibility.
+  repeated SingleTaskSubmission legacy_tasks = 1 [
+    deprecated = true,
+    // we support more than that due to grouping and tree spawning, but we rather want to encourage users
+    // to update their clients to use the new field which has way less serialization overhead.
+    (buf.validate.field).repeated.max_items = 1000
+  ];
 }
 
 // GetJobRequest requests details for a job.
diff --git a/apis/workflows/v1/task.proto b/apis/workflows/v1/task.proto
index 53b3a85..4f5ad2d 100644
--- a/apis/workflows/v1/task.proto
+++ b/apis/workflows/v1/task.proto
@@ -36,14 +36,18 @@ message ComputedTask {
   // If not set, the display message specified upon task submission will be kept.
   string display = 2;
   // A list of sub-tasks that the just computed task spawned.
-  repeated SingleTaskSubmission legacy_sub_tasks = 3 [
-    deprecated = true,
-    (buf.validate.field).repeated.max_items = 64
-  ];
-  // A list of sub-tasks that the just computed task spawned.
   TaskSubmissions sub_tasks = 5;
   // A list of progress updates that the computed task wants to report.
   repeated Progress progress_updates = 4;
+
+  // A list of sub-tasks that the just computed task spawned. This field is deprecated and will be removed in the
+  // future. Kept around for backwards compatibility.
+  repeated SingleTaskSubmission legacy_sub_tasks = 3 [
+    deprecated = true,
+    // we support more than that due to grouping and tree spawning, but we rather want to encourage users
+    // to update their clients to use the new field which has way less serialization overhead.
+    (buf.validate.field).repeated.max_items = 1000
+  ];
 }
 
 // IdlingResponse is set in the response of a NextTaskRequest if no task was returned, indicating that the requesting