diff --git a/protobufs/rpc/agent.proto b/protobufs/rpc/agent.proto
index 2a2e827d..6eeab881 100644
--- a/protobufs/rpc/agent.proto
+++ b/protobufs/rpc/agent.proto
@@ -59,7 +59,7 @@ service AgentInternal {
 }
 
 enum JobTerminateReason {
-  TERINATION_REQUESTED = 0;
+  TERMINATION_REQUESTED = 0;
   AGENT_LEFT_ROOM = 1;
 }
 
diff --git a/rpc/agent.pb.go b/rpc/agent.pb.go
index bea3316d..31e82ecb 100644
--- a/rpc/agent.pb.go
+++ b/rpc/agent.pb.go
@@ -40,19 +40,19 @@ const (
 type JobTerminateReason int32
 
 const (
-	JobTerminateReason_TERINATION_REQUESTED JobTerminateReason = 0
-	JobTerminateReason_AGENT_LEFT_ROOM      JobTerminateReason = 1
+	JobTerminateReason_TERMINATION_REQUESTED JobTerminateReason = 0
+	JobTerminateReason_AGENT_LEFT_ROOM       JobTerminateReason = 1
 )
 
 // Enum value maps for JobTerminateReason.
 var (
 	JobTerminateReason_name = map[int32]string{
-		0: "TERINATION_REQUESTED",
+		0: "TERMINATION_REQUESTED",
 		1: "AGENT_LEFT_ROOM",
 	}
 	JobTerminateReason_value = map[string]int32{
-		"TERINATION_REQUESTED": 0,
-		"AGENT_LEFT_ROOM":      1,
+		"TERMINATION_REQUESTED": 0,
+		"AGENT_LEFT_ROOM":       1,
 	}
 )
 
@@ -293,7 +293,7 @@ func (x *JobTerminateRequest) GetReason() JobTerminateReason {
 	if x != nil {
 		return x.Reason
 	}
-	return JobTerminateReason_TERINATION_REQUESTED
+	return JobTerminateReason_TERMINATION_REQUESTED
 }
 
 type JobTerminateResponse struct {
@@ -377,37 +377,37 @@ var file_rpc_agent_proto_rawDesc = []byte{
 	0x62, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
 	0x73, 0x65, 0x12, 0x27, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x0b, 0x32, 0x11, 0x2e, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x2e, 0x4a, 0x6f, 0x62, 0x53,
-	0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2a, 0x43, 0x0a, 0x12, 0x4a,
+	0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2a, 0x44, 0x0a, 0x12, 0x4a,
 	0x6f, 0x62, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x52, 0x65, 0x61, 0x73, 0x6f,
-	0x6e, 0x12, 0x18, 0x0a, 0x14, 0x54, 0x45, 0x52, 0x49, 0x4e, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f,
-	0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x45, 0x44, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x41,
-	0x47, 0x45, 0x4e, 0x54, 0x5f, 0x4c, 0x45, 0x46, 0x54, 0x5f, 0x52, 0x4f, 0x4f, 0x4d, 0x10, 0x01,
-	0x32, 0xee, 0x02, 0x0a, 0x0d, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x12, 0x4b, 0x0a, 0x0c, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x45, 0x6e, 0x61, 0x62, 0x6c,
-	0x65, 0x64, 0x12, 0x18, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x45, 0x6e,
-	0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x72,
-	0x70, 0x63, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xb2, 0x89, 0x01, 0x02, 0x28, 0x01, 0x12,
-	0x54, 0x0a, 0x0a, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0c, 0x2e,
-	0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x2e, 0x4a, 0x6f, 0x62, 0x1a, 0x17, 0x2e, 0x72, 0x70,
-	0x63, 0x2e, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f, 0xb2, 0x89, 0x01, 0x1b, 0x10, 0x01, 0x1a, 0x15, 0x12, 0x09,
-	0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x08, 0x6a, 0x6f, 0x62, 0x5f, 0x74,
-	0x79, 0x70, 0x65, 0x30, 0x01, 0x12, 0x55, 0x0a, 0x0c, 0x4a, 0x6f, 0x62, 0x54, 0x65, 0x72, 0x6d,
-	0x69, 0x6e, 0x61, 0x74, 0x65, 0x12, 0x18, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4a, 0x6f, 0x62, 0x54,
-	0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x19, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4a, 0x6f, 0x62, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61,
-	0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x10, 0xb2, 0x89, 0x01, 0x0c,
-	0x10, 0x01, 0x1a, 0x08, 0x12, 0x06, 0x6a, 0x6f, 0x62, 0x5f, 0x69, 0x64, 0x12, 0x63, 0x0a, 0x10,
-	0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64,
-	0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79,
-	0x22, 0x1f, 0xb2, 0x89, 0x01, 0x1b, 0x08, 0x01, 0x10, 0x01, 0x1a, 0x13, 0x12, 0x11, 0x68, 0x61,
-	0x6e, 0x64, 0x6c, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x28,
-	0x01, 0x42, 0x21, 0x5a, 0x1f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c,
-	0x2f, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x12, 0x19, 0x0a, 0x15, 0x54, 0x45, 0x52, 0x4d, 0x49, 0x4e, 0x41, 0x54, 0x49, 0x4f, 0x4e,
+	0x5f, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x45, 0x44, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f,
+	0x41, 0x47, 0x45, 0x4e, 0x54, 0x5f, 0x4c, 0x45, 0x46, 0x54, 0x5f, 0x52, 0x4f, 0x4f, 0x4d, 0x10,
+	0x01, 0x32, 0xee, 0x02, 0x0a, 0x0d, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x12, 0x4b, 0x0a, 0x0c, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x45, 0x6e, 0x61, 0x62,
+	0x6c, 0x65, 0x64, 0x12, 0x18, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x45,
+	0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e,
+	0x72, 0x70, 0x63, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xb2, 0x89, 0x01, 0x02, 0x28, 0x01,
+	0x12, 0x54, 0x0a, 0x0a, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0c,
+	0x2e, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x2e, 0x4a, 0x6f, 0x62, 0x1a, 0x17, 0x2e, 0x72,
+	0x70, 0x63, 0x2e, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f, 0xb2, 0x89, 0x01, 0x1b, 0x10, 0x01, 0x1a, 0x15, 0x12,
+	0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x08, 0x6a, 0x6f, 0x62, 0x5f,
+	0x74, 0x79, 0x70, 0x65, 0x30, 0x01, 0x12, 0x55, 0x0a, 0x0c, 0x4a, 0x6f, 0x62, 0x54, 0x65, 0x72,
+	0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x12, 0x18, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4a, 0x6f, 0x62,
+	0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x19, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4a, 0x6f, 0x62, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e,
+	0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x10, 0xb2, 0x89, 0x01,
+	0x0c, 0x10, 0x01, 0x1a, 0x08, 0x12, 0x06, 0x6a, 0x6f, 0x62, 0x5f, 0x69, 0x64, 0x12, 0x63, 0x0a,
+	0x10, 0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x65,
+	0x64, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74,
+	0x79, 0x22, 0x1f, 0xb2, 0x89, 0x01, 0x1b, 0x08, 0x01, 0x10, 0x01, 0x1a, 0x13, 0x12, 0x11, 0x68,
+	0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x28, 0x01, 0x42, 0x21, 0x5a, 0x1f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
+	0x6c, 0x2f, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/rpc/agent.psrpc.go b/rpc/agent.psrpc.go
index b658b3c3..eede534d 100644
--- a/rpc/agent.psrpc.go
+++ b/rpc/agent.psrpc.go
@@ -181,39 +181,40 @@ func (s *agentInternalServer) Kill() {
 }
 
 var psrpcFileDescriptor0 = []byte{
-	// 544 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x5f, 0x6f, 0xd2, 0x50,
-	0x14, 0xf7, 0xc2, 0x46, 0xe0, 0xc0, 0x5c, 0xb9, 0x80, 0xd6, 0x1a, 0xb3, 0xd1, 0x17, 0x89, 0x26,
-	0xad, 0xc1, 0x67, 0xe3, 0xd8, 0xac, 0x06, 0xe2, 0x20, 0x76, 0x9d, 0x26, 0x26, 0xa6, 0x69, 0xcb,
-	0x11, 0x3a, 0x4a, 0x6f, 0xbd, 0xbd, 0x98, 0xec, 0x23, 0xf0, 0x59, 0x7c, 0xe3, 0xb3, 0xf9, 0x01,
-	0x4c, 0xff, 0xac, 0xc2, 0x82, 0x0f, 0x3e, 0xde, 0xdf, 0xf9, 0xe5, 0xe4, 0xf7, 0xe7, 0x1e, 0x38,
-	0xe6, 0x91, 0xa7, 0x3b, 0x33, 0x0c, 0x85, 0x16, 0x71, 0x26, 0x18, 0x2d, 0xf3, 0xc8, 0x53, 0x9e,
-	0xce, 0x18, 0x9b, 0x05, 0xa8, 0xa7, 0x90, 0xbb, 0xfa, 0xae, 0xe3, 0x32, 0x12, 0xb7, 0x19, 0x43,
-	0x39, 0x62, 0x91, 0xf0, 0x59, 0x18, 0xe7, 0xcf, 0x56, 0xe0, 0xff, 0xc4, 0x85, 0x2f, 0xec, 0xad,
-	0x2d, 0x6a, 0x07, 0x5a, 0x17, 0x73, 0xf4, 0x16, 0x46, 0xe8, 0xb8, 0x01, 0x4e, 0x4d, 0xfc, 0xb1,
-	0xc2, 0x58, 0xa8, 0xbf, 0x08, 0xb4, 0x77, 0xf1, 0x38, 0x62, 0x61, 0x8c, 0xb4, 0x0b, 0x0d, 0xce,
-	0xd8, 0xd2, 0xc6, 0x0c, 0x97, 0xc9, 0x29, 0xe9, 0x55, 0xcd, 0x7a, 0x82, 0xe5, 0x54, 0xfa, 0x12,
-	0x9a, 0xd1, 0xca, 0x0d, 0xfc, 0x78, 0x8e, 0xbc, 0xe0, 0x95, 0x52, 0x9e, 0x54, 0x0c, 0xee, 0xc8,
-	0x2a, 0x40, 0xe8, 0x2c, 0x31, 0x8e, 0x1c, 0x0f, 0x63, 0xb9, 0x7c, 0x5a, 0xee, 0xd5, 0xce, 0x4b,
-	0x32, 0x31, 0xb7, 0x50, 0x7a, 0x02, 0xf5, 0x54, 0xb2, 0x9d, 0x62, 0xf2, 0x41, 0x42, 0x32, 0x21,
-	0x85, 0xc6, 0x09, 0xa2, 0xbe, 0x01, 0x3a, 0x62, 0x6e, 0xae, 0xbd, 0x90, 0xfa, 0x1c, 0x0e, 0x63,
-	0xe1, 0x08, 0x4c, 0x35, 0xd6, 0xfb, 0x4d, 0x2d, 0xf7, 0xaf, 0x8d, 0x98, 0x7b, 0x95, 0x0c, 0xcc,
-	0x6c, 0xae, 0x7e, 0x83, 0xd6, 0x88, 0xb9, 0x16, 0xf2, 0xa5, 0x1f, 0x26, 0x70, 0xb6, 0x87, 0x76,
-	0xa0, 0x72, 0xc3, 0x5c, 0xdb, 0xcf, 0x4c, 0xd6, 0xcc, 0xc3, 0x1b, 0xe6, 0x0e, 0xa7, 0x54, 0x87,
-	0x0a, 0x47, 0x27, 0x66, 0x61, 0xea, 0xe9, 0x61, 0xff, 0xb1, 0xc6, 0x23, 0x4f, 0xdb, 0x5d, 0x90,
-	0x8c, 0xcd, 0x9c, 0xa6, 0xbe, 0x85, 0xf6, 0xee, 0xf4, 0x3f, 0xf5, 0xbd, 0xb8, 0x48, 0xed, 0xdd,
-	0x5b, 0x4f, 0x65, 0x68, 0x5b, 0x86, 0x39, 0x1c, 0x0f, 0xac, 0xe1, 0x64, 0x6c, 0x9b, 0xc6, 0xa7,
-	0x6b, 0xe3, 0xca, 0x32, 0xde, 0x49, 0x0f, 0x68, 0x0b, 0x8e, 0x07, 0x1f, 0x8c, 0xb1, 0x65, 0x7f,
-	0x34, 0xde, 0x5b, 0xb6, 0x39, 0x99, 0x5c, 0x4a, 0xa4, 0xff, 0xbb, 0x04, 0x47, 0x83, 0x24, 0xb2,
-	0x61, 0x28, 0x90, 0x87, 0x4e, 0x40, 0x2f, 0xa1, 0xb1, 0x5d, 0x31, 0x95, 0x53, 0x23, 0x7b, 0x7e,
-	0x83, 0xf2, 0x64, 0xcf, 0x24, 0x33, 0xa1, 0x56, 0x37, 0x6b, 0x72, 0x70, 0x56, 0xea, 0x11, 0xfa,
-	0x19, 0xe0, 0x6f, 0x09, 0xb4, 0xb1, 0xed, 0x46, 0x29, 0x32, 0xba, 0xd7, 0x91, 0xda, 0xdd, 0xac,
-	0xc9, 0x33, 0x89, 0x28, 0x1d, 0x5a, 0x2b, 0x0a, 0xa7, 0xd5, 0x24, 0x76, 0x71, 0x1b, 0xe1, 0x19,
-	0x79, 0x45, 0xe8, 0x35, 0x34, 0xb6, 0xdd, 0xe7, 0x32, 0xf7, 0x14, 0x96, 0xcb, 0xdc, 0x97, 0xb5,
-	0x2a, 0x6d, 0xd6, 0xa4, 0x21, 0x11, 0xa5, 0x4a, 0xf3, 0x4e, 0x29, 0x82, 0xf4, 0x85, 0xf1, 0x05,
-	0x72, 0x13, 0x67, 0x7e, 0x2c, 0x90, 0xe3, 0x94, 0x3e, 0xd2, 0xb2, 0x73, 0xd2, 0xee, 0xce, 0x49,
-	0x33, 0x92, 0x73, 0x52, 0xfe, 0x81, 0x67, 0xea, 0xab, 0x44, 0x22, 0x4a, 0x8b, 0x36, 0xe7, 0x4e,
-	0x38, 0x0d, 0x90, 0xdb, 0x85, 0x8f, 0x24, 0x95, 0xf3, 0xee, 0xd7, 0x93, 0x99, 0x2f, 0xe6, 0x2b,
-	0x57, 0xf3, 0xd8, 0x52, 0xcf, 0x33, 0xc9, 0xce, 0xd5, 0x63, 0x81, 0xce, 0x23, 0xcf, 0xad, 0xa4,
-	0xaf, 0xd7, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd6, 0xb5, 0x90, 0x87, 0xe2, 0x03, 0x00, 0x00,
+	// 547 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x5d, 0x8f, 0xd2, 0x4c,
+	0x14, 0x7e, 0x87, 0xfd, 0x08, 0x1c, 0xd8, 0x77, 0xcb, 0xb0, 0x28, 0x5b, 0x63, 0x76, 0xe9, 0x8d,
+	0x44, 0x93, 0xd6, 0xe0, 0xb5, 0x71, 0x59, 0xb7, 0x1a, 0x88, 0x40, 0xec, 0x76, 0x35, 0x31, 0x31,
+	0x4d, 0x5b, 0x8e, 0xd0, 0xa5, 0x74, 0xc6, 0xe9, 0x60, 0xb2, 0x3f, 0x81, 0xdf, 0xe2, 0x1d, 0xbf,
+	0xcd, 0x1f, 0x60, 0xfa, 0xb1, 0x15, 0x36, 0x78, 0xe1, 0xe5, 0x3c, 0xe7, 0xc9, 0xc9, 0xf3, 0x31,
+	0x07, 0x8e, 0x05, 0xf7, 0x0d, 0x77, 0x8a, 0x91, 0xd4, 0xb9, 0x60, 0x92, 0xd1, 0x3d, 0xc1, 0x7d,
+	0xf5, 0xc9, 0x94, 0xb1, 0x69, 0x88, 0x46, 0x0a, 0x79, 0xcb, 0x6f, 0x06, 0x2e, 0xb8, 0xbc, 0xcb,
+	0x18, 0xea, 0x11, 0xe3, 0x32, 0x60, 0x51, 0x9c, 0x3f, 0x1b, 0x61, 0xf0, 0x03, 0xe7, 0x81, 0x74,
+	0x36, 0xb6, 0x68, 0x4d, 0x68, 0xbc, 0x9d, 0xa1, 0x3f, 0x37, 0x23, 0xd7, 0x0b, 0x71, 0x62, 0xe1,
+	0xf7, 0x25, 0xc6, 0x52, 0xfb, 0x49, 0xe0, 0x64, 0x1b, 0x8f, 0x39, 0x8b, 0x62, 0xa4, 0x6d, 0xa8,
+	0x09, 0xc6, 0x16, 0x0e, 0x66, 0x78, 0x8b, 0x9c, 0x93, 0x4e, 0xd9, 0xaa, 0x26, 0x58, 0x4e, 0xa5,
+	0x2f, 0xa0, 0xce, 0x97, 0x5e, 0x18, 0xc4, 0x33, 0x14, 0x05, 0xaf, 0x94, 0xf2, 0x94, 0x62, 0x70,
+	0x4f, 0xd6, 0x00, 0x22, 0x77, 0x81, 0x31, 0x77, 0x7d, 0x8c, 0x5b, 0x7b, 0xe7, 0x7b, 0x9d, 0xca,
+	0x65, 0xa9, 0x45, 0xac, 0x0d, 0x94, 0x9e, 0x41, 0x35, 0x95, 0xec, 0xa4, 0x58, 0x6b, 0x3f, 0x21,
+	0x59, 0x90, 0x42, 0xa3, 0x04, 0xd1, 0x5e, 0x03, 0x1d, 0x30, 0x2f, 0xd7, 0x5e, 0x48, 0x7d, 0x06,
+	0x07, 0xb1, 0x74, 0x25, 0xa6, 0x1a, 0xab, 0xdd, 0xba, 0x9e, 0xfb, 0xd7, 0x07, 0xcc, 0xbb, 0x4e,
+	0x06, 0x56, 0x36, 0xd7, 0xbe, 0x42, 0x63, 0xc0, 0x3c, 0x1b, 0xc5, 0x22, 0x88, 0x12, 0x38, 0xdb,
+	0x43, 0x9b, 0x70, 0x78, 0xcb, 0x3c, 0x27, 0xc8, 0x4c, 0x56, 0xac, 0x83, 0x5b, 0xe6, 0xf5, 0x27,
+	0xd4, 0x80, 0x43, 0x81, 0x6e, 0xcc, 0xa2, 0xd4, 0xd3, 0xff, 0xdd, 0xc7, 0xba, 0xe0, 0xbe, 0xbe,
+	0xbd, 0x20, 0x19, 0x5b, 0x39, 0x4d, 0x7b, 0x03, 0x27, 0xdb, 0xd3, 0x7f, 0xd4, 0xf7, 0xfc, 0x2a,
+	0xb5, 0xf7, 0x60, 0x3d, 0x3d, 0x85, 0xa6, 0x6d, 0x5a, 0xc3, 0xfe, 0xa8, 0x67, 0xf7, 0xc7, 0x23,
+	0xc7, 0x32, 0x3f, 0xde, 0x98, 0xd7, 0xb6, 0x79, 0xa5, 0xfc, 0x47, 0x1b, 0x70, 0xdc, 0x7b, 0x6f,
+	0x8e, 0x6c, 0xe7, 0x83, 0xf9, 0xce, 0x76, 0xac, 0xf1, 0x78, 0xa8, 0x90, 0xee, 0xaf, 0x12, 0x1c,
+	0xf5, 0x92, 0xcc, 0xfa, 0x91, 0x44, 0x11, 0xb9, 0x21, 0x1d, 0x42, 0x6d, 0xb3, 0x63, 0xda, 0x4a,
+	0x9d, 0xec, 0xf8, 0x0e, 0xea, 0xe9, 0x8e, 0x49, 0xe6, 0x42, 0x2b, 0xaf, 0x57, 0x64, 0xff, 0xa2,
+	0xd4, 0x21, 0xf4, 0x13, 0xc0, 0x9f, 0x16, 0x68, 0x6d, 0xd3, 0x8e, 0x5a, 0x84, 0xf4, 0xa0, 0x24,
+	0xad, 0xbd, 0x5e, 0x91, 0xa7, 0x0a, 0x51, 0x9b, 0xb4, 0x52, 0x34, 0x4e, 0xcb, 0x49, 0xee, 0xf2,
+	0x8e, 0xe3, 0x05, 0x79, 0x49, 0xe8, 0x0d, 0xd4, 0x36, 0xed, 0xe7, 0x32, 0x77, 0x34, 0x96, 0xcb,
+	0xdc, 0x15, 0xb6, 0xa6, 0xac, 0x57, 0xa4, 0xa6, 0x10, 0xb5, 0x4c, 0xf3, 0x52, 0x29, 0x82, 0xf2,
+	0x99, 0x89, 0x39, 0x0a, 0x0b, 0xa7, 0x41, 0x2c, 0x51, 0xe0, 0x84, 0x3e, 0xd2, 0xb3, 0x7b, 0xd2,
+	0xef, 0xef, 0x49, 0x37, 0x93, 0x7b, 0x52, 0xff, 0x82, 0x67, 0xea, 0xcb, 0x44, 0x21, 0x6a, 0x83,
+	0xd6, 0x67, 0x6e, 0x34, 0x09, 0x51, 0x38, 0x85, 0x8f, 0x24, 0x95, 0xcb, 0xf6, 0x97, 0xb3, 0x69,
+	0x20, 0x67, 0x4b, 0x4f, 0xf7, 0xd9, 0xc2, 0xc8, 0x33, 0xc9, 0xee, 0xd5, 0x67, 0xa1, 0x21, 0xb8,
+	0xef, 0x1d, 0xa6, 0xaf, 0x57, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x78, 0xf7, 0x34, 0xd6, 0xe3,
+	0x03, 0x00, 0x00,
 }
diff --git a/utils/guid/id.go b/utils/guid/id.go
index 4929face..2ffd852e 100644
--- a/utils/guid/id.go
+++ b/utils/guid/id.go
@@ -155,7 +155,7 @@ func Marshal[T livekit.Guid](id T) livekit.GuidBlock {
 }
 
 func MarshalAppend[T livekit.Guid](b []byte, id T) []byte {
-	b = append(b, make([]byte, 9)...)
+	b = append(b, make([]byte, Size*3/4)...)
 	idb := []byte(id)[len(id)-Size:]
 	for i := 0; i < 3; i++ {
 		j := i * 3