diff --git a/x-pack/plugins/observability_solution/infra/common/constants.ts b/x-pack/plugins/observability_solution/infra/common/constants.ts
index 482406171a673..f871b7a6707ca 100644
--- a/x-pack/plugins/observability_solution/infra/common/constants.ts
+++ b/x-pack/plugins/observability_solution/infra/common/constants.ts
@@ -5,14 +5,24 @@
  * 2.0.
  */
 
+import { AlertConsumers, ValidFeatureId } from '@kbn/rule-data-utils';
+
 export const METRICS_INDEX_PATTERN = 'metrics-*,metricbeat-*';
 export const LOGS_INDEX_PATTERN = 'logs-*,filebeat-*,kibana_sample_data_logs*';
 export const METRICS_APP = 'metrics';
 export const LOGS_APP = 'logs';
 
-export const METRICS_FEATURE_ID = 'infrastructure';
-export const INFRA_ALERT_FEATURE_ID = 'infrastructure';
-export const LOGS_FEATURE_ID = 'logs';
+export const METRICS_FEATURE_ID = AlertConsumers.INFRASTRUCTURE;
+export const INFRA_ALERT_FEATURE_ID = AlertConsumers.INFRASTRUCTURE;
+export const LOGS_FEATURE_ID = AlertConsumers.LOGS;
+
+export const INFRA_ALERT_FEATURE_IDS: ValidFeatureId[] = [
+  AlertConsumers.INFRASTRUCTURE,
+  AlertConsumers.OBSERVABILITY,
+  AlertConsumers.LOGS,
+  AlertConsumers.SLO,
+  AlertConsumers.APM,
+];
 
 export type InfraFeatureId = typeof METRICS_FEATURE_ID | typeof LOGS_FEATURE_ID;
 
diff --git a/x-pack/plugins/observability_solution/infra/public/components/asset_details/tabs/overview/alerts/alerts.tsx b/x-pack/plugins/observability_solution/infra/public/components/asset_details/tabs/overview/alerts/alerts.tsx
index 304e67a0debde..dc4d78baeb5a1 100644
--- a/x-pack/plugins/observability_solution/infra/public/components/asset_details/tabs/overview/alerts/alerts.tsx
+++ b/x-pack/plugins/observability_solution/infra/public/components/asset_details/tabs/overview/alerts/alerts.tsx
@@ -75,7 +75,7 @@ export const AlertsSummaryContent = ({
             )}
             <EuiFlexItem grow={false}>
               <LinkToAlertsPage
-                kuery={`${assetIdField}:"${assetId}"`}
+                kuery={`"${assetId}"`}
                 dateRange={dateRange}
                 data-test-subj="infraAssetDetailsAlertsTabAlertsShowAllButton"
               />
diff --git a/x-pack/plugins/observability_solution/infra/public/components/shared/alerts/alerts_overview.tsx b/x-pack/plugins/observability_solution/infra/public/components/shared/alerts/alerts_overview.tsx
index 55ac129e54664..5c622a8e1bbbc 100644
--- a/x-pack/plugins/observability_solution/infra/public/components/shared/alerts/alerts_overview.tsx
+++ b/x-pack/plugins/observability_solution/infra/public/components/shared/alerts/alerts_overview.tsx
@@ -27,8 +27,6 @@ interface AlertsOverviewProps {
   assetType?: InventoryItemType;
 }
 
-const alertFeatureIds = [...infraAlertFeatureIds, AlertConsumers.OBSERVABILITY];
-
 export const AlertsOverview = ({
   assetId,
   dateRange,
@@ -127,7 +125,7 @@ export const AlertsOverview = ({
           alertsTableConfigurationRegistry={alertsTableConfigurationRegistry}
           id={'assetDetailsAlertsTable'}
           configurationId={AlertConsumers.OBSERVABILITY}
-          featureIds={alertFeatureIds}
+          featureIds={infraAlertFeatureIds}
           showAlertStatusWithFlapping
           query={alertsEsQueryByStatus}
           initialPageSize={5}
diff --git a/x-pack/plugins/observability_solution/infra/public/components/shared/alerts/constants.ts b/x-pack/plugins/observability_solution/infra/public/components/shared/alerts/constants.ts
index 1719a58af61ef..77471dc8c51ac 100644
--- a/x-pack/plugins/observability_solution/infra/public/components/shared/alerts/constants.ts
+++ b/x-pack/plugins/observability_solution/infra/public/components/shared/alerts/constants.ts
@@ -11,11 +11,10 @@ import {
   ALERT_STATUS_ACTIVE,
   ALERT_STATUS_RECOVERED,
   ALERT_STATUS_UNTRACKED,
-  AlertConsumers,
 } from '@kbn/rule-data-utils';
 import type { Filter } from '@kbn/es-query';
 import type { AlertStatus } from '@kbn/observability-plugin/common/typings';
-import type { ValidFeatureId } from '@kbn/rule-data-utils';
+import { INFRA_ALERT_FEATURE_IDS } from '../../../../common/constants';
 
 export const ALERT_STATUS_ALL = 'all';
 
@@ -88,5 +87,4 @@ export const ALERTS_PATH = '/app/observability/alerts';
 export const ALERTS_PER_PAGE = 10;
 export const ALERTS_TABLE_ID = 'xpack.infra.hosts.alerts.table';
 
-export const INFRA_ALERT_FEATURE_ID = 'infrastructure';
-export const infraAlertFeatureIds: ValidFeatureId[] = [AlertConsumers.INFRASTRUCTURE];
+export const infraAlertFeatureIds = INFRA_ALERT_FEATURE_IDS;
diff --git a/x-pack/plugins/observability_solution/infra/public/pages/metrics/hosts/components/tabs/alerts/alerts_tab_content.tsx b/x-pack/plugins/observability_solution/infra/public/pages/metrics/hosts/components/tabs/alerts/alerts_tab_content.tsx
index a3926b95383d9..14da46d12d349 100644
--- a/x-pack/plugins/observability_solution/infra/public/pages/metrics/hosts/components/tabs/alerts/alerts_tab_content.tsx
+++ b/x-pack/plugins/observability_solution/infra/public/pages/metrics/hosts/components/tabs/alerts/alerts_tab_content.tsx
@@ -6,7 +6,7 @@
  */
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { AlertConsumers, ALERT_RULE_PRODUCER } from '@kbn/rule-data-utils';
+import { AlertConsumers } from '@kbn/rule-data-utils';
 import { BrushEndListener, type XYBrushEvent } from '@elastic/charts';
 import { useSummaryTimeRange } from '@kbn/observability-plugin/public';
 import { useBoolean } from '@kbn/react-hooks';
@@ -25,13 +25,14 @@ import {
 import AlertsStatusFilter from '../../../../../../components/shared/alerts/alerts_status_filter';
 import { CreateAlertRuleButton } from '../../../../../../components/shared/alerts/links/create_alert_rule_button';
 import { LinkToAlertsPage } from '../../../../../../components/shared/alerts/links/link_to_alerts_page';
-import { INFRA_ALERT_FEATURE_ID } from '../../../../../../../common/constants';
 import { AlertFlyout } from '../../../../../../alerting/inventory/components/alert_flyout';
 import { usePluginConfig } from '../../../../../../containers/plugin_config_context';
+import { useHostsViewContext } from '../../../hooks/use_hosts_view';
 
 export const AlertsTabContent = () => {
   const { services } = useKibanaContextForPlugin();
   const { featureFlags } = usePluginConfig();
+  const { hostNodes } = useHostsViewContext();
 
   const { alertStatus, setAlertStatus, alertsEsQueryByStatus } = useAlertsQuery();
   const [isAlertFlyoutVisible, { toggle: toggleAlertFlyout }] = useBoolean(false);
@@ -43,6 +44,11 @@ export const AlertsTabContent = () => {
   const { alertsTableConfigurationRegistry, getAlertsStateTable: AlertsStateTable } =
     triggersActionsUi;
 
+  const hostsWithAlertsKuery = hostNodes
+    .filter((host) => host.alertsCount)
+    .map((host) => `"${host.name}"`)
+    .join(' OR ');
+
   return (
     <HeightRetainer>
       <EuiFlexGroup direction="column" gutterSize="m" data-test-subj="hostsView-alerts">
@@ -63,7 +69,7 @@ export const AlertsTabContent = () => {
               <LinkToAlertsPage
                 dateRange={searchCriteria.dateRange}
                 data-test-subj="infraHostAlertsTabAlertsShowAllButton"
-                kuery={`${ALERT_RULE_PRODUCER}: ${INFRA_ALERT_FEATURE_ID}`}
+                kuery={`${hostsWithAlertsKuery}`}
               />
             </EuiFlexItem>
           </EuiFlexGroup>
diff --git a/x-pack/plugins/observability_solution/infra/server/lib/helpers/get_infra_alerts_client.ts b/x-pack/plugins/observability_solution/infra/server/lib/helpers/get_infra_alerts_client.ts
index 58dfdde223ebd..c884b08ebaebf 100644
--- a/x-pack/plugins/observability_solution/infra/server/lib/helpers/get_infra_alerts_client.ts
+++ b/x-pack/plugins/observability_solution/infra/server/lib/helpers/get_infra_alerts_client.ts
@@ -8,6 +8,7 @@ import { isEmpty } from 'lodash';
 import type { ESSearchRequest, InferSearchResponseOf } from '@kbn/es-types';
 import { ParsedTechnicalFields } from '@kbn/rule-registry-plugin/common';
 import type { KibanaRequest } from '@kbn/core/server';
+import { INFRA_ALERT_FEATURE_IDS } from '../../../common/constants';
 import type { InfraBackendLibs } from '../infra_types';
 
 type RequiredParams = ESSearchRequest & {
@@ -26,7 +27,7 @@ export async function getInfraAlertsClient({
 }) {
   const [, { ruleRegistry }] = await libs.getStartServices();
   const alertsClient = await ruleRegistry.getRacClientWithRequest(request);
-  const infraAlertsIndices = await alertsClient.getAuthorizedAlertsIndices(['infrastructure']);
+  const infraAlertsIndices = await alertsClient.getAuthorizedAlertsIndices(INFRA_ALERT_FEATURE_IDS);
 
   if (!infraAlertsIndices || isEmpty(infraAlertsIndices)) {
     throw Error('No alert indices exist for "infrastructure"');
diff --git a/x-pack/plugins/observability_solution/infra/server/routes/infra/lib/host/get_hosts_alerts_count.ts b/x-pack/plugins/observability_solution/infra/server/routes/infra/lib/host/get_hosts_alerts_count.ts
index c3d8f0f674d55..d36ff06f35cf0 100644
--- a/x-pack/plugins/observability_solution/infra/server/routes/infra/lib/host/get_hosts_alerts_count.ts
+++ b/x-pack/plugins/observability_solution/infra/server/routes/infra/lib/host/get_hosts_alerts_count.ts
@@ -6,14 +6,13 @@
  */
 
 import { termQuery, termsQuery } from '@kbn/observability-plugin/server';
-import { observabilityFeatureId } from '@kbn/observability-shared-plugin/common';
 import {
   ALERT_RULE_PRODUCER,
   ALERT_STATUS,
   ALERT_STATUS_ACTIVE,
   ALERT_UUID,
 } from '@kbn/rule-data-utils';
-import { HOST_NAME_FIELD, INFRA_ALERT_FEATURE_ID } from '../../../../../common/constants';
+import { HOST_NAME_FIELD, INFRA_ALERT_FEATURE_IDS } from '../../../../../common/constants';
 import { GetHostParameters } from '../types';
 
 export async function getHostsAlertsCount({
@@ -41,7 +40,7 @@ export async function getHostsAlertsCount({
     query: {
       bool: {
         filter: [
-          ...termsQuery(ALERT_RULE_PRODUCER, INFRA_ALERT_FEATURE_ID, observabilityFeatureId),
+          ...termsQuery(ALERT_RULE_PRODUCER, ...INFRA_ALERT_FEATURE_IDS),
           ...termQuery(ALERT_STATUS, ALERT_STATUS_ACTIVE),
           ...termsQuery(HOST_NAME_FIELD, ...hostNames),
           ...rangeQuery,
diff --git a/x-pack/plugins/observability_solution/inventory/public/components/alerts_badge/alerts_badge.test.tsx b/x-pack/plugins/observability_solution/inventory/public/components/alerts_badge/alerts_badge.test.tsx
index 5195a35b93f4e..1892dd0109490 100644
--- a/x-pack/plugins/observability_solution/inventory/public/components/alerts_badge/alerts_badge.test.tsx
+++ b/x-pack/plugins/observability_solution/inventory/public/components/alerts_badge/alerts_badge.test.tsx
@@ -15,12 +15,10 @@ const useKibanaMock = useKibana as jest.Mock;
 
 const commonEntityFields: Partial<InventoryEntity> = {
   entityLastSeenTimestamp: 'foo',
-  entityId: '1',
+  entityId: 'entity1',
 };
 
 describe('AlertsBadge', () => {
-  const mockAsKqlFilter = jest.fn();
-
   beforeEach(() => {
     jest.clearAllMocks();
 
@@ -31,11 +29,6 @@ describe('AlertsBadge', () => {
             prepend: (path: string) => path,
           },
         },
-        entityManager: {
-          entityClient: {
-            asKqlFilter: mockAsKqlFilter,
-          },
-        },
       },
     });
   });
@@ -59,11 +52,10 @@ describe('AlertsBadge', () => {
         provider: null,
       },
     };
-    mockAsKqlFilter.mockReturnValue('host.name: foo');
 
     render(<AlertsBadge entity={entity} />);
     expect(screen.queryByTestId('inventoryAlertsBadgeLink')?.getAttribute('href')).toEqual(
-      "/app/observability/alerts?_a=(kuery:'host.name: foo',status:active)"
+      `/app/observability/alerts?_a=(kuery:\"entity1\",status:active)`
     );
     expect(screen.queryByTestId('inventoryAlertsBadgeLink')?.textContent).toEqual('1');
   });
@@ -86,40 +78,11 @@ describe('AlertsBadge', () => {
 
       alertsCount: 5,
     };
-    mockAsKqlFilter.mockReturnValue('service.name: bar');
 
     render(<AlertsBadge entity={entity} />);
     expect(screen.queryByTestId('inventoryAlertsBadgeLink')?.getAttribute('href')).toEqual(
-      "/app/observability/alerts?_a=(kuery:'service.name: bar',status:active)"
+      `/app/observability/alerts?_a=(kuery:\"entity1\",status:active)`
     );
     expect(screen.queryByTestId('inventoryAlertsBadgeLink')?.textContent).toEqual('5');
   });
-  it('render alerts badge for a service entity with multiple identity fields', () => {
-    const entity: InventoryEntity = {
-      ...(commonEntityFields as InventoryEntity),
-      entityType: 'service',
-      entityDisplayName: 'foo',
-      entityIdentityFields: ['service.name', 'service.environment'],
-      entityDefinitionId: 'service',
-      service: {
-        name: 'bar',
-        environment: 'prod',
-      },
-      agent: {
-        name: 'node',
-      },
-      cloud: {
-        provider: null,
-      },
-      alertsCount: 2,
-    };
-
-    mockAsKqlFilter.mockReturnValue('service.name: bar AND service.environment: prod');
-
-    render(<AlertsBadge entity={entity} />);
-    expect(screen.queryByTestId('inventoryAlertsBadgeLink')?.getAttribute('href')).toEqual(
-      "/app/observability/alerts?_a=(kuery:'service.name: bar AND service.environment: prod',status:active)"
-    );
-    expect(screen.queryByTestId('inventoryAlertsBadgeLink')?.textContent).toEqual('2');
-  });
 });
diff --git a/x-pack/plugins/observability_solution/inventory/public/components/alerts_badge/alerts_badge.tsx b/x-pack/plugins/observability_solution/inventory/public/components/alerts_badge/alerts_badge.tsx
index ed873bdb68c21..228cd3d8bbfd8 100644
--- a/x-pack/plugins/observability_solution/inventory/public/components/alerts_badge/alerts_badge.tsx
+++ b/x-pack/plugins/observability_solution/inventory/public/components/alerts_badge/alerts_badge.tsx
@@ -15,21 +15,16 @@ export function AlertsBadge({ entity }: { entity: InventoryEntity }) {
   const {
     services: {
       http: { basePath },
-      entityManager,
     },
   } = useKibana();
 
   const activeAlertsHref = basePath.prepend(
     `/app/observability/alerts?_a=${rison.encode({
-      kuery: entityManager.entityClient.asKqlFilter({
-        entity: {
-          identity_fields: entity.entityIdentityFields,
-        },
-        ...entity,
-      }),
+      kuery: `"${entity.entityId}"`,
       status: 'active',
     })}`
   );
+
   return (
     <EuiToolTip
       position="bottom"