diff --git a/proto/depot/cloud/v3/machine.proto b/proto/depot/cloud/v3/machine.proto
index a171b8f..194a126 100644
--- a/proto/depot/cloud/v3/machine.proto
+++ b/proto/depot/cloud/v3/machine.proto
@@ -81,6 +81,9 @@ message RegisterMachineResponse {
     optional int32 resolver_concurrency = 15;
     // Enable buildkit debug logging
     optional bool enable_debug_logging = 16;
+    // Enable buildkit context logging.  This can be deprecated in the future
+    // when all customers are using context logging.
+    optional bool enable_context_logging = 17;
   }
 
   // Specifies sending buildkit profiling data to a remote endpoint.
diff --git a/src/gen/ts/depot/cloud/v3/machine_connect.ts b/src/gen/ts/depot/cloud/v3/machine_connect.ts
index 1f45ed8..a4c6298 100644
--- a/src/gen/ts/depot/cloud/v3/machine_connect.ts
+++ b/src/gen/ts/depot/cloud/v3/machine_connect.ts
@@ -1,4 +1,4 @@
-// @generated by protoc-gen-connect-es v0.13.0 with parameter "target=ts,import_extension=none"
+// @generated by protoc-gen-connect-es v0.12.0 with parameter "target=ts,import_extension=none"
 // @generated from file depot/cloud/v3/machine.proto (package depot.cloud.v3, syntax proto3)
 /* eslint-disable */
 // @ts-nocheck
diff --git a/src/gen/ts/depot/cloud/v3/machine_pb.ts b/src/gen/ts/depot/cloud/v3/machine_pb.ts
index 02f0651..dd59ad0 100644
--- a/src/gen/ts/depot/cloud/v3/machine_pb.ts
+++ b/src/gen/ts/depot/cloud/v3/machine_pb.ts
@@ -479,6 +479,14 @@ export class RegisterMachineResponse_BuildKitTask extends Message<RegisterMachin
    */
   enableDebugLogging?: boolean
 
+  /**
+   * Enable buildkit context logging.  This can be deprecated in the future
+   * when all customers are using context logging.
+   *
+   * @generated from field: optional bool enable_context_logging = 17;
+   */
+  enableContextLogging?: boolean
+
   constructor(data?: PartialMessage<RegisterMachineResponse_BuildKitTask>) {
     super()
     proto3.util.initPartial(data, this)
@@ -502,6 +510,7 @@ export class RegisterMachineResponse_BuildKitTask extends Message<RegisterMachin
     {no: 14, name: 'disable_fstrim', kind: 'scalar', T: 8 /* ScalarType.BOOL */, opt: true},
     {no: 15, name: 'resolver_concurrency', kind: 'scalar', T: 5 /* ScalarType.INT32 */, opt: true},
     {no: 16, name: 'enable_debug_logging', kind: 'scalar', T: 8 /* ScalarType.BOOL */, opt: true},
+    {no: 17, name: 'enable_context_logging', kind: 'scalar', T: 8 /* ScalarType.BOOL */, opt: true},
   ])
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): RegisterMachineResponse_BuildKitTask {
diff --git a/src/tasks/buildkit.ts b/src/tasks/buildkit.ts
index 6cd4c1b..adc1340 100644
--- a/src/tasks/buildkit.ts
+++ b/src/tasks/buildkit.ts
@@ -128,6 +128,11 @@ keepBytes = ${cacheSizeBytes}
     env.BUILDKIT_SCHEDULER_DEBUG = '1'
   }
 
+  if (task.enableContextLogging) {
+    console.log('Enabling context logging')
+    env.DEPOT_ENABLE_CONTEXT_LOGGING = '1'
+  }
+
   if (task.resolverConcurrency) {
     console.log(`Setting resolver concurrency to ${task.resolverConcurrency}`)
     env.DEPOT_RESOLVER_CONCURRENCY = task.resolverConcurrency.toString()