diff --git a/elixir/lib/protobuf/facts_gathered.pb.ex b/elixir/lib/protobuf/facts_gathered.pb.ex
index 06ec8cc..60e70d1 100644
--- a/elixir/lib/protobuf/facts_gathered.pb.ex
+++ b/elixir/lib/protobuf/facts_gathered.pb.ex
@@ -23,9 +23,10 @@ defmodule Trento.Checks.V1.FactsGathered do
   use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
 
   field :execution_id, 1, type: :string, json_name: "executionId"
-  field :agent_id, 2, type: :string, json_name: "agentId"
+  field :group_id, 2, type: :string, json_name: "groupId"
+  field :agent_id, 3, type: :string, json_name: "agentId"
 
-  field :facts_gathered, 3,
+  field :facts_gathered, 4,
     repeated: true,
     type: Trento.Checks.V1.Fact,
     json_name: "factsGathered"
diff --git a/go/pkg/events/facts_gathered.pb.go b/go/pkg/events/facts_gathered.pb.go
index 4054b7c..f045e32 100644
--- a/go/pkg/events/facts_gathered.pb.go
+++ b/go/pkg/events/facts_gathered.pb.go
@@ -178,8 +178,9 @@ type FactsGathered struct {
 	unknownFields protoimpl.UnknownFields
 
 	ExecutionId   string  `protobuf:"bytes,1,opt,name=execution_id,json=executionId,proto3" json:"execution_id,omitempty"`
-	AgentId       string  `protobuf:"bytes,2,opt,name=agent_id,json=agentId,proto3" json:"agent_id,omitempty"`
-	FactsGathered []*Fact `protobuf:"bytes,3,rep,name=facts_gathered,json=factsGathered,proto3" json:"facts_gathered,omitempty"`
+	GroupId       string  `protobuf:"bytes,2,opt,name=group_id,json=groupId,proto3" json:"group_id,omitempty"`
+	AgentId       string  `protobuf:"bytes,3,opt,name=agent_id,json=agentId,proto3" json:"agent_id,omitempty"`
+	FactsGathered []*Fact `protobuf:"bytes,4,rep,name=facts_gathered,json=factsGathered,proto3" json:"facts_gathered,omitempty"`
 }
 
 func (x *FactsGathered) Reset() {
@@ -221,6 +222,13 @@ func (x *FactsGathered) GetExecutionId() string {
 	return ""
 }
 
+func (x *FactsGathered) GetGroupId() string {
+	if x != nil {
+		return x.GroupId
+	}
+	return ""
+}
+
 func (x *FactsGathered) GetAgentId() string {
 	if x != nil {
 		return x.AgentId
@@ -258,17 +266,18 @@ var file_protobuf_facts_gathered_proto_rawDesc = []byte{
 	0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x2e, 0x56, 0x31, 0x2e, 0x46, 0x61, 0x63, 0x74, 0x45,
 	0x72, 0x72, 0x6f, 0x72, 0x48, 0x00, 0x52, 0x0a, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x56, 0x61, 0x6c,
 	0x75, 0x65, 0x42, 0x0c, 0x0a, 0x0a, 0x66, 0x61, 0x63, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x22, 0x8c, 0x01, 0x0a, 0x0d, 0x46, 0x61, 0x63, 0x74, 0x73, 0x47, 0x61, 0x74, 0x68, 0x65, 0x72,
+	0x22, 0xa7, 0x01, 0x0a, 0x0d, 0x46, 0x61, 0x63, 0x74, 0x73, 0x47, 0x61, 0x74, 0x68, 0x65, 0x72,
 	0x65, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
 	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74,
-	0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x69,
-	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x49, 0x64,
-	0x12, 0x3d, 0x0a, 0x0e, 0x66, 0x61, 0x63, 0x74, 0x73, 0x5f, 0x67, 0x61, 0x74, 0x68, 0x65, 0x72,
-	0x65, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x54, 0x72, 0x65, 0x6e, 0x74,
-	0x6f, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x2e, 0x56, 0x31, 0x2e, 0x46, 0x61, 0x63, 0x74,
-	0x52, 0x0d, 0x66, 0x61, 0x63, 0x74, 0x73, 0x47, 0x61, 0x74, 0x68, 0x65, 0x72, 0x65, 0x64, 0x42,
-	0x0a, 0x5a, 0x08, 0x2f, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x69,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64,
+	0x12, 0x19, 0x0a, 0x08, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x07, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x3d, 0x0a, 0x0e, 0x66,
+	0x61, 0x63, 0x74, 0x73, 0x5f, 0x67, 0x61, 0x74, 0x68, 0x65, 0x72, 0x65, 0x64, 0x18, 0x04, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x54, 0x72, 0x65, 0x6e, 0x74, 0x6f, 0x2e, 0x43, 0x68, 0x65,
+	0x63, 0x6b, 0x73, 0x2e, 0x56, 0x31, 0x2e, 0x46, 0x61, 0x63, 0x74, 0x52, 0x0d, 0x66, 0x61, 0x63,
+	0x74, 0x73, 0x47, 0x61, 0x74, 0x68, 0x65, 0x72, 0x65, 0x64, 0x42, 0x0a, 0x5a, 0x08, 0x2f, 0x3b,
+	0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/protobuf/facts_gathered.proto b/protobuf/facts_gathered.proto
index 69a143c..971185c 100644
--- a/protobuf/facts_gathered.proto
+++ b/protobuf/facts_gathered.proto
@@ -22,7 +22,8 @@ message Fact {
 
 message FactsGathered {
   string execution_id = 1;
-  string agent_id = 2;
+  string group_id = 2;
+  string agent_id = 3;
 
-  repeated Fact facts_gathered = 3;
+  repeated Fact facts_gathered = 4;
 }