diff --git a/pb/agent.pb.go b/pb/agent.pb.go
index 267269d..26aebd1 100644
--- a/pb/agent.pb.go
+++ b/pb/agent.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.36.11
-// 	protoc        v6.33.4
+// 	protoc        v6.32.1
 // source: proto/agent.proto
 
 package pb
@@ -2115,8 +2115,9 @@ func (x *AgentHeartbeat) GetArch() string {
 type AgentError struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	DeviceId      string                 `protobuf:"bytes,1,opt,name=device_id,json=deviceId,proto3" json:"device_id,omitempty"`
-	ErrorMessage  string                 `protobuf:"bytes,2,opt,name=error_message,json=errorMessage,proto3" json:"error_message,omitempty"`
-	Timestamp     int64                  `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
+	JobId         string                 `protobuf:"bytes,2,opt,name=job_id,json=jobId,proto3" json:"job_id,omitempty"`
+	Message       string                 `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"`
+	Timestamp     int64                  `protobuf:"varint,4,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -2158,9 +2159,16 @@ func (x *AgentError) GetDeviceId() string {
 	return ""
 }
 
-func (x *AgentError) GetErrorMessage() string {
+func (x *AgentError) GetJobId() string {
 	if x != nil {
-		return x.ErrorMessage
+		return x.JobId
+	}
+	return ""
+}
+
+func (x *AgentError) GetMessage() string {
+	if x != nil {
+		return x.Message
 	}
 	return ""
 }
@@ -2687,12 +2695,13 @@ const file_proto_agent_proto_rawDesc = "" +
 	"\x0euptime_seconds\x18\x03 \x01(\x04R\ruptimeSeconds\x12\x1d\n" +
 	"\n" +
 	"ip_address\x18\x04 \x01(\tR\tipAddress\x12\x12\n" +
-	"\x04arch\x18\x05 \x01(\tR\x04arch\"l\n" +
+	"\x04arch\x18\x05 \x01(\tR\x04arch\"x\n" +
 	"\n" +
 	"AgentError\x12\x1b\n" +
-	"\tdevice_id\x18\x01 \x01(\tR\bdeviceId\x12#\n" +
-	"\rerror_message\x18\x02 \x01(\tR\ferrorMessage\x12\x1c\n" +
-	"\ttimestamp\x18\x03 \x01(\x03R\ttimestamp\"\xbb\x01\n" +
+	"\tdevice_id\x18\x01 \x01(\tR\bdeviceId\x12\x15\n" +
+	"\x06job_id\x18\x02 \x01(\tR\x05jobId\x12\x18\n" +
+	"\amessage\x18\x03 \x01(\tR\amessage\x12\x1c\n" +
+	"\ttimestamp\x18\x04 \x01(\x03R\ttimestamp\"\xbb\x01\n" +
 	"\x14CredentialTestResult\x12\x17\n" +
 	"\atest_id\x18\x01 \x01(\tR\x06testId\x12\x18\n" +
 	"\asuccess\x18\x02 \x01(\bR\asuccess\x12#\n" +
diff --git a/proto/agent.proto b/proto/agent.proto
index 44099aa..955c482 100644
--- a/proto/agent.proto
+++ b/proto/agent.proto
@@ -233,8 +233,9 @@ message AgentHeartbeat {
 
 message AgentError {
   string device_id = 1;
-  string error_message = 2;
-  int64 timestamp = 3;
+  string job_id = 2;
+  string message = 3;
+  int64 timestamp = 4;
 }
 
 message CredentialTestResult {