diff --git a/examples/chef/chef.py b/examples/chef/chef.py
index 55fdd5f5ac28ec..38afb5a16be660 100755
--- a/examples/chef/chef.py
+++ b/examples/chef/chef.py
@@ -370,6 +370,7 @@ def main(argv: Sequence[str]) -> None:
             command = f"./chef.py -cbr --use_zzz -d {device_name} -t {options.build_target}"
             flush_print(f"Building {command}", with_border=True)
             shell.run_cmd(command)
+            # TODO call per-platform bundle function for extra validation
         exit(0)
 
     #
@@ -377,10 +378,6 @@ def main(argv: Sequence[str]) -> None:
     #
 
     if options.build_all:
-        # TODO
-        # Needs to call per-platform bundle function
-        flush_print("Build all disabled")
-        exit(1)
         flush_print("Building all chef examples")
         archive_prefix = "/workspace/artifacts/"
         archive_suffix = ".tar.gz"
@@ -395,7 +392,8 @@ def main(argv: Sequence[str]) -> None:
                 shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}")
                 shell.run_cmd("export GNUARMEMB_TOOLCHAIN_PATH=\"$PW_ARM_CIPD_INSTALL_DIR\"")
                 shell.run_cmd(command)
-                archive_name = f"{label}-chef-{device_name}-wifi-rpc"
+                # TODO Needs to call per-platform bundle function
+                archive_name = f"{label}-{device_name}"
                 archive_full_name = archive_prefix + archive_name + archive_suffix
                 flush_print(f"Adding build output to archive {archive_full_name}")
                 with tarfile.open(archive_full_name, "w:gz") as tar:
diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml
index 37d01efc3e8616..f70c63976217dd 100644
--- a/integrations/cloudbuild/chef.yaml
+++ b/integrations/cloudbuild/chef.yaml
@@ -37,6 +37,6 @@ artifacts:
         paths: ["/workspace/artifacts/*.tar.gz"]
 # Using higher CPU machines generally speeds up builds, except bootstrap is always
 # slow.
-# options:
-#    machineType: "E2_HIGHCPU_32"
-#    diskSizeGb: 200
+options:
+    machineType: "E2_HIGHCPU_32"
+    diskSizeGb: 200