diff --git a/generated/pigweed/for_review_only/buildbucket/ci/docs-builder.textproto b/generated/pigweed/for_review_only/buildbucket/ci/docs-builder.textproto
index 609e93d..bea9975 100644
--- a/generated/pigweed/for_review_only/buildbucket/ci/docs-builder.textproto
+++ b/generated/pigweed/for_review_only/buildbucket/ci/docs-builder.textproto
@@ -47,6 +47,12 @@
       '  "$pigweed/environment": {'
       '    "config_file": "pw_env_setup/config.json"'
       '  },'
+      '  "build_options": {'
+      '    "gn_args": [],'
+      '    "ninja_targets": ['
+      '      "docs"'
+      '    ]'
+      '  },'
       '  "dry_run": false,'
       '  "recipe": "docs_builder"'
       '}'
diff --git a/generated/pigweed/for_review_only/buildbucket/ci/host-tools-builder-linux.textproto b/generated/pigweed/for_review_only/buildbucket/ci/host-tools-builder-linux.textproto
index 511fa1c..8e185fc 100644
--- a/generated/pigweed/for_review_only/buildbucket/ci/host-tools-builder-linux.textproto
+++ b/generated/pigweed/for_review_only/buildbucket/ci/host-tools-builder-linux.textproto
@@ -51,6 +51,12 @@
       '  "artifacts": ['
       '    "host_tools/*"'
       '  ],'
+      '  "build_options": {'
+      '    "gn_args": [],'
+      '    "ninja_targets": ['
+      '      "host_tools"'
+      '    ]'
+      '  },'
       '  "cipd_path": "pigweed/host_tools",'
       '  "dry_run": false,'
       '  "recipe": "target_to_cipd",'
diff --git a/generated/pigweed/for_review_only/buildbucket/ci/host-tools-builder-mac.textproto b/generated/pigweed/for_review_only/buildbucket/ci/host-tools-builder-mac.textproto
index 250b868..6260d63 100644
--- a/generated/pigweed/for_review_only/buildbucket/ci/host-tools-builder-mac.textproto
+++ b/generated/pigweed/for_review_only/buildbucket/ci/host-tools-builder-mac.textproto
@@ -50,6 +50,12 @@
       '  "artifacts": ['
       '    "host_tools/*"'
       '  ],'
+      '  "build_options": {'
+      '    "gn_args": [],'
+      '    "ninja_targets": ['
+      '      "host_tools"'
+      '    ]'
+      '  },'
       '  "cipd_path": "pigweed/host_tools",'
       '  "dry_run": false,'
       '  "macos_sdk.version": "11c29",'
diff --git a/generated/pigweed/for_review_only/buildbucket/ci/host-tools-builder-windows.textproto b/generated/pigweed/for_review_only/buildbucket/ci/host-tools-builder-windows.textproto
index 2bab6c2..9519ae5 100644
--- a/generated/pigweed/for_review_only/buildbucket/ci/host-tools-builder-windows.textproto
+++ b/generated/pigweed/for_review_only/buildbucket/ci/host-tools-builder-windows.textproto
@@ -51,6 +51,12 @@
       '  "artifacts": ['
       '    "host_tools/*"'
       '  ],'
+      '  "build_options": {'
+      '    "gn_args": [],'
+      '    "ninja_targets": ['
+      '      "host_tools"'
+      '    ]'
+      '  },'
       '  "cipd_path": "pigweed/host_tools",'
       '  "dry_run": false,'
       '  "recipe": "target_to_cipd",'
diff --git a/generated/pigweed/for_review_only/buildbucket/ci/pigweed-stm32f429i-subbuild.textproto b/generated/pigweed/for_review_only/buildbucket/ci/pigweed-stm32f429i-subbuild.textproto
index 7c4d794..5bf4f72 100644
--- a/generated/pigweed/for_review_only/buildbucket/ci/pigweed-stm32f429i-subbuild.textproto
+++ b/generated/pigweed/for_review_only/buildbucket/ci/pigweed-stm32f429i-subbuild.textproto
@@ -49,6 +49,14 @@
       '  "$pigweed/environment": {'
       '    "config_file": "pw_env_setup/config.json"'
       '  },'
+      '  "build_options": {'
+      '    "gn_args": [],'
+      '    "ninja_targets": ['
+      '      "stm32f429i_debug",'
+      '      "stm32f429i_size_optimized",'
+      '      "stm32f429i_speed_optimized"'
+      '    ]'
+      '  },'
       '  "dry_run": true,'
       '  "recipe": "build"'
       '}'
diff --git a/generated/pigweed/for_review_only/buildbucket/ci/pigweed-stm32f429i.textproto b/generated/pigweed/for_review_only/buildbucket/ci/pigweed-stm32f429i.textproto
index 76a0055..43fea92 100644
--- a/generated/pigweed/for_review_only/buildbucket/ci/pigweed-stm32f429i.textproto
+++ b/generated/pigweed/for_review_only/buildbucket/ci/pigweed-stm32f429i.textproto
@@ -31,14 +31,6 @@
     }
     properties:
       '{'
-      '  "$pigweed/build": {'
-      '    "gn_args": [],'
-      '    "ninja_targets": ['
-      '      "stm32f429i_debug",'
-      '      "stm32f429i_size_optimized",'
-      '      "stm32f429i_speed_optimized"'
-      '    ]'
-      '  },'
       '  "$pigweed/checkout": {'
       '    "branch": "main",'
       '    "equivalent_remotes": [],'
diff --git a/generated/pigweed/for_review_only/buildbucket/try/pigweed-stm32f429i-subbuild.textproto b/generated/pigweed/for_review_only/buildbucket/try/pigweed-stm32f429i-subbuild.textproto
index 87a1b74..5880551 100644
--- a/generated/pigweed/for_review_only/buildbucket/try/pigweed-stm32f429i-subbuild.textproto
+++ b/generated/pigweed/for_review_only/buildbucket/try/pigweed-stm32f429i-subbuild.textproto
@@ -49,6 +49,14 @@
       '  "$pigweed/environment": {'
       '    "config_file": "pw_env_setup/config.json"'
       '  },'
+      '  "build_options": {'
+      '    "gn_args": [],'
+      '    "ninja_targets": ['
+      '      "stm32f429i_debug",'
+      '      "stm32f429i_size_optimized",'
+      '      "stm32f429i_speed_optimized"'
+      '    ]'
+      '  },'
       '  "dry_run": true,'
       '  "recipe": "build"'
       '}'
diff --git a/generated/pigweed/for_review_only/buildbucket/try/pigweed-stm32f429i.textproto b/generated/pigweed/for_review_only/buildbucket/try/pigweed-stm32f429i.textproto
index 1e637c8..fccb871 100644
--- a/generated/pigweed/for_review_only/buildbucket/try/pigweed-stm32f429i.textproto
+++ b/generated/pigweed/for_review_only/buildbucket/try/pigweed-stm32f429i.textproto
@@ -31,14 +31,6 @@
     }
     properties:
       '{'
-      '  "$pigweed/build": {'
-      '    "gn_args": [],'
-      '    "ninja_targets": ['
-      '      "stm32f429i_debug",'
-      '      "stm32f429i_size_optimized",'
-      '      "stm32f429i_speed_optimized"'
-      '    ]'
-      '  },'
       '  "$pigweed/checkout": {'
       '    "branch": "main",'
       '    "equivalent_remotes": [],'
diff --git a/generated/pigweed/luci/cr-buildbucket.cfg b/generated/pigweed/luci/cr-buildbucket.cfg
index a8fb950..cf0aa05 100644
--- a/generated/pigweed/luci/cr-buildbucket.cfg
+++ b/generated/pigweed/luci/cr-buildbucket.cfg
@@ -48,6 +48,12 @@
         '  "$pigweed/environment": {'
         '    "config_file": "pw_env_setup/config.json"'
         '  },'
+        '  "build_options": {'
+        '    "gn_args": [],'
+        '    "ninja_targets": ['
+        '      "docs"'
+        '    ]'
+        '  },'
         '  "dry_run": false,'
         '  "recipe": "docs_builder"'
         '}'
@@ -454,6 +460,12 @@
         '  "artifacts": ['
         '    "host_tools/*"'
         '  ],'
+        '  "build_options": {'
+        '    "gn_args": [],'
+        '    "ninja_targets": ['
+        '      "host_tools"'
+        '    ]'
+        '  },'
         '  "cipd_path": "pigweed/host_tools",'
         '  "dry_run": false,'
         '  "recipe": "target_to_cipd",'
@@ -532,6 +544,12 @@
         '  "artifacts": ['
         '    "host_tools/*"'
         '  ],'
+        '  "build_options": {'
+        '    "gn_args": [],'
+        '    "ninja_targets": ['
+        '      "host_tools"'
+        '    ]'
+        '  },'
         '  "cipd_path": "pigweed/host_tools",'
         '  "dry_run": false,'
         '  "macos_sdk.version": "11c29",'
@@ -617,6 +635,12 @@
         '  "artifacts": ['
         '    "host_tools/*"'
         '  ],'
+        '  "build_options": {'
+        '    "gn_args": [],'
+        '    "ninja_targets": ['
+        '      "host_tools"'
+        '    ]'
+        '  },'
         '  "cipd_path": "pigweed/host_tools",'
         '  "dry_run": false,'
         '  "recipe": "target_to_cipd",'
@@ -2202,14 +2226,6 @@
       }
       properties:
         '{'
-        '  "$pigweed/build": {'
-        '    "gn_args": [],'
-        '    "ninja_targets": ['
-        '      "stm32f429i_debug",'
-        '      "stm32f429i_size_optimized",'
-        '      "stm32f429i_speed_optimized"'
-        '    ]'
-        '  },'
         '  "$pigweed/checkout": {'
         '    "branch": "main",'
         '    "equivalent_remotes": [],'
@@ -2331,6 +2347,14 @@
         '  "$pigweed/environment": {'
         '    "config_file": "pw_env_setup/config.json"'
         '  },'
+        '  "build_options": {'
+        '    "gn_args": [],'
+        '    "ninja_targets": ['
+        '      "stm32f429i_debug",'
+        '      "stm32f429i_size_optimized",'
+        '      "stm32f429i_speed_optimized"'
+        '    ]'
+        '  },'
         '  "dry_run": true,'
         '  "recipe": "build"'
         '}'
@@ -6598,14 +6622,6 @@
       }
       properties:
         '{'
-        '  "$pigweed/build": {'
-        '    "gn_args": [],'
-        '    "ninja_targets": ['
-        '      "stm32f429i_debug",'
-        '      "stm32f429i_size_optimized",'
-        '      "stm32f429i_speed_optimized"'
-        '    ]'
-        '  },'
         '  "$pigweed/checkout": {'
         '    "branch": "main",'
         '    "equivalent_remotes": [],'
@@ -6727,6 +6743,14 @@
         '  "$pigweed/environment": {'
         '    "config_file": "pw_env_setup/config.json"'
         '  },'
+        '  "build_options": {'
+        '    "gn_args": [],'
+        '    "ninja_targets": ['
+        '      "stm32f429i_debug",'
+        '      "stm32f429i_size_optimized",'
+        '      "stm32f429i_speed_optimized"'
+        '    ]'
+        '  },'
         '  "dry_run": true,'
         '  "recipe": "build"'
         '}'