diff --git a/x-pack/plugins/security_solution/common/endpoint/models/policy_config.ts b/x-pack/plugins/security_solution/common/endpoint/models/policy_config.ts
index 3250e048edad2..890def5b63d4a 100644
--- a/x-pack/plugins/security_solution/common/endpoint/models/policy_config.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/models/policy_config.ts
@@ -33,6 +33,9 @@ export const factory = (): PolicyConfig => {
       logging: {
         file: 'info',
       },
+      antivirus_registration: {
+        enabled: false,
+      },
     },
     mac: {
       events: {
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/index.ts b/x-pack/plugins/security_solution/common/endpoint/types/index.ts
index 1d64578a6a7f1..673d04c856935 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/index.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/index.ts
@@ -8,6 +8,7 @@ import { ApplicationStart } from 'kibana/public';
 import { NewPackagePolicy, PackagePolicy } from '../../../../fleet/common';
 import { ManifestSchema } from '../schema/manifest';
 
+export * from './os';
 export * from './trusted_apps';
 
 /**
@@ -880,6 +881,9 @@ export interface PolicyConfig {
         enabled: boolean;
       };
     };
+    antivirus_registration: {
+      enabled: boolean;
+    };
   };
   mac: {
     advanced?: {};
@@ -919,7 +923,10 @@ export interface UIPolicyConfig {
   /**
    * Windows-specific policy configuration that is supported via the UI
    */
-  windows: Pick<PolicyConfig['windows'], 'events' | 'malware' | 'popup' | 'advanced'>;
+  windows: Pick<
+    PolicyConfig['windows'],
+    'events' | 'malware' | 'popup' | 'antivirus_registration' | 'advanced'
+  >;
   /**
    * Mac-specific policy configuration that is supported via the UI
    */
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/os.ts b/x-pack/plugins/security_solution/common/endpoint/types/os.ts
new file mode 100644
index 0000000000000..b9afbd63ecd54
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/endpoint/types/os.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export type Linux = 'linux';
+export type MacOS = 'macos';
+export type Windows = 'windows';
+export type OperatingSystem = Linux | MacOS | Windows;
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/trusted_apps.ts b/x-pack/plugins/security_solution/common/endpoint/types/trusted_apps.ts
index 3568136dd0e7b..79d66443bc8f1 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/trusted_apps.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/trusted_apps.ts
@@ -11,6 +11,7 @@ import {
   GetTrustedAppsRequestSchema,
   PostTrustedAppCreateRequestSchema,
 } from '../schema/trusted_apps';
+import { Linux, MacOS, Windows } from './os';
 
 /** API request params for deleting Trusted App entry */
 export type DeleteTrustedAppsRequestParams = TypeOf<typeof DeleteTrustedAppsRequestSchema.params>;
@@ -51,11 +52,11 @@ export type NewTrustedApp = {
   description?: string;
 } & (
   | {
-      os: 'linux' | 'macos';
+      os: Linux | MacOS;
       entries: MacosLinuxConditionEntry[];
     }
   | {
-      os: 'windows';
+      os: Windows;
       entries: WindowsConditionEntry[];
     }
 );
diff --git a/x-pack/plugins/security_solution/public/management/common/translations.ts b/x-pack/plugins/security_solution/public/management/common/translations.ts
index d24eb1bd315fa..415658c1fd6af 100644
--- a/x-pack/plugins/security_solution/public/management/common/translations.ts
+++ b/x-pack/plugins/security_solution/public/management/common/translations.ts
@@ -6,6 +6,8 @@
 
 import { i18n } from '@kbn/i18n';
 
+import { OperatingSystem } from '../../../common/endpoint/types';
+
 export const ENDPOINTS_TAB = i18n.translate('xpack.securitySolution.endpointsTab', {
   defaultMessage: 'Endpoints',
 });
@@ -21,3 +23,15 @@ export const TRUSTED_APPS_TAB = i18n.translate('xpack.securitySolution.trustedAp
 export const BETA_BADGE_LABEL = i18n.translate('xpack.securitySolution.administration.list.beta', {
   defaultMessage: 'Beta',
 });
+
+export const OS_TITLES: Readonly<{ [K in OperatingSystem]: string }> = {
+  windows: i18n.translate('xpack.securitySolution.administration.os.windows', {
+    defaultMessage: 'Windows',
+  }),
+  macos: i18n.translate('xpack.securitySolution.administration.os.macos', {
+    defaultMessage: 'Mac',
+  }),
+  linux: i18n.translate('xpack.securitySolution.administration.os.linux', {
+    defaultMessage: 'Linux',
+  }),
+};
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action.ts
index f5a219bce4a6b..bda408cd00e75 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action.ts
@@ -31,6 +31,13 @@ interface UserChangedPolicyConfig {
   };
 }
 
+interface UserChangedAntivirusRegistration {
+  type: 'userChangedAntivirusRegistration';
+  payload: {
+    enabled: boolean;
+  };
+}
+
 interface ServerReturnedPolicyDetailsAgentSummaryData {
   type: 'serverReturnedPolicyDetailsAgentSummaryData';
   payload: {
@@ -62,4 +69,5 @@ export type PolicyDetailsAction =
   | ServerReturnedPolicyDetailsUpdateFailure
   | ServerReturnedUpdatedPolicyDetailsData
   | ServerFailedToReturnPolicyDetailsData
-  | UserChangedPolicyConfig;
+  | UserChangedPolicyConfig
+  | UserChangedAntivirusRegistration;
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts
index 89ba05547f447..69c2afbd01960 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts
@@ -245,6 +245,9 @@ describe('policy details: ', () => {
                       },
                     },
                     logging: { file: 'info' },
+                    antivirus_registration: {
+                      enabled: false,
+                    },
                   },
                   mac: {
                     events: { process: true, file: true, network: true },
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/reducer.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/reducer.ts
index 43a6ad2c585b4..bcdc7ba2089c6 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/reducer.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/reducer.ts
@@ -4,11 +4,33 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { fullPolicy, isOnPolicyDetailsPage } from './selectors';
-import { Immutable, PolicyConfig, UIPolicyConfig } from '../../../../../../common/endpoint/types';
+import {
+  Immutable,
+  PolicyConfig,
+  UIPolicyConfig,
+  PolicyData,
+} from '../../../../../../common/endpoint/types';
 import { ImmutableReducer } from '../../../../../common/store';
 import { AppAction } from '../../../../../common/store/actions';
 import { PolicyDetailsState } from '../../types';
 
+const updatePolicyConfigInPolicyData = (
+  policyData: Immutable<PolicyData>,
+  policyConfig: Immutable<PolicyConfig>
+) => ({
+  ...policyData,
+  inputs: policyData.inputs.map((input) => ({
+    ...input,
+    config: input.config && {
+      ...input.config,
+      policy: {
+        ...input.config.policy,
+        value: policyConfig,
+      },
+    },
+  })),
+});
+
 /**
  * Return a fresh copy of initial state, since we mutate state in the reducer.
  */
@@ -126,5 +148,26 @@ export const policyDetailsReducer: ImmutableReducer<PolicyDetailsState, AppActio
     return newState;
   }
 
+  if (action.type === 'userChangedAntivirusRegistration') {
+    if (state.policyItem) {
+      const policyConfig = fullPolicy(state);
+
+      return {
+        ...state,
+        policyItem: updatePolicyConfigInPolicyData(state.policyItem, {
+          ...policyConfig,
+          windows: {
+            ...policyConfig.windows,
+            antivirus_registration: {
+              enabled: action.payload.enabled,
+            },
+          },
+        }),
+      };
+    } else {
+      return state;
+    }
+  }
+
   return state;
 };
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors.ts
index f275124a73527..7088f094ddcb4 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors.ts
@@ -107,6 +107,7 @@ export const policyConfig: (s: PolicyDetailsState) => UIPolicyConfig = createSel
         events: windows.events,
         malware: windows.malware,
         popup: windows.popup,
+        antivirus_registration: windows.antivirus_registration,
       },
       mac: {
         advanced: mac.advanced,
@@ -122,6 +123,10 @@ export const policyConfig: (s: PolicyDetailsState) => UIPolicyConfig = createSel
   }
 );
 
+export const isAntivirusRegistrationEnabled = createSelector(policyConfig, (uiPolicyConfig) => {
+  return uiPolicyConfig.windows.antivirus_registration.enabled;
+});
+
 /** Returns the total number of possible windows eventing configurations */
 export const totalWindowsEvents = (state: PolicyDetailsState): number => {
   const config = policyConfig(state);
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/types.ts b/x-pack/plugins/security_solution/public/management/pages/policy/types.ts
index 152caff3714b0..3926ad2220e35 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/types.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/types.ts
@@ -76,68 +76,6 @@ export interface PolicyListUrlSearchParams {
   page_size: number;
 }
 
-/**
- * Endpoint Policy configuration
- */
-export interface PolicyConfig {
-  windows: {
-    events: {
-      dll_and_driver_load: boolean;
-      dns: boolean;
-      file: boolean;
-      network: boolean;
-      process: boolean;
-      registry: boolean;
-      security: boolean;
-    };
-    malware: MalwareFields;
-    logging: {
-      stdout: string;
-      file: string;
-    };
-    advanced: PolicyConfigAdvancedOptions;
-  };
-  mac: {
-    events: {
-      file: boolean;
-      process: boolean;
-      network: boolean;
-    };
-    malware: MalwareFields;
-    logging: {
-      stdout: string;
-      file: string;
-    };
-    advanced: PolicyConfigAdvancedOptions;
-  };
-  linux: {
-    events: {
-      file: boolean;
-      process: boolean;
-      network: boolean;
-    };
-    logging: {
-      stdout: string;
-      file: string;
-    };
-    advanced: PolicyConfigAdvancedOptions;
-  };
-}
-
-interface PolicyConfigAdvancedOptions {
-  elasticsearch: {
-    indices: {
-      control: string;
-      event: string;
-      logging: string;
-    };
-    kernel: {
-      connect: boolean;
-      process: boolean;
-    };
-  };
-}
-
 export enum OS {
   windows = 'windows',
   mac = 'mac',
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/components/config_form/index.stories.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/components/config_form/index.stories.tsx
new file mode 100644
index 0000000000000..4f288af393b7c
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/components/config_form/index.stories.tsx
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { ThemeProvider } from 'styled-components';
+import { storiesOf, addDecorator } from '@storybook/react';
+import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
+import { EuiCheckbox, EuiSpacer, EuiSwitch, EuiText } from '@elastic/eui';
+
+import { ConfigForm } from '.';
+
+addDecorator((storyFn) => (
+  <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>{storyFn()}</ThemeProvider>
+));
+
+storiesOf('PolicyDetails/ConfigForm', module)
+  .add('One OS', () => {
+    return (
+      <ConfigForm type="Type 1" supportedOss={['windows']}>
+        {'Some content'}
+      </ConfigForm>
+    );
+  })
+  .add('Multiple OSs', () => {
+    return (
+      <ConfigForm type="Type 1" supportedOss={['windows', 'macos', 'linux']}>
+        {'Some content'}
+      </ConfigForm>
+    );
+  })
+  .add('Complex content', () => {
+    return (
+      <ConfigForm type="Type 1" supportedOss={['macos', 'linux']}>
+        <EuiText>
+          {'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore ' +
+            'et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut ' +
+            'aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum ' +
+            'dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia ' +
+            'deserunt mollit anim id est laborum.'}
+        </EuiText>
+        <EuiSpacer size="s" />
+        <EuiSwitch label={'Switch'} checked={true} onChange={() => {}} />
+        <EuiSpacer size="s" />
+        <EuiCheckbox id="1" label={'Checkbox 1'} checked={false} onChange={() => {}} />
+        <EuiCheckbox id="2" label={'Checkbox 2'} checked={true} onChange={() => {}} />
+        <EuiCheckbox id="3" label={'Checkbox 3'} checked={true} onChange={() => {}} />
+      </ConfigForm>
+    );
+  })
+  .add('Right corner content', () => {
+    const toggle = <EuiSwitch label={'Switch'} checked={true} onChange={() => {}} />;
+
+    return (
+      <ConfigForm type="Type 1" supportedOss={['linux']} rightCorner={toggle}>
+        {'Some content'}
+      </ConfigForm>
+    );
+  });
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/components/config_form/index.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/components/config_form/index.tsx
new file mode 100644
index 0000000000000..30c35de9b907f
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/components/config_form/index.tsx
@@ -0,0 +1,84 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, ReactNode, memo } from 'react';
+import { i18n } from '@kbn/i18n';
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiTitle,
+  EuiHorizontalRule,
+  EuiText,
+  EuiShowFor,
+  EuiPanel,
+} from '@elastic/eui';
+
+import { OperatingSystem } from '../../../../../../../common/endpoint/types';
+import { OS_TITLES } from '../../../../../common/translations';
+
+const TITLES = {
+  type: i18n.translate('xpack.securitySolution.endpoint.policyDetailType', {
+    defaultMessage: 'Type',
+  }),
+  os: i18n.translate('xpack.securitySolution.endpoint.policyDetailOS', {
+    defaultMessage: 'Operating System',
+  }),
+};
+
+interface ConfigFormProps {
+  /**
+   * A subtitle for this component.
+   **/
+  type: string;
+  /**
+   * Types of supported operating systems.
+   */
+  supportedOss: OperatingSystem[];
+  dataTestSubj?: string;
+  /** React Node to be put on the right corner of the card */
+  rightCorner?: ReactNode;
+}
+
+export const ConfigFormHeading: FC = memo(({ children }) => (
+  <EuiTitle size="xxs">
+    <h5>{children}</h5>
+  </EuiTitle>
+));
+
+ConfigFormHeading.displayName = 'ConfigFormHeading';
+
+export const ConfigForm: FC<ConfigFormProps> = memo(
+  ({ type, supportedOss, dataTestSubj, rightCorner, children }) => (
+    <EuiPanel data-test-subj={dataTestSubj}>
+      <EuiFlexGroup direction="row" gutterSize="none" alignItems="center">
+        <EuiFlexItem>
+          <ConfigFormHeading>{TITLES.type}</ConfigFormHeading>
+          <EuiText size="m">{type}</EuiText>
+        </EuiFlexItem>
+        <EuiFlexItem grow={2}>
+          <ConfigFormHeading>{TITLES.os}</ConfigFormHeading>
+          <EuiText>{supportedOss.map((os) => OS_TITLES[os]).join(', ')}</EuiText>
+        </EuiFlexItem>
+        <EuiShowFor sizes={['m', 'l', 'xl']}>
+          <EuiFlexItem>
+            <EuiFlexGroup direction="row" gutterSize="none" justifyContent="flexEnd">
+              <EuiFlexItem grow={false}>{rightCorner}</EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiFlexItem>
+        </EuiShowFor>
+        <EuiShowFor sizes={rightCorner ? ['s', 'xs'] : []}>
+          <EuiFlexItem>{rightCorner}</EuiFlexItem>
+        </EuiShowFor>
+      </EuiFlexGroup>
+
+      <EuiHorizontalRule margin="m" />
+
+      {children}
+    </EuiPanel>
+  )
+);
+
+ConfigForm.displayName = 'ConfigForm';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx
index 8fc5de48f36db..9c11bc6f5a4d1 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx
@@ -36,6 +36,7 @@ import { AgentsSummary } from './agents_summary';
 import { VerticalDivider } from './vertical_divider';
 import { WindowsEvents, MacEvents, LinuxEvents } from './policy_forms/events';
 import { MalwareProtections } from './policy_forms/protections/malware';
+import { AntivirusRegistrationForm } from './policy_forms/antivirus_registration';
 import { useToasts } from '../../../../common/lib/kibana';
 import { AppAction } from '../../../../common/store/actions';
 import { SpyRoute } from '../../../../common/utils/route/spy_routes';
@@ -251,6 +252,8 @@ export const PolicyDetails = React.memo(() => {
         <MacEvents />
         <EuiSpacer size="l" />
         <LinuxEvents />
+        <EuiSpacer size="l" />
+        <AntivirusRegistrationForm />
 
         <EuiSpacer size="l" />
         <EuiButtonEmpty data-test-subj="advancedPolicyButton" onClick={handleAdvancedPolicyClick}>
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/antivirus_registration/index.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/antivirus_registration/index.tsx
new file mode 100644
index 0000000000000..8d1ac29c8ce1e
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/antivirus_registration/index.tsx
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { memo, useCallback } from 'react';
+import { useDispatch } from 'react-redux';
+import { i18n } from '@kbn/i18n';
+import { EuiSpacer, EuiSwitch, EuiText } from '@elastic/eui';
+
+import { isAntivirusRegistrationEnabled } from '../../../store/policy_details/selectors';
+import { usePolicyDetailsSelector } from '../../policy_hooks';
+import { ConfigForm } from '../../components/config_form';
+
+export const AntivirusRegistrationForm = memo(() => {
+  const antivirusRegistrationEnabled = usePolicyDetailsSelector(isAntivirusRegistrationEnabled);
+  const dispatch = useDispatch();
+
+  const handleSwitchChange = useCallback(
+    (event) =>
+      dispatch({
+        type: 'userChangedAntivirusRegistration',
+        payload: {
+          enabled: event.target.checked,
+        },
+      }),
+    [dispatch]
+  );
+
+  return (
+    <ConfigForm
+      type={i18n.translate(
+        'xpack.securitySolution.endpoint.policy.details.antivirusRegistration.type',
+        {
+          defaultMessage: 'Register as anti-virus',
+        }
+      )}
+      supportedOss={['windows']}
+    >
+      <EuiText size="s">
+        {i18n.translate(
+          'xpack.securitySolution.endpoint.policy.details.antivirusRegistration.explanation',
+          {
+            defaultMessage: 'Switch the toggle to on to register Elastic anti-virus',
+          }
+        )}
+      </EuiText>
+      <EuiSpacer size="s" />
+      <EuiSwitch
+        label={i18n.translate(
+          'xpack.securitySolution.endpoint.policy.details.antivirusRegistration.toggle',
+          {
+            defaultMessage: 'Register as anti-virus',
+          }
+        )}
+        checked={antivirusRegistrationEnabled}
+        onChange={handleSwitchChange}
+      />
+    </ConfigForm>
+  );
+});
+
+AntivirusRegistrationForm.displayName = 'AntivirusRegistrationForm';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/config_form.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/config_form.tsx
deleted file mode 100644
index 8e3c4138efb36..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/config_form.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { useMemo } from 'react';
-import {
-  EuiCard,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiTitle,
-  EuiHorizontalRule,
-  EuiText,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import styled from 'styled-components';
-
-const PolicyDetailCard = styled.div`
-  .policyDetailTitleOS {
-    flex-grow: 2;
-  }
-  .policyDetailTitleFlexItem {
-    margin: 0;
-  }
-`;
-export const ConfigForm: React.FC<{
-  /**
-   * A subtitle for this component.
-   **/
-  type: string;
-  /**
-   * Types of supported operating systems.
-   */
-  supportedOss: React.ReactNode;
-  children: React.ReactNode;
-  dataTestSubj: string;
-  /** React Node to be put on the right corner of the card */
-  rightCorner: React.ReactNode;
-}> = React.memo(({ type, supportedOss, children, dataTestSubj, rightCorner }) => {
-  const typeTitle = useMemo(() => {
-    return (
-      <EuiFlexGroup direction="row" gutterSize="none" alignItems="center">
-        <EuiFlexGroup direction="column" gutterSize="none">
-          <EuiFlexItem className="policyDetailTitleFlexItem">
-            <EuiTitle size="xxxs">
-              <h6>
-                <FormattedMessage
-                  id="xpack.securitySolution.endpoint.policyDetailType"
-                  defaultMessage="Type"
-                />
-              </h6>
-            </EuiTitle>
-          </EuiFlexItem>
-          <EuiFlexItem className="policyDetailTitleFlexItem">
-            <EuiText size="m">{type}</EuiText>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-        <EuiFlexGroup direction="column" gutterSize="none" className="policyDetailTitleOS">
-          <EuiFlexItem className="policyDetailTitleFlexItem">
-            <EuiTitle size="xxxs">
-              <h6>
-                <FormattedMessage
-                  id="xpack.securitySolution.endpoint.policyDetailOS"
-                  defaultMessage="Operating System"
-                />
-              </h6>
-            </EuiTitle>
-          </EuiFlexItem>
-          <EuiFlexItem className="policyDetailTitleFlexItem">
-            <EuiText>{supportedOss}</EuiText>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-        <EuiFlexItem grow={false}>{rightCorner}</EuiFlexItem>
-      </EuiFlexGroup>
-    );
-  }, [rightCorner, supportedOss, type]);
-
-  return (
-    <PolicyDetailCard>
-      <EuiCard description data-test-subj={dataTestSubj} textAlign="left" title={typeTitle}>
-        <EuiHorizontalRule margin="m" />
-        {children}
-      </EuiCard>
-    </PolicyDetailCard>
-  );
-});
-
-ConfigForm.displayName = 'ConfigForm';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/linux.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/linux.tsx
index 66126adb7a4e1..b43f93f1a1e2b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/linux.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/linux.tsx
@@ -6,15 +6,19 @@
 
 import React, { useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiTitle, EuiText, EuiSpacer } from '@elastic/eui';
+import { EuiText, EuiSpacer } from '@elastic/eui';
 import { EventsCheckbox } from './checkbox';
 import { OS } from '../../../types';
 import { usePolicyDetailsSelector } from '../../policy_hooks';
 import { selectedLinuxEvents, totalLinuxEvents } from '../../../store/policy_details/selectors';
-import { ConfigForm } from '../config_form';
+import { ConfigForm, ConfigFormHeading } from '../../components/config_form';
 import { getIn, setIn } from '../../../models/policy_details_config';
 import { UIPolicyConfig } from '../../../../../../../common/endpoint/types';
+import {
+  COLLECTIONS_ENABLED_MESSAGE,
+  EVENTS_FORM_TYPE_LABEL,
+  EVENTS_HEADING,
+} from './translations';
 
 export const LinuxEvents = React.memo(() => {
   const selected = usePolicyDetailsSelector(selectedLinuxEvents);
@@ -59,14 +63,7 @@ export const LinuxEvents = React.memo(() => {
     ];
     return (
       <>
-        <EuiTitle size="xxs">
-          <h5>
-            <FormattedMessage
-              id="xpack.securitySolution.endpoint.policyDetailsConfig.eventingEvents"
-              defaultMessage="Events"
-            />
-          </h5>
-        </EuiTitle>
+        <ConfigFormHeading>{EVENTS_HEADING}</ConfigFormHeading>
         <EuiSpacer size="s" />
         {items.map((item, index) => {
           return (
@@ -85,28 +82,16 @@ export const LinuxEvents = React.memo(() => {
     );
   }, []);
 
-  const collectionsEnabled = useMemo(() => {
-    return (
-      <EuiText size="s" color="subdued">
-        <FormattedMessage
-          id="xpack.securitySolution.endpoint.policy.details.eventCollectionsEnabled"
-          defaultMessage="{selected} / {total} event collections enabled"
-          values={{ selected, total }}
-        />
-      </EuiText>
-    );
-  }, [selected, total]);
-
   return (
     <ConfigForm
-      type={i18n.translate('xpack.securitySolution.endpoint.policy.details.eventCollection', {
-        defaultMessage: 'Event Collection',
-      })}
-      supportedOss={i18n.translate('xpack.securitySolution.endpoint.policy.details.linux', {
-        defaultMessage: 'Linux',
-      })}
+      type={EVENTS_FORM_TYPE_LABEL}
+      supportedOss={['linux']}
       dataTestSubj="linuxEventingForm"
-      rightCorner={collectionsEnabled}
+      rightCorner={
+        <EuiText size="s" color="subdued">
+          {COLLECTIONS_ENABLED_MESSAGE(selected, total)}
+        </EuiText>
+      }
     >
       {checkboxes}
     </ConfigForm>
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/mac.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/mac.tsx
index dc70fc0ba0f4f..fbbe50fbec1b0 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/mac.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/mac.tsx
@@ -6,15 +6,19 @@
 
 import React, { useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiTitle, EuiText, EuiSpacer } from '@elastic/eui';
+import { EuiText, EuiSpacer } from '@elastic/eui';
 import { EventsCheckbox } from './checkbox';
 import { OS } from '../../../types';
 import { usePolicyDetailsSelector } from '../../policy_hooks';
 import { selectedMacEvents, totalMacEvents } from '../../../store/policy_details/selectors';
-import { ConfigForm } from '../config_form';
+import { ConfigForm, ConfigFormHeading } from '../../components/config_form';
 import { getIn, setIn } from '../../../models/policy_details_config';
 import { UIPolicyConfig } from '../../../../../../../common/endpoint/types';
+import {
+  COLLECTIONS_ENABLED_MESSAGE,
+  EVENTS_FORM_TYPE_LABEL,
+  EVENTS_HEADING,
+} from './translations';
 
 export const MacEvents = React.memo(() => {
   const selected = usePolicyDetailsSelector(selectedMacEvents);
@@ -59,14 +63,7 @@ export const MacEvents = React.memo(() => {
     ];
     return (
       <>
-        <EuiTitle size="xxs">
-          <h5>
-            <FormattedMessage
-              id="xpack.securitySolution.endpoint.policyDetailsConfig.eventingEvents"
-              defaultMessage="Events"
-            />
-          </h5>
-        </EuiTitle>
+        <ConfigFormHeading>{EVENTS_HEADING}</ConfigFormHeading>
         <EuiSpacer size="s" />
         {items.map((item, index) => {
           return (
@@ -85,28 +82,16 @@ export const MacEvents = React.memo(() => {
     );
   }, []);
 
-  const collectionsEnabled = useMemo(() => {
-    return (
-      <EuiText size="s" color="subdued">
-        <FormattedMessage
-          id="xpack.securitySolution.endpoint.policy.details.eventCollectionsEnabled"
-          defaultMessage="{selected} / {total} event collections enabled"
-          values={{ selected, total }}
-        />
-      </EuiText>
-    );
-  }, [selected, total]);
-
   return (
     <ConfigForm
-      type={i18n.translate('xpack.securitySolution.endpoint.policy.details.eventCollection', {
-        defaultMessage: 'Event Collection',
-      })}
-      supportedOss={i18n.translate('xpack.securitySolution.endpoint.policy.details.mac', {
-        defaultMessage: 'Mac',
-      })}
+      type={EVENTS_FORM_TYPE_LABEL}
+      supportedOss={['macos']}
       dataTestSubj="macEventingForm"
-      rightCorner={collectionsEnabled}
+      rightCorner={
+        <EuiText size="s" color="subdued">
+          {COLLECTIONS_ENABLED_MESSAGE(selected, total)}
+        </EuiText>
+      }
     >
       {checkboxes}
     </ConfigForm>
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/translations.ts b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/translations.ts
new file mode 100644
index 0000000000000..3b48b7969a8ce
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/translations.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const EVENTS_HEADING = i18n.translate(
+  'xpack.securitySolution.endpoint.policyDetailsConfig.eventingEvents',
+  {
+    defaultMessage: 'Events',
+  }
+);
+
+export const EVENTS_FORM_TYPE_LABEL = i18n.translate(
+  'xpack.securitySolution.endpoint.policy.details.eventCollection',
+  {
+    defaultMessage: 'Event Collection',
+  }
+);
+
+export const COLLECTIONS_ENABLED_MESSAGE = (selected: number, total: number) => {
+  return i18n.translate('xpack.securitySolution.endpoint.policy.details.eventCollectionsEnabled', {
+    defaultMessage: '{selected} / {total} event collections enabled',
+    values: { selected, total },
+  });
+};
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/windows.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/windows.tsx
index 5acdf67922a3a..f7b1a8e901ed2 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/windows.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/windows.tsx
@@ -6,15 +6,19 @@
 
 import React, { useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiTitle, EuiText, EuiSpacer } from '@elastic/eui';
+import { EuiText, EuiSpacer } from '@elastic/eui';
 import { EventsCheckbox } from './checkbox';
 import { OS } from '../../../types';
 import { usePolicyDetailsSelector } from '../../policy_hooks';
 import { selectedWindowsEvents, totalWindowsEvents } from '../../../store/policy_details/selectors';
-import { ConfigForm } from '../config_form';
+import { ConfigForm, ConfigFormHeading } from '../../components/config_form';
 import { setIn, getIn } from '../../../models/policy_details_config';
 import { UIPolicyConfig, Immutable } from '../../../../../../../common/endpoint/types';
+import {
+  COLLECTIONS_ENABLED_MESSAGE,
+  EVENTS_FORM_TYPE_LABEL,
+  EVENTS_HEADING,
+} from './translations';
 
 export const WindowsEvents = React.memo(() => {
   const selected = usePolicyDetailsSelector(selectedWindowsEvents);
@@ -99,14 +103,7 @@ export const WindowsEvents = React.memo(() => {
     ];
     return (
       <>
-        <EuiTitle size="xxs">
-          <h5>
-            <FormattedMessage
-              id="xpack.securitySolution.endpoint.policyDetailsConfig.eventingEvents"
-              defaultMessage="Events"
-            />
-          </h5>
-        </EuiTitle>
+        <ConfigFormHeading>{EVENTS_HEADING}</ConfigFormHeading>
         <EuiSpacer size="s" />
         {items.map((item, index) => {
           return (
@@ -125,28 +122,16 @@ export const WindowsEvents = React.memo(() => {
     );
   }, []);
 
-  const collectionsEnabled = useMemo(() => {
-    return (
-      <EuiText size="s" color="subdued">
-        <FormattedMessage
-          id="xpack.securitySolution.endpoint.policy.details.eventCollectionsEnabled"
-          defaultMessage="{selected} / {total} event collections enabled"
-          values={{ selected, total }}
-        />
-      </EuiText>
-    );
-  }, [selected, total]);
-
   return (
     <ConfigForm
-      type={i18n.translate('xpack.securitySolution.endpoint.policy.details.eventCollection', {
-        defaultMessage: 'Event Collection',
-      })}
-      supportedOss={i18n.translate('xpack.securitySolution.endpoint.policy.details.windows', {
-        defaultMessage: 'Windows',
-      })}
+      type={EVENTS_FORM_TYPE_LABEL}
+      supportedOss={['windows']}
       dataTestSubj="windowsEventingForm"
-      rightCorner={collectionsEnabled}
+      rightCorner={
+        <EuiText size="s" color="subdued">
+          {COLLECTIONS_ENABLED_MESSAGE(selected, total)}
+        </EuiText>
+      }
     >
       {checkboxes}
     </ConfigForm>
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/protections/malware.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/protections/malware.tsx
index b61dee5269737..7259b2ec19ee2 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/protections/malware.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/protections/malware.tsx
@@ -7,10 +7,11 @@
 import React, { useCallback, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
 import {
   EuiRadio,
   EuiSwitch,
-  EuiTitle,
   EuiText,
   EuiSpacer,
   EuiTextArea,
@@ -18,15 +19,13 @@ import {
   EuiCallOut,
   EuiCheckbox,
 } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
 import { cloneDeep } from 'lodash';
 import { APP_ID } from '../../../../../../../common/constants';
 import { SecurityPageName } from '../../../../../../app/types';
 
 import { Immutable, ProtectionModes } from '../../../../../../../common/endpoint/types';
 import { OS, MalwareProtectionOSes } from '../../../types';
-import { ConfigForm } from '../config_form';
+import { ConfigForm, ConfigFormHeading } from '../../components/config_form';
 import { policyConfig } from '../../../store/policy_details/selectors';
 import { usePolicyDetailsSelector } from '../../policy_hooks';
 import { LinkToApp } from '../../../../../../common/components/endpoint/link_to_app';
@@ -200,14 +199,12 @@ export const MalwareProtections = React.memo(() => {
   const radioButtons = useMemo(() => {
     return (
       <>
-        <EuiTitle size="xxs">
-          <h5>
-            <FormattedMessage
-              id="xpack.securitySolution.endpoint.policyDetailsConfig.protectionLevel"
-              defaultMessage="Protection Level"
-            />
-          </h5>
-        </EuiTitle>
+        <ConfigFormHeading>
+          <FormattedMessage
+            id="xpack.securitySolution.endpoint.policyDetailsConfig.protectionLevel"
+            defaultMessage="Protection Level"
+          />
+        </ConfigFormHeading>
         <EuiSpacer size="xs" />
         <ProtectionRadioGroup>
           {radios.map((radio) => {
@@ -221,14 +218,12 @@ export const MalwareProtections = React.memo(() => {
           })}
         </ProtectionRadioGroup>
         <EuiSpacer size="s" />
-        <EuiTitle size="xxs">
-          <h5>
-            <FormattedMessage
-              id="xpack.securitySolution.endpoint.policyDetailsConfig.userNotification"
-              defaultMessage="User Notification"
-            />
-          </h5>
-        </EuiTitle>
+        <ConfigFormHeading>
+          <FormattedMessage
+            id="xpack.securitySolution.endpoint.policyDetailsConfig.userNotification"
+            defaultMessage="User Notification"
+          />
+        </ConfigFormHeading>
         <SupportedVersionNotice optionName="malware" />
         <EuiSpacer size="s" />
         <EuiCheckbox
@@ -297,9 +292,7 @@ export const MalwareProtections = React.memo(() => {
       type={i18n.translate('xpack.securitySolution.endpoint.policy.details.malware', {
         defaultMessage: 'Malware',
       })}
-      supportedOss={i18n.translate('xpack.securitySolution.endpoint.policy.details.windowsAndMac', {
-        defaultMessage: 'Windows, Mac',
-      })}
+      supportedOss={['windows', 'macos']}
       dataTestSubj="malwareProtectionsForm"
       rightCorner={protectionSwitch}
     >
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.test.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.test.tsx
index 211fc9ec3371e..4bac9164e1d62 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.test.tsx
@@ -118,7 +118,7 @@ describe('When showing the Trusted App Create Form', () => {
         '.euiSuperSelect__listbox button.euiSuperSelect__item'
       )
     ).map((button) => button.textContent);
-    expect(options).toEqual(['Mac OS', 'Windows', 'Linux']);
+    expect(options).toEqual(['Mac', 'Windows', 'Linux']);
   });
 
   it('should show Description as optional', () => {
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_app_card/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_app_card/__snapshots__/index.test.tsx.snap
index a94e6287a4f58..a47558257420c 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_app_card/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_app_card/__snapshots__/index.test.tsx.snap
@@ -17,7 +17,7 @@ exports[`trusted_app_card TrustedAppCard should render correctly 1`] = `
     value={
       <TextFieldValue
         fieldName="OS"
-        value="Mac OS"
+        value="Mac"
       />
     }
   />
@@ -112,7 +112,7 @@ exports[`trusted_app_card TrustedAppCard should trim long texts 1`] = `
     value={
       <TextFieldValue
         fieldName="OS"
-        value="Mac OS"
+        value="Mac"
       />
     }
   />
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
index c82b9cac8ab1f..6d45059099f8d 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
@@ -412,7 +412,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                       class="euiToolTipAnchor"
                     >
                       <span>
-                        Mac OS
+                        Mac
                       </span>
                     </span>
                   </dd>
@@ -1168,7 +1168,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                       class="euiToolTipAnchor"
                     >
                       <span>
-                        Mac OS
+                        Mac
                       </span>
                     </span>
                   </dd>
@@ -1924,7 +1924,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                       class="euiToolTipAnchor"
                     >
                       <span>
-                        Mac OS
+                        Mac
                       </span>
                     </span>
                   </dd>
@@ -3222,7 +3222,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                       class="euiToolTipAnchor"
                     >
                       <span>
-                        Mac OS
+                        Mac
                       </span>
                     </span>
                   </dd>
@@ -3978,7 +3978,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                       class="euiToolTipAnchor"
                     >
                       <span>
-                        Mac OS
+                        Mac
                       </span>
                     </span>
                   </dd>
@@ -4734,7 +4734,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                       class="euiToolTipAnchor"
                     >
                       <span>
-                        Mac OS
+                        Mac
                       </span>
                     </span>
                   </dd>
@@ -5990,7 +5990,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                       class="euiToolTipAnchor"
                     >
                       <span>
-                        Mac OS
+                        Mac
                       </span>
                     </span>
                   </dd>
@@ -6746,7 +6746,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                       class="euiToolTipAnchor"
                     >
                       <span>
-                        Mac OS
+                        Mac
                       </span>
                     </span>
                   </dd>
@@ -7502,7 +7502,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                       class="euiToolTipAnchor"
                     >
                       <span>
-                        Mac OS
+                        Mac
                       </span>
                     </span>
                   </dd>
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_list/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_list/__snapshots__/index.test.tsx.snap
index 2797c433b8236..d0459871d4881 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_list/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_list/__snapshots__/index.test.tsx.snap
@@ -1061,7 +1061,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -1448,7 +1448,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -1835,7 +1835,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -2222,7 +2222,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -2609,7 +2609,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -2996,7 +2996,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -3383,7 +3383,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -4001,7 +4001,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -4388,7 +4388,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -4775,7 +4775,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -5162,7 +5162,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -5549,7 +5549,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -5936,7 +5936,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -6323,7 +6323,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -7099,7 +7099,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -7486,7 +7486,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -7873,7 +7873,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -8260,7 +8260,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -8647,7 +8647,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -9034,7 +9034,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -9421,7 +9421,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -10039,7 +10039,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -10426,7 +10426,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -10813,7 +10813,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -11200,7 +11200,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -11587,7 +11587,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -11974,7 +11974,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
@@ -12361,7 +12361,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   class="euiToolTipAnchor eui-textTruncate"
                 >
                   <span>
-                    Mac OS
+                    Mac
                   </span>
                 </span>
               </div>
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/translations.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/translations.ts
index b2f62c2f1da4e..4c2b3f0e59ccb 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/translations.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/translations.ts
@@ -11,23 +11,13 @@ import {
   WindowsConditionEntry,
 } from '../../../../../common/endpoint/types';
 
+export { OS_TITLES } from '../../../common/translations';
+
 export const ABOUT_TRUSTED_APPS = i18n.translate('xpack.securitySolution.trustedapps.aboutInfo', {
   defaultMessage:
     'Add a trusted application to improve performance or alleviate conflicts with other applications running on your hosts. Trusted applications will be applied to hosts running Endpoint Security.',
 });
 
-export const OS_TITLES: Readonly<{ [K in TrustedApp['os']]: string }> = {
-  windows: i18n.translate('xpack.securitySolution.trustedapps.os.windows', {
-    defaultMessage: 'Windows',
-  }),
-  macos: i18n.translate('xpack.securitySolution.trustedapps.os.macos', {
-    defaultMessage: 'Mac OS',
-  }),
-  linux: i18n.translate('xpack.securitySolution.trustedapps.os.linux', {
-    defaultMessage: 'Linux',
-  }),
-};
-
 type Entry = MacosLinuxConditionEntry | WindowsConditionEntry;
 
 export const CONDITION_FIELD_TITLE: { [K in Entry['field']]: string } = {
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 8c4a66975d6ef..f0c90467c09e0 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -17500,8 +17500,6 @@
     "xpack.securitySolution.endpoint.policy.details.detectionRulesMessage": "{detectionRulesLink}を表示します。事前構築済みルールは、［検出ルール］ページで「Elastic」というタグが付けられています。",
     "xpack.securitySolution.endpoint.policy.details.eventCollection": "イベント収集",
     "xpack.securitySolution.endpoint.policy.details.eventCollectionsEnabled": "{selected} / {total}件のイベント収集が有効です",
-    "xpack.securitySolution.endpoint.policy.details.linux": "Linux",
-    "xpack.securitySolution.endpoint.policy.details.mac": "Mac",
     "xpack.securitySolution.endpoint.policy.details.malware": "マルウェア",
     "xpack.securitySolution.endpoint.policy.details.malwareProtectionsEnabled": "マルウェア保護{mode, select, true {有効} false {無効}}",
     "xpack.securitySolution.endpoint.policy.details.prevent": "防御",
@@ -17516,8 +17514,6 @@
     "xpack.securitySolution.endpoint.policy.details.updateErrorTitle": "失敗しました。",
     "xpack.securitySolution.endpoint.policy.details.updateSuccessMessage": "統合{name}が更新されました。",
     "xpack.securitySolution.endpoint.policy.details.updateSuccessTitle": "成功！",
-    "xpack.securitySolution.endpoint.policy.details.windows": "Windows",
-    "xpack.securitySolution.endpoint.policy.details.windowsAndMac": "Windows、Mac",
     "xpack.securitySolution.endpoint.policyDetailOS": "オペレーティングシステム",
     "xpack.securitySolution.endpoint.policyDetails.agentsSummary.errorTitle": "エラー",
     "xpack.securitySolution.endpoint.policyDetails.agentsSummary.offlineTitle": "オフライン",
@@ -18468,9 +18464,6 @@
     "xpack.securitySolution.trustedapps.logicalConditionBuilder.group.andOperator": "AND",
     "xpack.securitySolution.trustedapps.logicalConditionBuilder.noEntries": "条件が定義されていません",
     "xpack.securitySolution.trustedapps.noResults": "項目が見つかりません",
-    "xpack.securitySolution.trustedapps.os.linux": "Linux",
-    "xpack.securitySolution.trustedapps.os.macos": "Mac OS",
-    "xpack.securitySolution.trustedapps.os.windows": "Windows",
     "xpack.securitySolution.trustedapps.trustedapp.createdAt": "作成日",
     "xpack.securitySolution.trustedapps.trustedapp.createdBy": "作成者",
     "xpack.securitySolution.trustedapps.trustedapp.description": "説明",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 60b1a33c8f5c9..101891eb78275 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -17518,8 +17518,6 @@
     "xpack.securitySolution.endpoint.policy.details.detectionRulesMessage": "请查看{detectionRulesLink}。在“检测规则”页面上，预置规则标记有“Elastic”。",
     "xpack.securitySolution.endpoint.policy.details.eventCollection": "事件收集",
     "xpack.securitySolution.endpoint.policy.details.eventCollectionsEnabled": "{selected} / {total} 事件收集已启用",
-    "xpack.securitySolution.endpoint.policy.details.linux": "Linux",
-    "xpack.securitySolution.endpoint.policy.details.mac": "Mac",
     "xpack.securitySolution.endpoint.policy.details.malware": "恶意软件",
     "xpack.securitySolution.endpoint.policy.details.malwareProtectionsEnabled": "恶意软件防护{mode, select, true {已启用} false {已禁用}}",
     "xpack.securitySolution.endpoint.policy.details.prevent": "防御",
@@ -17535,8 +17533,6 @@
     "xpack.securitySolution.endpoint.policy.details.updateErrorTitle": "失败！",
     "xpack.securitySolution.endpoint.policy.details.updateSuccessMessage": "集成 {name} 已更新。",
     "xpack.securitySolution.endpoint.policy.details.updateSuccessTitle": "成功！",
-    "xpack.securitySolution.endpoint.policy.details.windows": "Windows",
-    "xpack.securitySolution.endpoint.policy.details.windowsAndMac": "Windows、Mac",
     "xpack.securitySolution.endpoint.policyDetailOS": "操作系统",
     "xpack.securitySolution.endpoint.policyDetails.agentsSummary.errorTitle": "错误",
     "xpack.securitySolution.endpoint.policyDetails.agentsSummary.offlineTitle": "脱机",
@@ -18487,9 +18483,6 @@
     "xpack.securitySolution.trustedapps.logicalConditionBuilder.group.andOperator": "AND",
     "xpack.securitySolution.trustedapps.logicalConditionBuilder.noEntries": "未定义条件",
     "xpack.securitySolution.trustedapps.noResults": "找不到项目",
-    "xpack.securitySolution.trustedapps.os.linux": "Linux",
-    "xpack.securitySolution.trustedapps.os.macos": "Mac OS",
-    "xpack.securitySolution.trustedapps.os.windows": "Windows",
     "xpack.securitySolution.trustedapps.trustedapp.createdAt": "创建日期",
     "xpack.securitySolution.trustedapps.trustedapp.createdBy": "创建者",
     "xpack.securitySolution.trustedapps.trustedapp.description": "描述",
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
index 15c26a1b9374d..f032416d2e7bb 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
@@ -221,6 +221,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
                     message: 'Elastic Security { action } { filename }',
                   },
                 },
+                antivirus_registration: {
+                  enabled: false,
+                },
               },
             },
             streams: [],
diff --git a/x-pack/test/security_solution_endpoint/config.ts b/x-pack/test/security_solution_endpoint/config.ts
index 9499c235a5f0d..f3cb4a5812a5c 100644
--- a/x-pack/test/security_solution_endpoint/config.ts
+++ b/x-pack/test/security_solution_endpoint/config.ts
@@ -43,5 +43,8 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
         ...getRegistryUrlAsArray(),
       ],
     },
+    layout: {
+      fixedHeaderHeight: 200,
+    },
   };
 }