diff --git a/pkg/entities/entities_api.go b/pkg/entities/entities_api.go
index 122c3bd71..1c62744b0 100644
--- a/pkg/entities/entities_api.go
+++ b/pkg/entities/entities_api.go
@@ -2079,26 +2079,46 @@ const getEntitySearchByQuery = `query(
 			permalink
 			reporting
 			type
+			tags {
+				key
+				values
+			}
 			... on ApmApplicationEntityOutline {
 				__typename
 				applicationId
 				language
+				tags {
+					key
+					values
+				}
 			}
 			... on ApmDatabaseInstanceEntityOutline {
 				__typename
 				host
 				portOrPath
 				vendor
+				tags {
+					key
+					values
+				}
 			}
 			... on ApmExternalServiceEntityOutline {
 				__typename
 				host
+				tags {
+					key
+					values
+				}
 			}
 			... on BrowserApplicationEntityOutline {
 				__typename
 				agentInstallType
 				applicationId
 				servingApmApplicationId
+				tags {
+					key
+					values
+				}
 			}
 			... on DashboardEntityOutline {
 				__typename
@@ -2106,9 +2126,17 @@ const getEntitySearchByQuery = `query(
 				dashboardParentGuid
 				permissions
 				updatedAt
+				tags {
+					key
+					values
+				}
 			}
 			... on ExternalEntityOutline {
 				__typename
+				tags {
+					key
+					values
+				}
 			}
 			... on GenericEntityOutline {
 				__typename
@@ -2120,24 +2148,51 @@ const getEntitySearchByQuery = `query(
 			... on GenericInfrastructureEntityOutline {
 				__typename
 				integrationTypeCode
+				tags {
+					key
+					values
+				}
 			}
 			... on InfrastructureAwsLambdaFunctionEntityOutline {
 				__typename
 				integrationTypeCode
 				runtime
+				tags {
+					key
+					values
+				}
 			}
 			... on InfrastructureHostEntityOutline {
 				__typename
+				tags {
+					key
+					values
+				}
+			}
+			... on KeyTransactionEntityOutline {
+				__typename
+				tags {
+					key
+					values
+				}
 			}
 			... on MobileApplicationEntityOutline {
 				__typename
 				applicationId
+				tags {
+					key
+					values
+				}
 			}
 			... on SecureCredentialEntityOutline {
 				__typename
 				description
 				secureCredentialId
 				updatedAt
+				tags {
+					key
+					values
+				}
 			}
 			... on SyntheticMonitorEntityOutline {
 				__typename
@@ -2145,17 +2200,33 @@ const getEntitySearchByQuery = `query(
 				monitorType
 				monitoredUrl
 				period
+				tags {
+					key
+					values
+				}
 			}
 			... on ThirdPartyServiceEntityOutline {
 				__typename
+				tags {
+					key
+					values
+				}
 			}
 			... on UnavailableEntityOutline {
 				__typename
+				tags {
+					key
+					values
+				}
 			}
 			... on WorkloadEntityOutline {
 				__typename
 				createdAt
 				updatedAt
+				tags {
+					key
+					values
+				}
 			}
 		}
 		nextCursor
diff --git a/pkg/entities/entity_integration_test.go b/pkg/entities/entity_integration_test.go
index 3ad57c768..cc3d30938 100644
--- a/pkg/entities/entity_integration_test.go
+++ b/pkg/entities/entity_integration_test.go
@@ -63,6 +63,7 @@ func TestIntegrationSearchEntitiesByQuery(t *testing.T) {
 
 	require.NoError(t, err)
 	require.Greater(t, len(actual.Results.Entities), 0)
+	require.Greater(t, len(actual.Results.Entities[0].GetTags()), 0)
 }
 
 func TestIntegrationSearchEntities_domain(t *testing.T) {
diff --git a/pkg/entities/types.go b/pkg/entities/types.go
index c0a0f198b..15decd223 100644
--- a/pkg/entities/types.go
+++ b/pkg/entities/types.go
@@ -17345,6 +17345,7 @@ type EntityOutlineInterface interface {
 	GetGUID() common.EntityGUID
 	GetName() string
 	GetType() string
+	GetTags() []EntityTag
 }
 
 // UnmarshalEntityOutlineInterface unmarshals the interface into the correct type