diff --git a/.studio/compliance-service b/.studio/compliance-service
index 5fa153550a4..b52f01126df 100644
--- a/.studio/compliance-service
+++ b/.studio/compliance-service
@@ -92,9 +92,6 @@ document "load_compliance_reports" <<DOC
   Loads compliance report.
 DOC
 function load_compliance_reports() {
-    pushd components/compliance-service/test_data/audit_reports &> /dev/null
-    ./send_to_data_collector.sh https://a2-dev.test "$(get_admin_token)"
-    popd &> /dev/null
     generate_chef_run_example | jq '.entity_uuid = "34cbbb4c-c502-4971-b193-00e987b4678c"' | jq '.node_name = "debian(2)-zeta-linux(f)-apache(p)-failed"' | send_chef_data_raw
     generate_chef_run_failure_example | jq '.entity_uuid = "9b9f4e51-b049-4b10-9555-10578916e149"' | jq '.node_name = "centos-beta"' | send_chef_data_raw
     generate_chef_run_example | jq '.entity_uuid = "9b9f4e51-b049-4b10-9555-10578916e112"' | jq '.node_name = "redhat(2)-alpha-nginx(f)-apache(f)-failed"' | send_chef_data_raw
@@ -105,6 +102,9 @@ function load_compliance_reports() {
     generate_chef_run_failure_example | jq '.entity_uuid = "9b9f4e51-b049-4b10-9555-10578916e666"' | jq '.node_name = "ubuntu(1)-alpha-myprofile(s)-skipped"' | send_chef_data_raw
     generate_chef_run_failure_example | jq '.entity_uuid = "34cbbb55-c502-4971-2222-999999999999"' | jq '.node_name = "osx(1)-omega-pro2(w)-waived"' | send_chef_data_raw
     generate_chef_run_failure_example | jq '.entity_uuid = "34cbbb4c-c502-4971-1111-888888888888"' | jq '.node_name = "osx(2)-omega-pro1(f)-pro2(w)-failed"' | send_chef_data_raw
+    pushd components/compliance-service/test_data/audit_reports &> /dev/null
+    ./send_to_data_collector.sh https://a2-dev.test "$(get_admin_token)"
+    popd &> /dev/null
 }
 
 document "load_scan_jobs" <<DOC
diff --git a/api/interservice/compliance/ingest/events/compliance/compliance.pb.go b/api/interservice/compliance/ingest/events/compliance/compliance.pb.go
index 28fcd42e7cc..ca768479126 100644
--- a/api/interservice/compliance/ingest/events/compliance/compliance.pb.go
+++ b/api/interservice/compliance/ingest/events/compliance/compliance.pb.go
@@ -52,6 +52,7 @@ type Report struct {
 	Tags                 []*common.Kv `protobuf:"bytes,39,rep,name=tags,proto3" json:"tags,omitempty" toml:"tags,omitempty" mapstructure:"tags,omitempty"`
 	AutomateManagerId    string       `protobuf:"bytes,40,opt,name=automate_manager_id,json=automateManagerId,proto3" json:"automate_manager_id,omitempty" toml:"automate_manager_id,omitempty" mapstructure:"automate_manager_id,omitempty"`
 	RunTimeLimit         float32      `protobuf:"fixed32,41,opt,name=run_time_limit,json=runTimeLimit,proto3" json:"run_time_limit,omitempty" toml:"run_time_limit,omitempty" mapstructure:"run_time_limit,omitempty"`
+	AutomateManagerType  string       `protobuf:"bytes,42,opt,name=automate_manager_type,json=automateManagerType,proto3" json:"automate_manager_type,omitempty" toml:"automate_manager_type,omitempty" mapstructure:"automate_manager_type,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-" toml:"-" mapstructure:"-,omitempty"`
 	XXX_unrecognized     []byte       `json:"-" toml:"-" mapstructure:"-,omitempty"`
 	XXX_sizecache        int32        `json:"-" toml:"-" mapstructure:"-,omitempty"`
@@ -271,6 +272,13 @@ func (m *Report) GetRunTimeLimit() float32 {
 	return 0
 }
 
+func (m *Report) GetAutomateManagerType() string {
+	if m != nil {
+		return m.AutomateManagerType
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterType((*Report)(nil), "chef.automate.domain.compliance.ingest.events.compliance.Report")
 }
@@ -280,46 +288,47 @@ func init() {
 }
 
 var fileDescriptor_2d8e0277b12342b3 = []byte{
-	// 651 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4b, 0x6f, 0x13, 0x3d,
-	0x14, 0x55, 0xbe, 0xf6, 0x2b, 0x89, 0x13, 0xa0, 0x71, 0x0b, 0xb8, 0x0f, 0x68, 0xfa, 0x00, 0x42,
-	0x91, 0x32, 0x52, 0xd9, 0xb0, 0x69, 0xc5, 0x43, 0x80, 0x2a, 0x28, 0xa0, 0xa1, 0x2c, 0xe8, 0x26,
-	0x38, 0xf6, 0xcd, 0xc4, 0x25, 0x63, 0x4f, 0x6d, 0x4f, 0xa4, 0xf2, 0xd3, 0xf8, 0x75, 0xc8, 0xd7,
-	0x93, 0x36, 0x6c, 0x78, 0x74, 0x35, 0xf6, 0x39, 0xf7, 0x1e, 0x9f, 0x39, 0xbe, 0x33, 0xe4, 0x15,
-	0x2f, 0x54, 0xa2, 0xb4, 0x07, 0xeb, 0xc0, 0x4e, 0x94, 0x80, 0x44, 0x98, 0xbc, 0x18, 0x2b, 0xae,
-	0x05, 0x24, 0x4a, 0x67, 0xe0, 0x7c, 0x02, 0x13, 0xd0, 0xde, 0xcd, 0x12, 0x97, 0xcb, 0x5e, 0x61,
-	0x8d, 0x37, 0xf4, 0xa9, 0x18, 0xc1, 0xb0, 0xc7, 0x4b, 0x6f, 0x72, 0xee, 0xa1, 0x27, 0x4d, 0xce,
-	0x95, 0xee, 0xcd, 0x94, 0x45, 0xa9, 0x5e, 0x94, 0x9a, 0x21, 0x56, 0xf7, 0xff, 0xde, 0x80, 0xd2,
-	0xae, 0x00, 0x51, 0x3d, 0xe2, 0xc1, 0xab, 0xc9, 0xef, 0xda, 0x85, 0xc9, 0x73, 0xa3, 0xab, 0x47,
-	0x6c, 0xd8, 0xfa, 0x51, 0x27, 0x0b, 0x29, 0x14, 0xc6, 0x7a, 0xca, 0xc8, 0xb5, 0x09, 0x58, 0xa7,
-	0x8c, 0x66, 0xb5, 0x4e, 0xad, 0xdb, 0x48, 0xa7, 0x5b, 0x7a, 0x42, 0xea, 0xc5, 0x98, 0xfb, 0xa1,
-	0xb1, 0x39, 0x5b, 0xec, 0xd4, 0xba, 0xcd, 0xbd, 0x83, 0xde, 0xbf, 0xbd, 0x61, 0x65, 0xf2, 0x63,
-	0xa5, 0x92, 0x5e, 0xe8, 0xd1, 0xaf, 0x84, 0x38, 0xcf, 0xbd, 0x72, 0x5e, 0x09, 0xc7, 0xda, 0xa8,
-	0xfe, 0xec, 0x6a, 0xea, 0x9f, 0x2e, 0x74, 0xd2, 0x19, 0x4d, 0xfa, 0x85, 0xd4, 0x0b, 0x6b, 0x86,
-	0x6a, 0x0c, 0x8e, 0xd1, 0xce, 0x5c, 0xb7, 0xb9, 0xb7, 0x7f, 0x45, 0xf7, 0x51, 0x25, 0xbd, 0x90,
-	0xa3, 0x9b, 0xa4, 0x65, 0xfc, 0x08, 0x6c, 0x5f, 0x8c, 0x40, 0x7c, 0x73, 0x6c, 0xa9, 0x33, 0xd7,
-	0x6d, 0xa4, 0x4d, 0xc4, 0x5e, 0x22, 0x44, 0x37, 0x48, 0xd3, 0x62, 0xbe, 0xfd, 0xb2, 0x54, 0x92,
-	0x2d, 0x63, 0xb2, 0x24, 0x42, 0x9f, 0x4b, 0x25, 0xe9, 0x1a, 0x69, 0x68, 0x23, 0x21, 0xd2, 0xb7,
-	0x90, 0xae, 0x07, 0x00, 0xc9, 0x15, 0x52, 0x3f, 0x35, 0x83, 0xc8, 0xdd, 0x8e, 0x97, 0x72, 0x6a,
-	0x06, 0xbf, 0xf4, 0x69, 0x9e, 0x03, 0xbb, 0x73, 0xd9, 0xf7, 0x9e, 0xe7, 0x40, 0x3b, 0xa4, 0x09,
-	0x7a, 0xa2, 0xac, 0xd1, 0x39, 0x68, 0xcf, 0x18, 0xd2, 0xb3, 0x10, 0x5d, 0x26, 0xff, 0x5b, 0x13,
-	0x22, 0x59, 0x41, 0xcf, 0x71, 0x13, 0x66, 0xc0, 0x82, 0x50, 0x05, 0x38, 0xb6, 0x8a, 0xf8, 0x74,
-	0x1b, 0x9c, 0x80, 0x96, 0x7d, 0xaf, 0x72, 0x60, 0x6b, 0xd1, 0x09, 0x68, 0x79, 0xac, 0x72, 0xa0,
-	0x94, 0xcc, 0xfb, 0xf3, 0x02, 0xd8, 0x3a, 0xc2, 0xb8, 0x0e, 0xee, 0x9c, 0x29, 0xad, 0x80, 0xbe,
-	0x92, 0xec, 0x6e, 0x74, 0x17, 0x81, 0x43, 0x49, 0xb7, 0xc9, 0xf5, 0x8a, 0xb4, 0x90, 0x85, 0x79,
-	0xbb, 0x87, 0x05, 0xad, 0x08, 0xa6, 0x88, 0xd1, 0x5d, 0xd2, 0xae, 0x8a, 0xb8, 0x10, 0xa6, 0xd4,
-	0x3e, 0x28, 0x6d, 0x60, 0xe1, 0xcd, 0x48, 0x3c, 0x8f, 0xf8, 0xa1, 0x0c, 0x21, 0x17, 0x66, 0xac,
-	0xc4, 0x79, 0x4c, 0xa3, 0x13, 0x43, 0x8e, 0x10, 0xe6, 0xb1, 0x49, 0x5a, 0x55, 0x41, 0x66, 0x4d,
-	0x59, 0xb0, 0xcd, 0x18, 0x48, 0xc4, 0xde, 0x04, 0x88, 0x3e, 0x26, 0x6d, 0x63, 0x33, 0xae, 0xd5,
-	0x77, 0xee, 0x95, 0xd1, 0x51, 0x69, 0x0b, 0xeb, 0x16, 0x67, 0x09, 0xd4, 0xdb, 0x20, 0xcd, 0xca,
-	0xdc, 0xf0, 0x4c, 0x6a, 0xb6, 0x1d, 0x0f, 0x8c, 0xd0, 0xeb, 0x33, 0xa9, 0xc3, 0xfb, 0x87, 0x19,
-	0xeb, 0x7b, 0x9e, 0x39, 0xb6, 0x83, 0x51, 0xd6, 0x03, 0x70, 0xcc, 0x33, 0x47, 0xd7, 0x49, 0x43,
-	0x15, 0x5c, 0x4a, 0x0b, 0xce, 0xb1, 0xfb, 0xd8, 0x7b, 0x09, 0x84, 0x38, 0x51, 0xf4, 0x41, 0x8c,
-	0x33, 0xac, 0xe9, 0x01, 0x99, 0x47, 0xa5, 0x87, 0x38, 0xbf, 0xbb, 0x7f, 0x9c, 0xdf, 0xea, 0x1b,
-	0x7f, 0x3b, 0x49, 0xb1, 0x8f, 0xf6, 0xc8, 0xd2, 0xb4, 0xba, 0x9f, 0x73, 0xcd, 0x33, 0xb0, 0x21,
-	0xce, 0x2e, 0x1e, 0xd1, 0x9e, 0x52, 0x47, 0x91, 0x39, 0x94, 0x74, 0x87, 0xdc, 0xb0, 0xa5, 0xc6,
-	0xdb, 0xee, 0x8f, 0x55, 0xae, 0x3c, 0x7b, 0xd4, 0xa9, 0x75, 0xff, 0x4b, 0x5b, 0xb6, 0xd4, 0xe1,
-	0xce, 0xdf, 0x05, 0xec, 0xc5, 0x87, 0x93, 0xa3, 0x4c, 0xf9, 0x51, 0x39, 0x08, 0xe7, 0x25, 0xc1,
-	0x53, 0x32, 0x95, 0x4a, 0xae, 0xf2, 0x23, 0x1d, 0x2c, 0xe0, 0x4f, 0xe9, 0xc9, 0xcf, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0xfd, 0xe5, 0x1b, 0xd2, 0x87, 0x05, 0x00, 0x00,
+	// 667 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xcb, 0x6e, 0x13, 0x31,
+	0x14, 0x55, 0x68, 0x29, 0x89, 0x13, 0xa0, 0x71, 0x5b, 0x70, 0x1f, 0xd0, 0xf4, 0x01, 0x84, 0x22,
+	0x65, 0xa4, 0xb2, 0x61, 0xd3, 0x8a, 0x87, 0x00, 0x55, 0x50, 0x40, 0x43, 0x59, 0xd0, 0xcd, 0xe0,
+	0x8c, 0x6f, 0x26, 0x2e, 0x19, 0x7b, 0x6a, 0x7b, 0x22, 0x95, 0x8f, 0xe6, 0x1b, 0x90, 0xaf, 0x27,
+	0x6d, 0x00, 0x89, 0x47, 0x57, 0xb1, 0xcf, 0xb9, 0xf7, 0xf8, 0xf8, 0xf8, 0x66, 0xc8, 0x4b, 0x5e,
+	0xc8, 0x48, 0x2a, 0x07, 0xc6, 0x82, 0x19, 0xcb, 0x14, 0xa2, 0x54, 0xe7, 0xc5, 0x48, 0x72, 0x95,
+	0x42, 0x24, 0x55, 0x06, 0xd6, 0x45, 0x30, 0x06, 0xe5, 0xec, 0x34, 0x71, 0xb1, 0xec, 0x15, 0x46,
+	0x3b, 0x4d, 0x9f, 0xa4, 0x43, 0x18, 0xf4, 0x78, 0xe9, 0x74, 0xce, 0x1d, 0xf4, 0x84, 0xce, 0xb9,
+	0x54, 0xbd, 0xa9, 0xb2, 0x20, 0xd5, 0x0b, 0x52, 0x53, 0xc4, 0xca, 0xde, 0xbf, 0x1b, 0x90, 0xca,
+	0x16, 0x90, 0x56, 0x3f, 0xe1, 0xe0, 0x95, 0xe8, 0x4f, 0xed, 0xa9, 0xce, 0x73, 0xad, 0xaa, 0x9f,
+	0xd0, 0xb0, 0xf9, 0xbd, 0x4e, 0xe6, 0x62, 0x28, 0xb4, 0x71, 0x94, 0x91, 0x6b, 0x63, 0x30, 0x56,
+	0x6a, 0xc5, 0x6a, 0x9d, 0x5a, 0xb7, 0x11, 0x4f, 0xb6, 0xf4, 0x98, 0xd4, 0x8b, 0x11, 0x77, 0x03,
+	0x6d, 0x72, 0x36, 0xdf, 0xa9, 0x75, 0x9b, 0xbb, 0xfb, 0xbd, 0xff, 0xbb, 0x61, 0x65, 0xf2, 0x43,
+	0xa5, 0x12, 0x9f, 0xeb, 0xd1, 0x2f, 0x84, 0x58, 0xc7, 0x9d, 0xb4, 0x4e, 0xa6, 0x96, 0xb5, 0x51,
+	0xfd, 0xe9, 0xe5, 0xd4, 0x3f, 0x9e, 0xeb, 0xc4, 0x53, 0x9a, 0xf4, 0x33, 0xa9, 0x17, 0x46, 0x0f,
+	0xe4, 0x08, 0x2c, 0xa3, 0x9d, 0x99, 0x6e, 0x73, 0x77, 0xef, 0x92, 0xee, 0x83, 0x4a, 0x7c, 0x2e,
+	0x47, 0x37, 0x48, 0x4b, 0xbb, 0x21, 0x98, 0x24, 0x1d, 0x42, 0xfa, 0xd5, 0xb2, 0x85, 0xce, 0x4c,
+	0xb7, 0x11, 0x37, 0x11, 0x7b, 0x81, 0x10, 0x5d, 0x27, 0x4d, 0x83, 0xf9, 0x26, 0x65, 0x29, 0x05,
+	0x5b, 0xc4, 0x64, 0x49, 0x80, 0x3e, 0x95, 0x52, 0xd0, 0x55, 0xd2, 0x50, 0x5a, 0x40, 0xa0, 0x97,
+	0x90, 0xae, 0x7b, 0x00, 0xc9, 0x65, 0x52, 0x3f, 0xd1, 0xfd, 0xc0, 0xdd, 0x0a, 0x8f, 0x72, 0xa2,
+	0xfb, 0x3f, 0xf5, 0x29, 0x9e, 0x03, 0xbb, 0x7d, 0xd1, 0xf7, 0x8e, 0xe7, 0x40, 0x3b, 0xa4, 0x09,
+	0x6a, 0x2c, 0x8d, 0x56, 0x39, 0x28, 0xc7, 0x18, 0xd2, 0xd3, 0x10, 0x5d, 0x24, 0x57, 0x8d, 0xf6,
+	0x91, 0x2c, 0xa3, 0xe7, 0xb0, 0xf1, 0x33, 0x60, 0x20, 0x95, 0x05, 0x58, 0xb6, 0x82, 0xf8, 0x64,
+	0xeb, 0x9d, 0x80, 0x12, 0x89, 0x93, 0x39, 0xb0, 0xd5, 0xe0, 0x04, 0x94, 0x38, 0x92, 0x39, 0x50,
+	0x4a, 0x66, 0xdd, 0x59, 0x01, 0x6c, 0x0d, 0x61, 0x5c, 0x7b, 0x77, 0x56, 0x97, 0x26, 0x85, 0x44,
+	0x0a, 0x76, 0x27, 0xb8, 0x0b, 0xc0, 0x81, 0xa0, 0x5b, 0xe4, 0x7a, 0x45, 0x1a, 0xc8, 0xfc, 0xbc,
+	0xdd, 0xc5, 0x82, 0x56, 0x00, 0x63, 0xc4, 0xe8, 0x0e, 0x69, 0x57, 0x45, 0x3c, 0x4d, 0x75, 0xa9,
+	0x9c, 0x57, 0x5a, 0xc7, 0xc2, 0x9b, 0x81, 0x78, 0x16, 0xf0, 0x03, 0xe1, 0x43, 0x2e, 0xf4, 0x48,
+	0xa6, 0x67, 0x21, 0x8d, 0x4e, 0x08, 0x39, 0x40, 0x98, 0xc7, 0x06, 0x69, 0x55, 0x05, 0x99, 0xd1,
+	0x65, 0xc1, 0x36, 0x42, 0x20, 0x01, 0x7b, 0xed, 0x21, 0xfa, 0x88, 0xb4, 0xb5, 0xc9, 0xb8, 0x92,
+	0xdf, 0xb8, 0x93, 0x5a, 0x05, 0xa5, 0x4d, 0xac, 0x9b, 0x9f, 0x26, 0x50, 0x6f, 0x9d, 0x34, 0x2b,
+	0x73, 0x83, 0x53, 0xa1, 0xd8, 0x56, 0x38, 0x30, 0x40, 0xaf, 0x4e, 0x85, 0xf2, 0xf7, 0xf7, 0x33,
+	0x96, 0x38, 0x9e, 0x59, 0xb6, 0x8d, 0x51, 0xd6, 0x3d, 0x70, 0xc4, 0x33, 0x4b, 0xd7, 0x48, 0x43,
+	0x16, 0x5c, 0x08, 0x03, 0xd6, 0xb2, 0x7b, 0xd8, 0x7b, 0x01, 0xf8, 0x38, 0x51, 0xf4, 0x7e, 0x88,
+	0xd3, 0xaf, 0xe9, 0x3e, 0x99, 0x45, 0xa5, 0x07, 0x38, 0xbf, 0x3b, 0x7f, 0x9d, 0xdf, 0xea, 0x3f,
+	0xfe, 0x66, 0x1c, 0x63, 0x1f, 0xed, 0x91, 0x85, 0x49, 0x75, 0x92, 0x73, 0xc5, 0x33, 0x30, 0x3e,
+	0xce, 0x2e, 0x1e, 0xd1, 0x9e, 0x50, 0x87, 0x81, 0x39, 0x10, 0x74, 0x9b, 0xdc, 0x30, 0xa5, 0xc2,
+	0xd7, 0x4e, 0x46, 0x32, 0x97, 0x8e, 0x3d, 0xec, 0xd4, 0xba, 0x57, 0xe2, 0x96, 0x29, 0x95, 0x7f,
+	0xf3, 0xb7, 0x1e, 0xa3, 0xbb, 0x64, 0xe9, 0x37, 0x55, 0x9c, 0x84, 0x1d, 0xd4, 0x5d, 0xf8, 0x45,
+	0xf7, 0xe8, 0xac, 0x80, 0xe7, 0xef, 0x8f, 0x0f, 0x33, 0xe9, 0x86, 0x65, 0xdf, 0x7b, 0x8c, 0xfc,
+	0x3d, 0xa2, 0x49, 0x59, 0x74, 0x99, 0x8f, 0x6f, 0x7f, 0x0e, 0x3f, 0x64, 0x8f, 0x7f, 0x04, 0x00,
+	0x00, 0xff, 0xff, 0x4f, 0xba, 0x2a, 0x3a, 0xbb, 0x05, 0x00, 0x00,
 }
diff --git a/api/interservice/compliance/ingest/events/compliance/compliance.proto b/api/interservice/compliance/ingest/events/compliance/compliance.proto
index 27a4691caa4..25bb6641180 100644
--- a/api/interservice/compliance/ingest/events/compliance/compliance.proto
+++ b/api/interservice/compliance/ingest/events/compliance/compliance.proto
@@ -37,4 +37,5 @@ message Report {
 	repeated chef.automate.domain.compliance.common.Kv tags = 39;
 	string automate_manager_id = 40;
 	float run_time_limit = 41;
+	string automate_manager_type = 42;
 }
diff --git a/api/interservice/compliance/ingest/ingest/compliance.swagger.json b/api/interservice/compliance/ingest/ingest/compliance.swagger.json
index 019a69cd83c..bd36cf99296 100644
--- a/api/interservice/compliance/ingest/ingest/compliance.swagger.json
+++ b/api/interservice/compliance/ingest/ingest/compliance.swagger.json
@@ -156,6 +156,9 @@
         "run_time_limit": {
           "type": "number",
           "format": "float"
+        },
+        "automate_manager_type": {
+          "type": "string"
         }
       }
     },
diff --git a/api/interservice/nodemanager/manager/manager.pb.go b/api/interservice/nodemanager/manager/manager.pb.go
index f8efe6eb3e7..6f6883ecde9 100644
--- a/api/interservice/nodemanager/manager/manager.pb.go
+++ b/api/interservice/nodemanager/manager/manager.pb.go
@@ -359,6 +359,7 @@ type NodeMetadata struct {
 	ProjectsData         []*nodes.ProjectsData  `protobuf:"bytes,13,rep,name=projects_data,json=projectsData,proto3" json:"projects_data,omitempty" toml:"projects_data,omitempty" mapstructure:"projects_data,omitempty"`
 	Projects             []string               `protobuf:"bytes,14,rep,name=projects,proto3" json:"projects,omitempty" toml:"projects,omitempty" mapstructure:"projects,omitempty"`
 	ManagerId            string                 `protobuf:"bytes,15,opt,name=manager_id,json=managerId,proto3" json:"manager_id,omitempty" toml:"manager_id,omitempty" mapstructure:"manager_id,omitempty"`
+	ManagerType          string                 `protobuf:"bytes,16,opt,name=manager_type,json=managerType,proto3" json:"manager_type,omitempty" toml:"manager_type,omitempty" mapstructure:"manager_type,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}               `json:"-" toml:"-" mapstructure:"-,omitempty"`
 	XXX_unrecognized     []byte                 `json:"-" toml:"-" mapstructure:"-,omitempty"`
 	XXX_sizecache        int32                  `json:"-" toml:"-" mapstructure:"-,omitempty"`
@@ -494,6 +495,13 @@ func (m *NodeMetadata) GetManagerId() string {
 	return ""
 }
 
+func (m *NodeMetadata) GetManagerType() string {
+	if m != nil {
+		return m.ManagerType
+	}
+	return ""
+}
+
 type Fields struct {
 	Fields               []string `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty" toml:"fields,omitempty" mapstructure:"fields,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-" toml:"-" mapstructure:"-,omitempty"`
@@ -1120,104 +1128,105 @@ func init() {
 }
 
 var fileDescriptor_3761d93caecf5ce0 = []byte{
-	// 1537 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x4f, 0x73, 0x13, 0x47,
-	0x16, 0x97, 0xac, 0xff, 0x4f, 0xb6, 0x2c, 0x1a, 0xdb, 0x8c, 0xc5, 0xb2, 0xab, 0x1a, 0x6a, 0xb7,
-	0xbc, 0x14, 0x8c, 0xb6, 0x0c, 0xcb, 0x16, 0xb5, 0x05, 0x5b, 0xc6, 0x36, 0x94, 0x0a, 0x6c, 0xcc,
-	0x48, 0xec, 0x2e, 0xe4, 0xa0, 0x6a, 0xcf, 0xb4, 0xc7, 0x43, 0x34, 0x7f, 0x98, 0xee, 0x21, 0xe5,
-	0x54, 0x6e, 0xa9, 0xca, 0x21, 0x39, 0x25, 0x9f, 0x23, 0x5f, 0x22, 0x97, 0x1c, 0xf3, 0x99, 0x52,
-	0xaf, 0xbb, 0x25, 0x0d, 0xb6, 0x09, 0x1a, 0xe3, 0x8b, 0xdd, 0xef, 0xf5, 0xeb, 0x5f, 0xbf, 0xff,
-	0xfd, 0x46, 0xb0, 0x49, 0x63, 0xbf, 0xe7, 0x87, 0x82, 0x25, 0x9c, 0x25, 0xef, 0x7d, 0x87, 0xf5,
-	0xc2, 0xc8, 0x65, 0x01, 0x0d, 0xa9, 0xc7, 0x92, 0xde, 0xa9, 0xff, 0x56, 0x9c, 0x44, 0x22, 0x22,
-	0x1b, 0xce, 0x31, 0x3b, 0xb2, 0x68, 0x2a, 0xa2, 0x80, 0x0a, 0x66, 0xb9, 0x51, 0x40, 0xfd, 0xd0,
-	0xca, 0x9c, 0xb3, 0xf4, 0xff, 0xce, 0x9f, 0xbc, 0x28, 0xf2, 0xc6, 0xac, 0x87, 0x97, 0xd0, 0x30,
-	0x8c, 0x04, 0x15, 0x7e, 0x14, 0x72, 0x85, 0xd3, 0xb9, 0xae, 0x77, 0x25, 0x75, 0x98, 0x1e, 0xf5,
-	0x58, 0x10, 0x8b, 0x13, 0xbd, 0xf9, 0x97, 0xd3, 0x9b, 0xc2, 0x0f, 0x18, 0x17, 0x34, 0x88, 0xb5,
-	0x40, 0xef, 0x8c, 0xe6, 0x4e, 0x14, 0xc4, 0x63, 0x9f, 0x86, 0x6a, 0x19, 0x44, 0xa1, 0xfe, 0xa7,
-	0x0f, 0x58, 0x7f, 0x68, 0x2a, 0xae, 0xb9, 0xfa, 0xab, 0xe4, 0xcd, 0x15, 0x58, 0xe8, 0xbb, 0xa4,
-	0x05, 0x0b, 0xbe, 0x6b, 0x14, 0xbb, 0xc5, 0x8d, 0x86, 0xbd, 0xe0, 0xbb, 0xe6, 0x2e, 0x94, 0xfa,
-	0x2e, 0x27, 0x8f, 0xa0, 0xe4, 0xbb, 0xdc, 0x28, 0x76, 0x4b, 0x1b, 0xcd, 0xcd, 0xdb, 0xd6, 0xbc,
-	0x1e, 0xb1, 0xfa, 0xae, 0x8d, 0x07, 0xcd, 0x75, 0xb8, 0xb6, 0x7d, 0x4c, 0x43, 0x8f, 0xed, 0x47,
-	0x2e, 0x1b, 0x08, 0x2a, 0x98, 0xcd, 0x78, 0x1c, 0x85, 0x9c, 0x99, 0xab, 0x70, 0xf5, 0x20, 0x89,
-	0x1c, 0xc6, 0x39, 0xee, 0x4d, 0xd9, 0x3f, 0x17, 0xa1, 0x31, 0x15, 0x3e, 0xad, 0x16, 0x79, 0x01,
-	0x15, 0x8e, 0x1b, 0xc6, 0x42, 0xb7, 0xb8, 0xd1, 0xda, 0x7c, 0x30, 0xbf, 0x46, 0x53, 0x4c, 0x4b,
-	0xa9, 0xa1, 0x70, 0xcc, 0x47, 0x50, 0x51, 0x37, 0x35, 0xa1, 0x66, 0xbf, 0xda, 0xdf, 0xef, 0xef,
-	0x3f, 0x6d, 0x17, 0x90, 0x18, 0x0c, 0x5f, 0x1c, 0x1c, 0xec, 0xee, 0xb4, 0x8b, 0xa4, 0x05, 0x30,
-	0xdc, 0xb5, 0xf7, 0xfa, 0xfb, 0x5b, 0xc3, 0xdd, 0x9d, 0xf6, 0x02, 0x6e, 0xee, 0xf5, 0x07, 0x03,
-	0x94, 0x2c, 0x99, 0xdf, 0x2f, 0x40, 0xe5, 0x65, 0xca, 0x92, 0x13, 0xb2, 0x07, 0x70, 0xe4, 0x8f,
-	0x05, 0x4b, 0x46, 0x01, 0x8d, 0x8d, 0x75, 0xe9, 0x31, 0xeb, 0x7c, 0xfd, 0x66, 0x11, 0xb4, 0x74,
-	0xe8, 0x9e, 0xc8, 0x93, 0x76, 0x43, 0x21, 0xec, 0xd1, 0x18, 0x2d, 0x8d, 0x12, 0x97, 0x25, 0xc6,
-	0x6a, 0x5e, 0x4b, 0xa5, 0x3a, 0xd6, 0x0b, 0x3c, 0x3c, 0x3c, 0x89, 0x99, 0xad, 0x70, 0x08, 0x81,
-	0x32, 0x8f, 0x12, 0x61, 0xac, 0x49, 0x67, 0xca, 0x35, 0xf2, 0x62, 0xea, 0x31, 0xe3, 0x5a, 0xb7,
-	0xb8, 0x51, 0xb1, 0xe5, 0x9a, 0xac, 0x43, 0x3d, 0x66, 0xc9, 0x48, 0xf2, 0x0d, 0xc9, 0xaf, 0xc5,
-	0x2c, 0x39, 0xa0, 0x1e, 0x33, 0xff, 0x0c, 0x8d, 0x29, 0x2c, 0xa9, 0x41, 0x69, 0x6b, 0xb0, 0xdd,
-	0x2e, 0x90, 0x3a, 0x94, 0x77, 0x76, 0x07, 0xdb, 0xed, 0xa2, 0xf9, 0x5b, 0x05, 0x16, 0xd1, 0xcf,
-	0x7b, 0x4c, 0x50, 0x97, 0x0a, 0x8a, 0xf8, 0x69, 0x3a, 0x0d, 0xa0, 0x5c, 0x23, 0x2f, 0xa4, 0x81,
-	0x8a, 0x60, 0xc3, 0x96, 0x6b, 0x72, 0x13, 0x96, 0xe2, 0x31, 0x15, 0x47, 0x51, 0x12, 0x8c, 0xe4,
-	0x66, 0x49, 0x6e, 0x2e, 0x4e, 0x98, 0xfb, 0x28, 0xf4, 0x77, 0x68, 0x4f, 0x85, 0x12, 0x36, 0x66,
-	0x94, 0x33, 0xa3, 0x2c, 0xe5, 0x96, 0x27, 0x7c, 0x5b, 0xb1, 0xd1, 0x86, 0xb7, 0xd1, 0xe1, 0x48,
-	0xde, 0x5d, 0x91, 0x22, 0xb5, 0xb7, 0xd1, 0xe1, 0x2b, 0xbc, 0xfe, 0x21, 0x2c, 0x8e, 0x29, 0x17,
-	0x23, 0x27, 0x0a, 0x05, 0x75, 0x84, 0x51, 0xed, 0x16, 0x37, 0x9a, 0x9b, 0x1d, 0x4b, 0xd5, 0xa1,
-	0x35, 0xa9, 0x43, 0x6b, 0x38, 0xa9, 0x43, 0xbb, 0x89, 0xf2, 0xdb, 0x4a, 0x9c, 0x5c, 0x87, 0x06,
-	0x8f, 0xd2, 0xc4, 0x61, 0x23, 0xdf, 0x35, 0x6a, 0x12, 0xba, 0xae, 0x18, 0x7d, 0x17, 0xcd, 0xd0,
-	0x9b, 0x09, 0xf3, 0xfc, 0x28, 0x34, 0xea, 0xca, 0x0c, 0xc5, 0xb4, 0x25, 0x8f, 0xdc, 0x82, 0x2b,
-	0x5a, 0x88, 0x3a, 0x4e, 0x94, 0x86, 0x02, 0x91, 0x1a, 0xca, 0x0e, 0xb5, 0xb1, 0xa5, 0xf8, 0x7d,
-	0x97, 0x3c, 0x82, 0xb2, 0xa0, 0x1e, 0x37, 0x40, 0x66, 0xd3, 0xad, 0x79, 0xb3, 0xe9, 0xd9, 0x7b,
-	0x5b, 0x9e, 0x23, 0x36, 0xd4, 0x93, 0x34, 0x1c, 0x61, 0x2c, 0x8c, 0xa6, 0x34, 0xf4, 0x5f, 0x9f,
-	0xce, 0x23, 0xd5, 0x1c, 0x9e, 0xcf, 0x8c, 0xde, 0xa1, 0x82, 0xda, 0xb5, 0x24, 0x0d, 0x71, 0x41,
-	0x86, 0xd0, 0xe0, 0x0e, 0xd5, 0xa0, 0x8b, 0x9f, 0x07, 0x5a, 0x47, 0x24, 0x89, 0xfa, 0x1a, 0x96,
-	0xe2, 0x24, 0x7a, 0xcb, 0x1c, 0xc1, 0x15, 0xf2, 0x92, 0x34, 0xf9, 0xde, 0xbc, 0xc8, 0x07, 0xfa,
-	0xb0, 0x84, 0x5d, 0x8c, 0x33, 0x14, 0xe9, 0x40, 0x7d, 0x42, 0x1b, 0xad, 0x6e, 0x09, 0x23, 0x36,
-	0xa1, 0xc9, 0x0d, 0x00, 0x8d, 0x83, 0x51, 0x58, 0x96, 0x51, 0x68, 0x68, 0x4e, 0xdf, 0x35, 0xbb,
-	0x50, 0x7d, 0xe2, 0xb3, 0xb1, 0xcb, 0xc9, 0x1a, 0x54, 0x8f, 0xe4, 0x4a, 0xf6, 0xc2, 0x86, 0xad,
-	0x29, 0xf3, 0xc7, 0x22, 0x80, 0x14, 0x51, 0x4d, 0x60, 0x17, 0x2a, 0xef, 0x70, 0x61, 0xac, 0x48,
-	0xc7, 0xf4, 0x72, 0x56, 0xad, 0xad, 0x4e, 0x93, 0x15, 0xa8, 0x48, 0x7c, 0x59, 0xfc, 0x0d, 0x5b,
-	0x11, 0xe4, 0x6f, 0xb0, 0x8c, 0x27, 0x47, 0x19, 0x8d, 0x55, 0x31, 0x2f, 0x21, 0x7b, 0x6f, 0xaa,
-	0xf5, 0x5d, 0xa8, 0x60, 0x15, 0x72, 0x84, 0x91, 0xde, 0xd1, 0x3a, 0x2b, 0x02, 0xb9, 0x22, 0x12,
-	0x74, 0x2c, 0x75, 0xac, 0xd8, 0x8a, 0x30, 0xbf, 0x56, 0x6d, 0xf7, 0x52, 0xcd, 0x38, 0x47, 0xe1,
-	0xd5, 0xf3, 0x14, 0xee, 0x41, 0x73, 0x3b, 0x61, 0x2e, 0x0b, 0x85, 0x4f, 0xc7, 0x9c, 0x74, 0xa1,
-	0xe9, 0xcc, 0x48, 0xa9, 0x43, 0xc3, 0xce, 0xb2, 0xcc, 0x5f, 0x4b, 0xd0, 0xdc, 0x9f, 0x41, 0x9c,
-	0x79, 0x26, 0xce, 0xeb, 0x31, 0x04, 0xca, 0xe2, 0x24, 0x9e, 0xb4, 0x16, 0xb9, 0xc6, 0x82, 0x9d,
-	0xc1, 0xa2, 0x7a, 0xea, 0xae, 0xc5, 0x19, 0xb3, 0xef, 0x92, 0x10, 0x56, 0xfc, 0x90, 0x0b, 0x2c,
-	0xb0, 0x51, 0x56, 0xaf, 0x55, 0x99, 0xa1, 0xff, 0x9e, 0xdf, 0x37, 0x19, 0x1b, 0x1f, 0x9f, 0x0c,
-	0xa9, 0xc7, 0xed, 0xab, 0x13, 0xe0, 0xac, 0xf9, 0x6b, 0x50, 0xc5, 0xb7, 0x29, 0xe5, 0x3a, 0xba,
-	0x9a, 0xc2, 0x5c, 0xcd, 0x74, 0x0c, 0x43, 0xe5, 0x2a, 0x9d, 0xf6, 0x8a, 0x07, 0x00, 0x2e, 0x15,
-	0x6c, 0x44, 0x5d, 0x97, 0xb9, 0xc6, 0xfa, 0x27, 0xdb, 0x5a, 0x03, 0xa5, 0xb7, 0x50, 0x98, 0x0c,
-	0x60, 0x39, 0xe3, 0x06, 0x59, 0x7e, 0x9d, 0xdc, 0x1d, 0xa7, 0x35, 0x83, 0x90, 0x65, 0x77, 0x13,
-	0x96, 0x26, 0xea, 0xd2, 0xb1, 0x4f, 0xb9, 0x71, 0x5d, 0xf9, 0x56, 0x33, 0xb7, 0x90, 0x67, 0xc6,
-	0x70, 0xe5, 0x8c, 0x57, 0xc8, 0x35, 0xa8, 0x09, 0xea, 0x8d, 0xbe, 0x64, 0x27, 0x3a, 0x1e, 0x55,
-	0x41, 0xbd, 0x67, 0xec, 0x04, 0x9b, 0x2f, 0x6e, 0xbc, 0xa7, 0xe3, 0x94, 0xe9, 0x4c, 0xaa, 0x0b,
-	0xea, 0xfd, 0x17, 0x69, 0xf2, 0x57, 0x68, 0x7d, 0x10, 0x4b, 0x74, 0x1f, 0x66, 0xfd, 0x52, 0x36,
-	0x98, 0xdc, 0xfc, 0x4a, 0x3f, 0x51, 0x2a, 0x26, 0x9c, 0xbc, 0x84, 0xba, 0x8e, 0xcf, 0x64, 0xcc,
-	0xf9, 0x67, 0xbe, 0xa1, 0x42, 0x23, 0xd9, 0x53, 0x98, 0x8f, 0x14, 0xd8, 0x17, 0xb0, 0xa8, 0x45,
-	0x55, 0x71, 0x3e, 0xcb, 0x16, 0x67, 0xae, 0x5b, 0x33, 0x30, 0xba, 0xa6, 0xcd, 0x5f, 0x16, 0xa0,
-	0x99, 0x61, 0x9f, 0x57, 0x10, 0xc7, 0x11, 0x17, 0x93, 0x82, 0xc0, 0x35, 0x7a, 0x33, 0x4e, 0x0f,
-	0xc7, 0xbe, 0x33, 0xf2, 0x63, 0x5d, 0x15, 0x75, 0xc5, 0xe8, 0xc7, 0xd3, 0x97, 0xa7, 0x7c, 0xc1,
-	0x97, 0x07, 0x9b, 0xae, 0x7e, 0x94, 0xf5, 0x0b, 0x3c, 0xa5, 0x31, 0xc1, 0xf5, 0xfb, 0x58, 0x55,
-	0xe1, 0x55, 0xd4, 0xb4, 0x6a, 0x6b, 0x99, 0xaa, 0x6d, 0x43, 0x89, 0xf3, 0x40, 0x3f, 0xa4, 0xb8,
-	0x9c, 0xce, 0x14, 0x8d, 0xcc, 0x4c, 0x71, 0x07, 0x48, 0x40, 0x9d, 0x63, 0x3f, 0xc4, 0x67, 0x19,
-	0x63, 0x7d, 0xe4, 0xb3, 0xc4, 0x00, 0x29, 0x71, 0x45, 0xef, 0xf4, 0xa7, 0x1b, 0x18, 0x20, 0x2f,
-	0x89, 0xd2, 0x58, 0xbe, 0x89, 0x0d, 0x5b, 0x11, 0x9b, 0x3f, 0xb5, 0x80, 0x64, 0x02, 0x3a, 0x50,
-	0xd3, 0x33, 0x89, 0xa1, 0xba, 0x9d, 0x30, 0x1c, 0x11, 0x2f, 0x96, 0x18, 0x9d, 0x3b, 0x79, 0xc6,
-	0x66, 0x6e, 0x16, 0x48, 0x00, 0x65, 0x9b, 0x51, 0x97, 0xe4, 0x9a, 0xb7, 0x3b, 0x17, 0xd3, 0xce,
-	0x2c, 0x90, 0xd7, 0x50, 0x7d, 0x15, 0xbb, 0x9f, 0x61, 0xe0, 0xda, 0x99, 0x2e, 0xb3, 0x8b, 0x5f,
-	0x38, 0x66, 0x81, 0x1c, 0x40, 0x75, 0x87, 0x8d, 0x99, 0x60, 0x39, 0x6d, 0xf9, 0x38, 0x62, 0x0c,
-	0xcb, 0x0a, 0xf1, 0x7f, 0xbe, 0x38, 0x56, 0x85, 0x94, 0x0f, 0x3a, 0x77, 0x34, 0x5c, 0xe8, 0x7c,
-	0x78, 0xa3, 0xfc, 0x5e, 0x18, 0x88, 0x28, 0x8e, 0x99, 0x7b, 0x69, 0x76, 0x79, 0x70, 0xe3, 0x9c,
-	0x5b, 0x86, 0x2c, 0x09, 0xfc, 0x90, 0x8a, 0x4b, 0xbc, 0xe8, 0x1d, 0x94, 0x9f, 0xfb, 0x5c, 0x90,
-	0xbc, 0x6f, 0x7a, 0xe7, 0xfe, 0x85, 0x92, 0x03, 0x3d, 0xf8, 0x06, 0x6a, 0xdb, 0x51, 0x18, 0x32,
-	0x47, 0x5c, 0x7e, 0x86, 0xfd, 0x1f, 0x5a, 0x1a, 0x7b, 0x32, 0x0b, 0x5c, 0x96, 0xa3, 0xbe, 0x81,
-	0xf6, 0x80, 0xd1, 0xc4, 0x91, 0xd1, 0xd0, 0x53, 0xe0, 0xbd, 0xf9, 0xb1, 0x67, 0x43, 0x61, 0xe7,
-	0x1f, 0x39, 0x4f, 0xa1, 0xcf, 0x52, 0x68, 0xce, 0x6e, 0xe7, 0xe4, 0x6e, 0x3e, 0xbf, 0xa9, 0x7b,
-	0x7b, 0xf9, 0x0e, 0xe1, 0xb5, 0xdf, 0x15, 0xa1, 0x99, 0xf9, 0x2a, 0x27, 0x79, 0x83, 0xae, 0x3f,
-	0xfc, 0x3a, 0x0f, 0xe7, 0x3f, 0x77, 0xde, 0x8f, 0x00, 0x05, 0xf2, 0x43, 0x11, 0x96, 0x4f, 0xfd,
-	0x72, 0x90, 0xd7, 0x09, 0xf2, 0x50, 0x67, 0x2b, 0xc7, 0x7c, 0xf6, 0x91, 0x5f, 0x2a, 0x0a, 0x24,
-	0x01, 0xf2, 0x94, 0x09, 0xdc, 0xc1, 0xf2, 0x1c, 0x30, 0x27, 0x61, 0x22, 0x6f, 0xe3, 0xb9, 0x3d,
-	0xef, 0xa7, 0x0c, 0x5e, 0x63, 0x16, 0xc8, 0xb7, 0x45, 0x20, 0x2a, 0x05, 0x3e, 0x18, 0x1b, 0x2e,
-	0x94, 0x09, 0xf7, 0x2f, 0x34, 0x5c, 0x70, 0xb3, 0xf0, 0xf8, 0x3f, 0x6f, 0x1e, 0x7a, 0xbe, 0x38,
-	0x4e, 0x0f, 0xf1, 0x85, 0xef, 0x21, 0x4a, 0x6f, 0x82, 0xd2, 0x9b, 0xe7, 0x37, 0xb5, 0xc3, 0xaa,
-	0x2c, 0xac, 0xbb, 0xbf, 0x07, 0x00, 0x00, 0xff, 0xff, 0x0e, 0x3d, 0x5b, 0x8f, 0x82, 0x13, 0x00,
-	0x00,
+	// 1554 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xdd, 0x72, 0x13, 0x47,
+	0x16, 0x96, 0xac, 0xff, 0x23, 0x59, 0x16, 0x8d, 0x6d, 0xc6, 0x62, 0xd9, 0xd5, 0x0e, 0xb5, 0x5b,
+	0x5e, 0x0a, 0xa4, 0x2d, 0x43, 0x48, 0x51, 0x29, 0x48, 0x19, 0xdb, 0x50, 0x2a, 0xb0, 0x31, 0x23,
+	0x91, 0x04, 0x72, 0xa1, 0x6a, 0xcf, 0xb4, 0xc7, 0x43, 0x34, 0x3f, 0x4c, 0xf7, 0x90, 0x72, 0x2a,
+	0x77, 0xa9, 0xca, 0x45, 0x72, 0x95, 0x3c, 0x47, 0x5e, 0x22, 0x37, 0x79, 0x9f, 0xbc, 0x41, 0xea,
+	0x74, 0xb7, 0xa4, 0xc1, 0x36, 0x41, 0x63, 0x7c, 0x63, 0xf7, 0xf9, 0xe9, 0xaf, 0xcf, 0x4f, 0x9f,
+	0xd3, 0x67, 0x04, 0x1b, 0x34, 0xf2, 0x7a, 0x5e, 0x20, 0x58, 0xcc, 0x59, 0xfc, 0xd6, 0xb3, 0x59,
+	0x2f, 0x08, 0x1d, 0xe6, 0xd3, 0x80, 0xba, 0x2c, 0xee, 0x9d, 0xf8, 0xdf, 0x8d, 0xe2, 0x50, 0x84,
+	0x64, 0xdd, 0x3e, 0x62, 0x87, 0x5d, 0x9a, 0x88, 0xd0, 0xa7, 0x82, 0x75, 0x9d, 0xd0, 0xa7, 0x5e,
+	0xd0, 0x4d, 0xed, 0xeb, 0xea, 0xff, 0xed, 0x7f, 0xb8, 0x61, 0xe8, 0x8e, 0x59, 0x0f, 0x0f, 0xa1,
+	0x41, 0x10, 0x0a, 0x2a, 0xbc, 0x30, 0xe0, 0x0a, 0xa7, 0x7d, 0x55, 0x4b, 0x25, 0x75, 0x90, 0x1c,
+	0xf6, 0x98, 0x1f, 0x89, 0x63, 0x2d, 0xfc, 0xd7, 0x49, 0xa1, 0xf0, 0x7c, 0xc6, 0x05, 0xf5, 0x23,
+	0xad, 0xd0, 0x3b, 0x65, 0xb9, 0x1d, 0xfa, 0xd1, 0xd8, 0xa3, 0x81, 0x5a, 0xfa, 0x61, 0xa0, 0xff,
+	0xe9, 0x0d, 0xdd, 0xbf, 0x75, 0x15, 0xd7, 0x5c, 0xfd, 0x55, 0xfa, 0xe6, 0x32, 0x2c, 0xf4, 0x1d,
+	0xd2, 0x84, 0x05, 0xcf, 0x31, 0xf2, 0x9d, 0xfc, 0x7a, 0xcd, 0x5a, 0xf0, 0x1c, 0x73, 0x07, 0x0a,
+	0x7d, 0x87, 0x93, 0x07, 0x50, 0xf0, 0x1c, 0x6e, 0xe4, 0x3b, 0x85, 0xf5, 0xfa, 0xc6, 0xcd, 0xee,
+	0xbc, 0x11, 0xe9, 0xf6, 0x1d, 0x0b, 0x37, 0x9a, 0x6b, 0x70, 0x65, 0xeb, 0x88, 0x06, 0x2e, 0xdb,
+	0x0b, 0x1d, 0x36, 0x10, 0x54, 0x30, 0x8b, 0xf1, 0x28, 0x0c, 0x38, 0x33, 0x57, 0xe0, 0xf2, 0x7e,
+	0x1c, 0xda, 0x8c, 0x73, 0x94, 0x4d, 0xd9, 0xbf, 0xe5, 0xa1, 0x36, 0x55, 0x3e, 0x69, 0x16, 0x79,
+	0x06, 0x25, 0x8e, 0x02, 0x63, 0xa1, 0x93, 0x5f, 0x6f, 0x6e, 0xdc, 0x9b, 0xdf, 0xa2, 0x29, 0x66,
+	0x57, 0x99, 0xa1, 0x70, 0xcc, 0x07, 0x50, 0x52, 0x27, 0xd5, 0xa1, 0x62, 0xbd, 0xd8, 0xdb, 0xeb,
+	0xef, 0x3d, 0x6e, 0xe5, 0x90, 0x18, 0x0c, 0x9f, 0xed, 0xef, 0xef, 0x6c, 0xb7, 0xf2, 0xa4, 0x09,
+	0x30, 0xdc, 0xb1, 0x76, 0xfb, 0x7b, 0x9b, 0xc3, 0x9d, 0xed, 0xd6, 0x02, 0x0a, 0x77, 0xfb, 0x83,
+	0x01, 0x6a, 0x16, 0xcc, 0x9f, 0x16, 0xa0, 0xf4, 0x3c, 0x61, 0xf1, 0x31, 0xd9, 0x05, 0x38, 0xf4,
+	0xc6, 0x82, 0xc5, 0x23, 0x9f, 0x46, 0xc6, 0x9a, 0x8c, 0x58, 0xf7, 0x6c, 0xfb, 0x66, 0x19, 0xec,
+	0xea, 0xd4, 0x3d, 0x92, 0x3b, 0xad, 0x9a, 0x42, 0xd8, 0xa5, 0x11, 0x7a, 0x1a, 0xc6, 0x0e, 0x8b,
+	0x8d, 0x95, 0xac, 0x9e, 0x4a, 0x73, 0xba, 0xcf, 0x70, 0xf3, 0xf0, 0x38, 0x62, 0x96, 0xc2, 0x21,
+	0x04, 0x8a, 0x3c, 0x8c, 0x85, 0xb1, 0x2a, 0x83, 0x29, 0xd7, 0xc8, 0x8b, 0xa8, 0xcb, 0x8c, 0x2b,
+	0x9d, 0xfc, 0x7a, 0xc9, 0x92, 0x6b, 0xb2, 0x06, 0xd5, 0x88, 0xc5, 0x23, 0xc9, 0x37, 0x24, 0xbf,
+	0x12, 0xb1, 0x78, 0x9f, 0xba, 0xcc, 0xfc, 0x27, 0xd4, 0xa6, 0xb0, 0xa4, 0x02, 0x85, 0xcd, 0xc1,
+	0x56, 0x2b, 0x47, 0xaa, 0x50, 0xdc, 0xde, 0x19, 0x6c, 0xb5, 0xf2, 0xe6, 0x9f, 0x25, 0x68, 0x60,
+	0x9c, 0x77, 0x99, 0xa0, 0x0e, 0x15, 0x14, 0xf1, 0x93, 0x64, 0x9a, 0x40, 0xb9, 0x46, 0x5e, 0x40,
+	0x7d, 0x95, 0xc1, 0x9a, 0x25, 0xd7, 0xe4, 0x3a, 0x2c, 0x46, 0x63, 0x2a, 0x0e, 0xc3, 0xd8, 0x1f,
+	0x49, 0x61, 0x41, 0x0a, 0x1b, 0x13, 0xe6, 0x1e, 0x2a, 0xfd, 0x0f, 0x5a, 0x53, 0xa5, 0x98, 0x8d,
+	0x19, 0xe5, 0xcc, 0x28, 0x4a, 0xbd, 0xa5, 0x09, 0xdf, 0x52, 0x6c, 0xf4, 0xe1, 0x75, 0x78, 0x30,
+	0x92, 0x67, 0x97, 0xa4, 0x4a, 0xe5, 0x75, 0x78, 0xf0, 0x02, 0x8f, 0xbf, 0x0f, 0x8d, 0x31, 0xe5,
+	0x62, 0x64, 0x87, 0x81, 0xa0, 0xb6, 0x30, 0xca, 0x9d, 0xfc, 0x7a, 0x7d, 0xa3, 0xdd, 0x55, 0x75,
+	0xd8, 0x9d, 0xd4, 0x61, 0x77, 0x38, 0xa9, 0x43, 0xab, 0x8e, 0xfa, 0x5b, 0x4a, 0x9d, 0x5c, 0x85,
+	0x1a, 0x0f, 0x93, 0xd8, 0x66, 0x23, 0xcf, 0x31, 0x2a, 0x12, 0xba, 0xaa, 0x18, 0x7d, 0x07, 0xdd,
+	0xd0, 0xc2, 0x98, 0xb9, 0x5e, 0x18, 0x18, 0x55, 0xe5, 0x86, 0x62, 0x5a, 0x92, 0x47, 0x6e, 0xc0,
+	0x25, 0xad, 0x44, 0x6d, 0x3b, 0x4c, 0x02, 0x81, 0x48, 0x35, 0xe5, 0x87, 0x12, 0x6c, 0x2a, 0x7e,
+	0xdf, 0x21, 0x0f, 0xa0, 0x28, 0xa8, 0xcb, 0x0d, 0x90, 0xb7, 0xe9, 0xc6, 0xbc, 0xb7, 0xe9, 0xc9,
+	0x5b, 0x4b, 0xee, 0x23, 0x16, 0x54, 0xe3, 0x24, 0x18, 0x61, 0x2e, 0x8c, 0xba, 0x74, 0xf4, 0xd3,
+	0x0f, 0xdf, 0x23, 0xd5, 0x1c, 0x9e, 0xce, 0x9c, 0xde, 0xa6, 0x82, 0x5a, 0x95, 0x38, 0x09, 0x70,
+	0x41, 0x86, 0x50, 0xe3, 0x36, 0xd5, 0xa0, 0x8d, 0x8f, 0x03, 0xad, 0x22, 0x92, 0x44, 0x7d, 0x09,
+	0x8b, 0x51, 0x1c, 0xbe, 0x66, 0xb6, 0xe0, 0x0a, 0x79, 0x51, 0xba, 0x7c, 0x67, 0x5e, 0xe4, 0x7d,
+	0xbd, 0x59, 0xc2, 0x36, 0xa2, 0x14, 0x45, 0xda, 0x50, 0x9d, 0xd0, 0x46, 0xb3, 0x53, 0xc0, 0x8c,
+	0x4d, 0x68, 0x72, 0x0d, 0x40, 0xe3, 0x60, 0x16, 0x96, 0x64, 0x16, 0x6a, 0x9a, 0xd3, 0x77, 0xc8,
+	0xbf, 0xa1, 0x31, 0x11, 0x8b, 0xe3, 0x88, 0x19, 0x2d, 0xa9, 0x50, 0xd7, 0x3c, 0x2c, 0x03, 0xb3,
+	0x03, 0xe5, 0x47, 0x1e, 0x1b, 0x3b, 0x9c, 0xac, 0x42, 0xf9, 0x50, 0xae, 0x64, 0xbb, 0xac, 0x59,
+	0x9a, 0x32, 0x7f, 0xc9, 0x03, 0x48, 0x15, 0xd5, 0x27, 0x76, 0xa0, 0xf4, 0x06, 0x17, 0xc6, 0xb2,
+	0x8c, 0x5d, 0x2f, 0x63, 0x61, 0x5b, 0x6a, 0x37, 0x59, 0x86, 0x92, 0xc4, 0x97, 0xfd, 0xa1, 0x66,
+	0x29, 0x82, 0xfc, 0x17, 0x96, 0x70, 0xe7, 0x28, 0xe5, 0x94, 0xaa, 0xf7, 0x45, 0x64, 0xef, 0x4e,
+	0x1c, 0x33, 0x6f, 0x43, 0x09, 0x0b, 0x95, 0x23, 0x8c, 0x0c, 0xa0, 0xb6, 0x59, 0x11, 0xc8, 0x15,
+	0xa1, 0xa0, 0x63, 0x69, 0x63, 0xc9, 0x52, 0x84, 0xf9, 0x9d, 0xea, 0xcc, 0x17, 0xea, 0xc6, 0x19,
+	0x06, 0xaf, 0x9c, 0x65, 0x70, 0x0f, 0xea, 0x5b, 0x31, 0x73, 0x58, 0x20, 0x3c, 0x3a, 0xe6, 0xa4,
+	0x03, 0x75, 0x7b, 0x46, 0x4a, 0x1b, 0x6a, 0x56, 0x9a, 0x65, 0xfe, 0x51, 0x80, 0xfa, 0xde, 0x0c,
+	0xe2, 0xd4, 0x4b, 0x72, 0x56, 0x1b, 0x22, 0x50, 0x94, 0x69, 0x56, 0xdd, 0x47, 0xae, 0xb1, 0xa6,
+	0x67, 0xb0, 0x68, 0x9e, 0x3a, 0xab, 0x31, 0x63, 0xf6, 0x1d, 0x12, 0xc0, 0xb2, 0x17, 0x70, 0x81,
+	0x35, 0x38, 0x4a, 0xdb, 0xb5, 0x22, 0x2f, 0xf1, 0x67, 0xf3, 0xc7, 0x26, 0xe5, 0xe3, 0xc3, 0xe3,
+	0x21, 0x75, 0xb9, 0x75, 0x79, 0x02, 0x9c, 0x76, 0x7f, 0x15, 0xca, 0xf8, 0x7c, 0x25, 0x5c, 0x67,
+	0x57, 0x53, 0x78, 0x9d, 0x53, 0x4d, 0xc5, 0x50, 0xd7, 0x99, 0x4e, 0xdb, 0xc9, 0x3d, 0x00, 0x87,
+	0x0a, 0x36, 0xa2, 0x8e, 0xc3, 0x1c, 0x63, 0xed, 0x83, 0x9d, 0xaf, 0x86, 0xda, 0x9b, 0xa8, 0x4c,
+	0x06, 0xb0, 0x94, 0x0a, 0x83, 0xac, 0xd0, 0x76, 0xe6, 0xa6, 0xd4, 0x9c, 0x41, 0xc8, 0xca, 0xbc,
+	0x0e, 0x8b, 0x13, 0x73, 0xe9, 0xd8, 0xa3, 0xdc, 0xb8, 0xaa, 0x62, 0xab, 0x99, 0x9b, 0xc8, 0x33,
+	0x23, 0xb8, 0x74, 0x2a, 0x2a, 0xe4, 0x0a, 0x54, 0x04, 0x75, 0x47, 0xdf, 0xb0, 0x63, 0x9d, 0x8f,
+	0xb2, 0xa0, 0xee, 0x13, 0x76, 0x8c, 0xfd, 0x19, 0x05, 0x6f, 0xe9, 0x38, 0x61, 0xfa, 0x26, 0x55,
+	0x05, 0x75, 0xbf, 0x40, 0x9a, 0xfc, 0x07, 0x9a, 0xef, 0xe4, 0x12, 0xc3, 0x87, 0xb7, 0x7e, 0x31,
+	0x9d, 0x4c, 0x6e, 0x7e, 0xab, 0x5f, 0x31, 0x95, 0x13, 0x4e, 0x9e, 0x43, 0x55, 0xe7, 0x67, 0x32,
+	0x09, 0x7d, 0x92, 0x6d, 0xee, 0xd0, 0x48, 0xd6, 0x14, 0xe6, 0x3d, 0x05, 0xf6, 0x35, 0x34, 0xb4,
+	0xaa, 0x2a, 0xce, 0x27, 0xe9, 0xe2, 0xcc, 0x74, 0x6a, 0x0a, 0x46, 0xd7, 0xb4, 0xf9, 0xfb, 0x02,
+	0xd4, 0x53, 0xec, 0xb3, 0x0a, 0xe2, 0x28, 0xe4, 0x62, 0x52, 0x10, 0xb8, 0xc6, 0x68, 0x46, 0xc9,
+	0xc1, 0xd8, 0xb3, 0x47, 0x5e, 0xa4, 0xab, 0xa2, 0xaa, 0x18, 0xfd, 0x68, 0xfa, 0x38, 0x15, 0xcf,
+	0xf9, 0x38, 0x61, 0x5f, 0xd6, 0xef, 0xb6, 0x7e, 0xa4, 0xa7, 0x34, 0x5e, 0x70, 0xfd, 0x84, 0x96,
+	0x55, 0x7a, 0x15, 0x35, 0xad, 0xda, 0x4a, 0xaa, 0x6a, 0x5b, 0x50, 0xe0, 0xdc, 0xd7, 0x6f, 0x2d,
+	0x2e, 0xa7, 0x63, 0x47, 0x2d, 0x35, 0x76, 0xdc, 0x02, 0xe2, 0x53, 0xfb, 0xc8, 0x0b, 0xf0, 0xe5,
+	0xc6, 0x5c, 0x1f, 0x7a, 0x2c, 0x36, 0x40, 0x6a, 0x5c, 0xd2, 0x92, 0xfe, 0x54, 0x80, 0x09, 0x72,
+	0xe3, 0x30, 0x89, 0xe4, 0xb3, 0x59, 0xb3, 0x14, 0xb1, 0xf1, 0x6b, 0x13, 0x48, 0x2a, 0xa1, 0x03,
+	0x35, 0x60, 0x93, 0x08, 0xca, 0x5b, 0x31, 0xc3, 0x29, 0xf2, 0x7c, 0x17, 0xa3, 0x7d, 0x2b, 0xcb,
+	0x64, 0xcd, 0xcd, 0x1c, 0xf1, 0xa1, 0x68, 0x31, 0xea, 0x90, 0x4c, 0x23, 0x79, 0xfb, 0x7c, 0xd6,
+	0x99, 0x39, 0xf2, 0x12, 0xca, 0x2f, 0x22, 0xe7, 0x23, 0x1c, 0x5c, 0x3d, 0xd5, 0x65, 0x76, 0xf0,
+	0x23, 0xc8, 0xcc, 0x91, 0x7d, 0x28, 0x6f, 0xb3, 0x31, 0x13, 0x2c, 0xa3, 0x2f, 0xef, 0x47, 0x8c,
+	0x60, 0x49, 0x21, 0x7e, 0xe9, 0x89, 0x23, 0x55, 0x48, 0xd9, 0xa0, 0x33, 0x67, 0xc3, 0x81, 0xf6,
+	0xbb, 0x27, 0xca, 0x4f, 0x8a, 0x81, 0x08, 0xa3, 0x88, 0x39, 0x17, 0xe6, 0x97, 0x0b, 0xd7, 0xce,
+	0x38, 0x65, 0xc8, 0x62, 0xdf, 0x0b, 0xa8, 0xb8, 0xc0, 0x83, 0xde, 0x40, 0xf1, 0xa9, 0xc7, 0x05,
+	0xc9, 0xfa, 0xa6, 0xb7, 0xef, 0x9e, 0xeb, 0x72, 0x60, 0x04, 0x5f, 0x41, 0x65, 0x2b, 0x0c, 0x02,
+	0x66, 0x8b, 0x8b, 0xbf, 0x61, 0x5f, 0x41, 0x53, 0x63, 0x4f, 0x66, 0x81, 0x8b, 0x0a, 0xd4, 0xf7,
+	0xd0, 0x1a, 0x30, 0x1a, 0xdb, 0x32, 0x1b, 0x7a, 0x0a, 0xbc, 0x33, 0x3f, 0xf6, 0x6c, 0x28, 0x6c,
+	0xff, 0x3f, 0xe3, 0x2e, 0x8c, 0x59, 0x02, 0xf5, 0xd9, 0xe9, 0x9c, 0xdc, 0xce, 0x16, 0x37, 0x75,
+	0x6e, 0x2f, 0xdb, 0x26, 0x3c, 0xf6, 0xc7, 0x3c, 0xd4, 0x53, 0x1f, 0xee, 0x24, 0x6b, 0xd2, 0xf5,
+	0xb7, 0x61, 0xfb, 0xfe, 0xfc, 0xfb, 0xce, 0xfa, 0x9d, 0x20, 0x47, 0x7e, 0xce, 0xc3, 0xd2, 0x89,
+	0x1f, 0x17, 0xb2, 0x06, 0x41, 0x6e, 0x6a, 0x6f, 0x66, 0x98, 0xcf, 0xde, 0xf3, 0x63, 0x46, 0x8e,
+	0xc4, 0x40, 0x1e, 0x33, 0x81, 0x12, 0x2c, 0xcf, 0x01, 0xb3, 0x63, 0x26, 0xb2, 0x36, 0x9e, 0x9b,
+	0xf3, 0x7e, 0xed, 0xe0, 0x31, 0x66, 0x8e, 0xfc, 0x90, 0x07, 0xa2, 0xae, 0xc0, 0x3b, 0x63, 0xc3,
+	0xb9, 0x6e, 0xc2, 0xdd, 0x73, 0x0d, 0x17, 0xdc, 0xcc, 0x3d, 0xfc, 0xfc, 0xd5, 0x7d, 0xd7, 0x13,
+	0x47, 0xc9, 0x01, 0xbe, 0xf0, 0x3d, 0x44, 0xe9, 0x4d, 0x50, 0x7a, 0xf3, 0xfc, 0xec, 0x76, 0x50,
+	0x96, 0x85, 0x75, 0xfb, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe8, 0x02, 0x05, 0xd2, 0xa5, 0x13,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/api/interservice/nodemanager/manager/manager.proto b/api/interservice/nodemanager/manager/manager.proto
index 76fb8d5d594..6510c4accfc 100644
--- a/api/interservice/nodemanager/manager/manager.proto
+++ b/api/interservice/nodemanager/manager/manager.proto
@@ -80,6 +80,7 @@ message NodeMetadata {
 	repeated chef.automate.domain.nodemanager.nodes.ProjectsData projects_data = 13;
 	repeated string projects = 14;
 	string manager_id = 15;
+	string manager_type = 16;
 }
 
 message Fields {
diff --git a/components/automate-ui/src/app/entities/nodes/nodes.reducer.ts b/components/automate-ui/src/app/entities/nodes/nodes.reducer.ts
index c7031f950a1..aec523e568f 100644
--- a/components/automate-ui/src/app/entities/nodes/nodes.reducer.ts
+++ b/components/automate-ui/src/app/entities/nodes/nodes.reducer.ts
@@ -38,7 +38,7 @@ export const NodesEntityInitialState: NodesEntityState = nodesEntityAdapter.getI
     total: 0,
     per_page: 100,
     page: 1,
-    sort: 'name',
+    sort: 'last_contact',
     order: 'DESC',
     filters: []
   },
diff --git a/components/automate-ui/src/app/pages/+compliance/+scanner/state/scanner.effects.ts b/components/automate-ui/src/app/pages/+compliance/+scanner/state/scanner.effects.ts
index d830e0eb5b8..6111540d605 100644
--- a/components/automate-ui/src/app/pages/+compliance/+scanner/state/scanner.effects.ts
+++ b/components/automate-ui/src/app/pages/+compliance/+scanner/state/scanner.effects.ts
@@ -45,7 +45,7 @@ export class ScannerEffects {
       const nodesStatusFilter = { key: 'status', values: ['reachable', 'unreachable', 'unknown'] };
       // ensures that we only collect nodes that belong to a manager
       // (Automate (manually managed) nodes + nodes from cloud integrations)
-      const nodesManagersFilter = { key: 'manager_type', values: [''], exclude: true };
+      const nodesManagersFilter = { key: 'manager_type', values: ['automate', 'aws-ec2', 'aws-api', 'azure-vm', 'azure-api', 'gcp-api'], exclude: false };
       const defaultNodesParams = {
         filters: [
           nodesStatusFilter,
diff --git a/components/compliance-service/ingest/pipeline/publisher/node_manager_publisher.go b/components/compliance-service/ingest/pipeline/publisher/node_manager_publisher.go
index b666251b3d2..9cd67999fc0 100644
--- a/components/compliance-service/ingest/pipeline/publisher/node_manager_publisher.go
+++ b/components/compliance-service/ingest/pipeline/publisher/node_manager_publisher.go
@@ -90,6 +90,10 @@ func gatherInfoForNode(in message.Compliance) (*manager.NodeMetadata, error) {
 		tags = append(tags, &common.Kv{Key: "environment", Value: in.Report.GetEnvironment()})
 	}
 
+	mgrType := in.Report.GetAutomateManagerType()
+	if in.Report.GetSourceFqdn() != "" {
+		mgrType = "chef"
+	}
 	return &manager.NodeMetadata{
 		Uuid:            in.Report.GetNodeUuid(),
 		Name:            in.Report.GetNodeName(),
@@ -108,7 +112,8 @@ func gatherInfoForNode(in message.Compliance) (*manager.NodeMetadata, error) {
 			EndTime: endTimeTimestamp,
 			Status:  status,
 		},
-		ManagerId: in.Report.GetAutomateManagerId(),
+		ManagerId:   in.Report.GetAutomateManagerId(),
+		ManagerType: mgrType,
 	}, nil
 }
 
diff --git a/components/compliance-service/ingest/pipeline/publisher/node_manager_publisher_test.go b/components/compliance-service/ingest/pipeline/publisher/node_manager_publisher_test.go
index 7735a284caf..71fbb249274 100644
--- a/components/compliance-service/ingest/pipeline/publisher/node_manager_publisher_test.go
+++ b/components/compliance-service/ingest/pipeline/publisher/node_manager_publisher_test.go
@@ -78,6 +78,7 @@ func TestGatherInfoForNode(t *testing.T) {
 			{Key: "chef-tag", Value: "database"},
 			{Key: "environment", Value: "test-env"},
 		},
+		ManagerType: "chef",
 	}, nodeMetadata)
 }
 
@@ -128,6 +129,7 @@ func TestGatherInfoForNodeCollectsProjectsDataIfScanJob(t *testing.T) {
 		Tags: []*common.Kv{
 			{Key: "environment", Value: "test-env"},
 		},
+		ManagerType: "",
 	}, nodeMetadata)
 }
 
diff --git a/components/compliance-service/inspec-agent/resolver/resolver.go b/components/compliance-service/inspec-agent/resolver/resolver.go
index fde60d283d6..c19b149f0c4 100644
--- a/components/compliance-service/inspec-agent/resolver/resolver.go
+++ b/components/compliance-service/inspec-agent/resolver/resolver.go
@@ -107,6 +107,7 @@ type nodeInfo struct {
 	SSM               bool   // true means we should treat this as a ssm job (remote scan job)
 	MachineIdentifier string // special identifier used when querying azure api, the resource group name
 	Tags              []*common.Kv
+	ManagerType       string // type of mgr associated with node (aws-api, aws-ec2, automate, chef, azure-api, azure-ec2, gcp-api)
 }
 
 func assembleJob(job *jobs.Job, node nodeInfo, secrets []*inspec.Secrets, tc inspec.TargetBaseConfig) (*types.InspecJob, error) {
@@ -145,6 +146,7 @@ func assembleJob(job *jobs.Job, node nodeInfo, secrets []*inspec.Secrets, tc ins
 		SourceID:          node.CloudID,
 		SourceAccountID:   node.CloudAccountID,
 		ManagerID:         node.ManagerID,
+		ManagerType:       node.ManagerType,
 		MachineIdentifier: node.MachineIdentifier,
 		Tags:              node.Tags,
 	}, nil
@@ -182,6 +184,7 @@ func (r *Resolver) handleAzureApiNodes(ctx context.Context, m *manager.NodeManag
 				Name:           node.Name,
 				Environment:    "azure-api",
 				ManagerID:      m.Id,
+				ManagerType:    "azure-api",
 				CloudAccountID: m.AccountId,
 			}
 			tc := inspec.TargetBaseConfig{
@@ -242,6 +245,7 @@ func (r *Resolver) handleGcpApiNodes(ctx context.Context, m *manager.NodeManager
 			Name:           node.Name,
 			Environment:    "gcp-api",
 			ManagerID:      m.Id,
+			ManagerType:    "gcp-api",
 			CloudAccountID: m.AccountId,
 		}
 		tc := inspec.TargetBaseConfig{
@@ -354,6 +358,7 @@ func assembleAwsApiNodeInfo(node *nodes.Node, m *manager.NodeManager, awsCreds a
 		Name:           node.Name,
 		Environment:    "aws-api",
 		ManagerID:      m.Id,
+		ManagerType:    "aws-api",
 		CloudAccountID: m.AccountId,
 	}
 	// we want to prioritize using the region as it was saved
@@ -428,6 +433,7 @@ func (r *Resolver) handleAwsApiNodesMultiNode(ctx context.Context, m *manager.No
 				Name:           name,
 				Environment:    "aws-api",
 				ManagerID:      m.Id,
+				ManagerType:    "aws-api",
 				CloudAccountID: m.AccountId,
 			}
 			tc := inspec.TargetBaseConfig{
@@ -596,6 +602,7 @@ func (r *Resolver) handleManagerNodes(ctx context.Context, m *manager.NodeManage
 					Name:              nodeDetails.Name,
 					Environment:       nodeDetails.Environment,
 					ManagerID:         m.Id,
+					ManagerType:       m.Type,
 					SSM:               ssmJob,
 					CloudAccountID:    m.AccountId,
 					Tags:              node.Tags,
@@ -795,6 +802,7 @@ func (r *Resolver) resolveStaticJobInfo(job *jobs.Job, node *nodes.Node, tc insp
 		Profiles:     job.Profiles,
 		Tags:         node.Tags,
 		ManagerID:    mgrtypes.AutomateManagerID,
+		ManagerType:  "automate",
 	}
 	return agentJob
 }
diff --git a/components/compliance-service/inspec-agent/resolver/resolver_test.go b/components/compliance-service/inspec-agent/resolver/resolver_test.go
index 031539ca0c2..6f34f97f295 100644
--- a/components/compliance-service/inspec-agent/resolver/resolver_test.go
+++ b/components/compliance-service/inspec-agent/resolver/resolver_test.go
@@ -39,6 +39,7 @@ func TestAssembleAwsApiNodeInfo(t *testing.T) {
 		Environment:    "aws-api",
 		ManagerID:      "12300",
 		CloudAccountID: "1234",
+		ManagerType:    "aws-api",
 	}, nodeDetails)
 
 	assert.Equal(t, inspec.TargetBaseConfig{
diff --git a/components/compliance-service/inspec-agent/runner/runner.go b/components/compliance-service/inspec-agent/runner/runner.go
index f022e973a69..b391288f74d 100644
--- a/components/compliance-service/inspec-agent/runner/runner.go
+++ b/components/compliance-service/inspec-agent/runner/runner.go
@@ -528,6 +528,7 @@ func (t *InspecJobTask) reportIt(ctx context.Context, job *types.InspecJob, cont
 	report.SourceRegion = job.TargetConfig.TargetBaseConfig.Region
 	report.SourceAccountId = job.SourceAccountID
 	report.AutomateManagerId = job.ManagerID
+	report.AutomateManagerType = job.ManagerType
 	ipAddress := net.ParseIP(job.TargetConfig.TargetBaseConfig.Hostname)
 	if ipAddress != nil {
 		report.Ipaddress = ipAddress.String()
diff --git a/components/compliance-service/inspec-agent/types/types.go b/components/compliance-service/inspec-agent/types/types.go
index 137b7f61036..dd9b9963ba7 100644
--- a/components/compliance-service/inspec-agent/types/types.go
+++ b/components/compliance-service/inspec-agent/types/types.go
@@ -72,6 +72,7 @@ type InspecJob struct {
 	Tags                []*common.Kv        `json:"kv,omitempty"`
 	ParentJobID         string              `json:"parent_job_id,omitempty"`
 	ManagerID           string              `json:"manager_id,omitempty"`
+	ManagerType         string              `json:"manager_type,omitempty"`
 }
 
 // WorkerStats describe the state of all inspec job workers to be used for analysis purposes
diff --git a/components/ingest-service/pipeline/publisher/node_manager_publisher.go b/components/ingest-service/pipeline/publisher/node_manager_publisher.go
index 7c1ad4b8da8..805535d31e6 100644
--- a/components/ingest-service/pipeline/publisher/node_manager_publisher.go
+++ b/components/ingest-service/pipeline/publisher/node_manager_publisher.go
@@ -98,6 +98,7 @@ func gatherInfoForNode(msg message.ChefRun) (*manager.NodeMetadata, error) {
 			EndTime: timestamp,
 			Status:  status,
 		},
+		ManagerType: "chef",
 	}, nil
 }
 
diff --git a/components/ingest-service/pipeline/publisher/node_manager_publisher_test.go b/components/ingest-service/pipeline/publisher/node_manager_publisher_test.go
index 2430699bbf2..f35ebf0cad0 100644
--- a/components/ingest-service/pipeline/publisher/node_manager_publisher_test.go
+++ b/components/ingest-service/pipeline/publisher/node_manager_publisher_test.go
@@ -74,6 +74,7 @@ func TestGatherInfoForNode(t *testing.T) {
 			{Key: "chef_tags", Values: []string{"application", "database"}},
 			{Key: "chef_server", Values: []string{"chef-server-2"}},
 		},
+		ManagerType: "chef",
 	}, nodeMetadata)
 }
 
diff --git a/components/nodemanager-service/pgdb/node-managers-process-node.go b/components/nodemanager-service/pgdb/node-managers-process-node.go
index b8964fe0761..712a2b92d37 100644
--- a/components/nodemanager-service/pgdb/node-managers-process-node.go
+++ b/components/nodemanager-service/pgdb/node-managers-process-node.go
@@ -109,6 +109,11 @@ func (db *DB) ProcessIncomingNode(node *manager.NodeMetadata) error {
 		return fmt.Errorf("no uuid included in message. aborting.")
 	}
 
+	// warn if manager is empty; it should not be
+	if len(node.GetManagerType()) == 0 {
+		logrus.Warnf("manager value is empty for node %s", node.GetName())
+	}
+
 	// the incoming node may hit any of these cases:
 	// 1) it is already registered in our db with same uuid as incoming report: update the node entry
 	// 2) it is already registered in our db with diff uuid, same source_id, region, acct id: update the node by source_id
@@ -127,20 +132,12 @@ func (db *DB) ProcessIncomingNode(node *manager.NodeMetadata) error {
 		return errors.Wrap(err, "ProcessIncomingNode unable to marshal projects data")
 	}
 
-	var mgrType string
-	if node.ManagerId != "" {
-		mgrType, err = db.SelectStr(sqlGetManagerTypeFromId, node.ManagerId)
-		if err != nil {
-			logrus.Warnf("unable to find manager for node")
-		}
-	}
-
 	err = Transact(db, func(tx *DBTrans) error {
 		logrus.Debugf("processing node %s with cloud info %s %s %s", node.GetName(), node.GetSourceId(), node.GetSourceAccountId(), node.GetSourceRegion())
 		nodeDetails := nodeDetails{
 			nodeState:           nodeState,
 			lastContact:         lastContact,
-			mgrType:             mgrType,
+			mgrType:             node.GetManagerType(),
 			lastContactDataByte: lastContactDataByte,
 			projectsDataByte:    projectsDataByte,
 		}
diff --git a/components/nodemanager-service/pgdb/node-managers.go b/components/nodemanager-service/pgdb/node-managers.go
index 26eb93ae52e..0193de239d0 100644
--- a/components/nodemanager-service/pgdb/node-managers.go
+++ b/components/nodemanager-service/pgdb/node-managers.go
@@ -339,8 +339,8 @@ func validateNodeManagerFilters(filters []*common.Filter) error {
 		switch filter.Key {
 		case "manager_type":
 			for _, item := range filter.Values {
-				if !isValidManagerType(item) {
-					return &errorutils.InvalidError{Msg: fmt.Sprintf("Invalid manager type filter: %s. manager_type must be one of the following: 'aws-ec2', 'aws-api', 'azure-api'", item)}
+				if !isValidNodeManagerType(item) {
+					return &errorutils.InvalidError{Msg: fmt.Sprintf("Invalid manager type filter: %s. manager_type must be one of the following: 'aws-ec2', 'aws-api', 'azure-api', 'chef', '', 'azure-vm', 'gcp-api' ", item)}
 				}
 			}
 		}
@@ -348,15 +348,6 @@ func validateNodeManagerFilters(filters []*common.Filter) error {
 	return nil
 }
 
-func isValidManagerType(managerType string) bool {
-	switch managerType {
-	case "aws-ec2", "aws-api", "azure-api":
-		return true
-	default:
-		return false
-	}
-}
-
 func (db *DB) DeleteNodeManager(id string) error {
 	err := deleteNodeManager(db, id, func(tx *DBTrans) error {
 		_, err := tx.Exec(updateNodeManagersNodes, id)
diff --git a/components/nodemanager-service/pgdb/node_managers_process_node_integration_test.go b/components/nodemanager-service/pgdb/node_managers_process_node_integration_test.go
index 1a0c7fb78ce..373289e8972 100644
--- a/components/nodemanager-service/pgdb/node_managers_process_node_integration_test.go
+++ b/components/nodemanager-service/pgdb/node_managers_process_node_integration_test.go
@@ -816,6 +816,7 @@ func (suite *NodeManagersAndNodesDBSuite) TestProcessIncomingNodeCorrectlyAssoci
 		ScanData: &nodes.LastContactData{
 			Id: "12345-9999-002323",
 		},
+		ManagerType: "chef",
 	}
 	err := suite.Database.ProcessIncomingNode(node)
 	if err != nil {
@@ -826,7 +827,7 @@ func (suite *NodeManagersAndNodesDBSuite) TestProcessIncomingNodeCorrectlyAssoci
 		suite.FailNow(err.Error())
 	}
 	suite.Equal("my node", readNode.Name)
-	suite.Equal("", readNode.Manager)
+	suite.Equal("chef", readNode.Manager)
 	suite.Equal([]string{}, readNode.ManagerIds)
 
 	// create Automate manager, send node in with automate manager id, ensure it is correctly attributed
@@ -838,6 +839,7 @@ func (suite *NodeManagersAndNodesDBSuite) TestProcessIncomingNodeCorrectlyAssoci
 	_, err = suite.Database.AddNodeManager(&mgr, "")
 	node.Uuid = "1223-4254-2424-1345"
 	node.ManagerId = mgrtypes.AutomateManagerID
+	node.ManagerType = "automate"
 	err = suite.Database.ProcessIncomingNode(node)
 	if err != nil {
 		suite.FailNow(err.Error())
@@ -858,6 +860,7 @@ func (suite *NodeManagersAndNodesDBSuite) TestProcessIncomingNodeCorrectlyAssoci
 	}
 	node.Uuid = "1223-4254-2424-1115"
 	node.ManagerId = mgrID
+	node.ManagerType = "aws-ec2"
 	err = suite.Database.ProcessIncomingNode(node)
 	if err != nil {
 		suite.FailNow(err.Error())
diff --git a/components/nodemanager-service/pgdb/nodes.go b/components/nodemanager-service/pgdb/nodes.go
index 0deb0d72ac7..4a285d247c4 100644
--- a/components/nodemanager-service/pgdb/nodes.go
+++ b/components/nodemanager-service/pgdb/nodes.go
@@ -690,7 +690,7 @@ func validateNodeFilters(filters []*common.Filter) error {
 func isValidNodeManagerType(item string) bool {
 	switch item {
 	// empty string covers legacy nodes (nodes created before we started associating all manual nodes with "automate" as a manager and nodes brought over from a1)
-	case "aws-ec2", "aws-api", "azure-api", "azure-vm", "automate", "":
+	case "aws-ec2", "aws-api", "azure-api", "azure-vm", "automate", "gcp-api", "chef", "":
 		return true
 	default:
 		return false
diff --git a/components/nodemanager-service/server/nodes/server.go b/components/nodemanager-service/server/nodes/server.go
index ca803e98367..ea69cc97509 100644
--- a/components/nodemanager-service/server/nodes/server.go
+++ b/components/nodemanager-service/server/nodes/server.go
@@ -316,7 +316,7 @@ func (srv *Server) validateNodeUpdate(ctx context.Context, in *nodes.Node) error
 	switch node.Manager {
 	case "aws-api", "azure-api", "gcp-api":
 		return &errorutils.InvalidError{Msg: fmt.Sprintf("invalid option. unable to update %s node", in.Manager)}
-	case "":
+	case "", "chef":
 		if in.Name != "" && in.Name != node.Name {
 			return &errorutils.InvalidError{Msg: fmt.Sprintf("invalid option. unable to update name of ingested node")}
 		} else if in.Tags != nil {
diff --git a/e2e/cypress/integration/api/nodemanager/node_manager_type.spec.ts b/e2e/cypress/integration/api/nodemanager/node_manager_type.spec.ts
new file mode 100644
index 00000000000..4795fb5e751
--- /dev/null
+++ b/e2e/cypress/integration/api/nodemanager/node_manager_type.spec.ts
@@ -0,0 +1,38 @@
+import { uuidv4 } from '../../../support/helpers';
+
+describe('Nodemanager ', () => {
+  describe('when it receives chef node report info', () => {
+    const cypressPrefix = 'test-nodemanager-node-mgr-type';
+    const clientRunsNodeId1 = uuidv4();
+    const nodeName1 = `${cypressPrefix}-${Cypress.moment().format('MMDDYYhhmmss.sss')}-1`;
+    before(() => {
+      // Create the first node
+      cy.fixture('converge/avengers1.json').then((node) => {
+        const runId =  uuidv4();
+        node.entity_uuid = clientRunsNodeId1;
+        node.node_name = nodeName1;
+        node.id = runId;
+        node.run_id = runId;
+
+        cy.sendToDataCollector(node);
+      });
+
+      // Wait for that config mgmt node to appear
+      cy.waitForClientRunsNode(clientRunsNodeId1);
+
+      // Wait for the node to appear in the node manager
+      cy.waitForNodemanagerNode(clientRunsNodeId1);
+    });
+    // get the nodemanager node
+    it('sets the manager to chef', () => {
+        cy.request({
+            headers: { 'api-token': Cypress.env('ADMIN_TOKEN') },
+            method: 'GET',
+            url: `api/v0/nodes/id/${clientRunsNodeId1}`
+        }).then((resp: Cypress.ObjectLike) => {
+            console.log(resp.body);
+            expect(resp.body.manager).to.equal('chef');
+        });
+    });
+  });
+});