diff --git a/public/pages/CreateDetector/components/DefineDetector/components/DetectorSchedule/DetectorSchedule.tsx b/public/pages/CreateDetector/components/DefineDetector/components/DetectorSchedule/DetectorSchedule.tsx
index 0bafe87e..c55a6417 100644
--- a/public/pages/CreateDetector/components/DefineDetector/components/DetectorSchedule/DetectorSchedule.tsx
+++ b/public/pages/CreateDetector/components/DefineDetector/components/DetectorSchedule/DetectorSchedule.tsx
@@ -4,7 +4,7 @@
  */
 
 import React from 'react';
-import { EuiSpacer, EuiTitle } from '@elastic/eui';
+import { EuiSpacer, EuiText } from '@elastic/eui';
 import { PeriodSchedule } from '../../../../../../../models/interfaces';
 import { Interval } from './Interval';
 import { Detector } from '../../../../../../../types';
@@ -23,9 +23,9 @@ export class DetectorSchedule extends React.Component<DetectorScheduleProps> {
   render() {
     return (
       <>
-        <EuiTitle size="m">
+        <EuiText size="m">
           <h3>Detector schedule</h3>
-        </EuiTitle>
+        </EuiText>
         <EuiSpacer />
         <Interval
           schedule={this.props.detector.schedule}
diff --git a/public/pages/CreateDetector/components/DefineDetector/components/ThreatIntelligence/ThreatIntelligence.tsx b/public/pages/CreateDetector/components/DefineDetector/components/ThreatIntelligence/ThreatIntelligence.tsx
index 846bdd92..4feaca16 100644
--- a/public/pages/CreateDetector/components/DefineDetector/components/ThreatIntelligence/ThreatIntelligence.tsx
+++ b/public/pages/CreateDetector/components/DefineDetector/components/ThreatIntelligence/ThreatIntelligence.tsx
@@ -3,10 +3,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { EuiCompressedCheckbox, EuiText, EuiTitle, htmlIdGenerator } from '@elastic/eui';
+import React, { useMemo, useState } from 'react';
+import {
+  EuiCallOut,
+  EuiCompressedCheckbox,
+  EuiLink,
+  EuiSpacer,
+  EuiText,
+  htmlIdGenerator,
+} from '@elastic/eui';
+import { buildRouteUrl } from '../../../../../../utils/helpers';
+import { ROUTES, THREAT_INTEL_NAV_ID } from '../../../../../../utils/constants';
 
 export interface ThreatIntelligenceProps {
+  isEdit: boolean;
   threatIntelChecked: boolean;
   onThreatIntelChange: (checked: boolean) => void;
 }
@@ -14,25 +24,67 @@ export interface ThreatIntelligenceProps {
 export const ThreatIntelligence: React.FC<ThreatIntelligenceProps> = ({
   threatIntelChecked,
   onThreatIntelChange,
+  isEdit,
 }) => {
+  const [shouldShowEditUI] = useState(isEdit && threatIntelChecked);
+  const threatIntelUrl = useMemo(() => {
+    return buildRouteUrl(THREAT_INTEL_NAV_ID, ROUTES.THREAT_INTEL_OVERVIEW);
+  }, []);
+
   return (
     <>
-      <EuiTitle size="m">
-        <h3>Threat intelligence feeds</h3>
-      </EuiTitle>
+      {!shouldShowEditUI && (
+        <>
+          <EuiText size="m">
+            <h3>Threat intelligence feeds</h3>
+          </EuiText>
+          <EuiText size="s">
+            <p>
+              To match your data source against known indicators of compromise configure logs scan
+              with threat intel sources on the{' '}
+              <EuiLink target="_blank" href={threatIntelUrl}>
+                Threat intelligence
+              </EuiLink>{' '}
+              page.
+            </p>
+          </EuiText>
+        </>
+      )}
+      {shouldShowEditUI && (
+        <>
+          <EuiText size="m">
+            <h3>Threat intelligence feeds</h3>
+          </EuiText>
 
-      <EuiText size="s">
-        <p>
-          Match your data source against known malicious IP-addresses. Available for standard log
-          types only.
-        </p>
-      </EuiText>
-      <EuiCompressedCheckbox
-        id={htmlIdGenerator()()}
-        label="Enable threat intelligence-based detection"
-        checked={threatIntelChecked}
-        onChange={(e) => onThreatIntelChange(e.target.checked)}
-      />
+          <EuiText size="s">
+            <p>
+              Match your data source against known malicious IP-addresses. Available for standard
+              log types only.
+            </p>
+          </EuiText>
+          <EuiSpacer size="s" />
+          <EuiCallOut
+            size="s"
+            title={
+              <p>
+                To match your data against known indicators of compromise we recommend configuring
+                scan using the new{' '}
+                <EuiLink target="_blank" href={threatIntelUrl}>
+                  Threat Intelligence
+                </EuiLink>{' '}
+                platform and disabling threat intelligence in the detector.
+              </p>
+            }
+          />
+          <EuiSpacer size="s" />
+          <EuiCompressedCheckbox
+            id={htmlIdGenerator()()}
+            label="Enable threat intelligence-based detection"
+            checked={threatIntelChecked}
+            onChange={(e) => onThreatIntelChange(e.target.checked)}
+          />
+        </>
+      )}
     </>
   );
 };
diff --git a/public/pages/CreateDetector/components/DefineDetector/containers/DefineDetector.tsx b/public/pages/CreateDetector/components/DefineDetector/containers/DefineDetector.tsx
index bad21041..a356673c 100644
--- a/public/pages/CreateDetector/components/DefineDetector/containers/DefineDetector.tsx
+++ b/public/pages/CreateDetector/components/DefineDetector/containers/DefineDetector.tsx
@@ -146,7 +146,7 @@ export default class DefineDetector extends Component<DefineDetectorProps, Defin
     const newDetector: Detector = {
       ...this.state.detector,
       detector_type: detectorType,
-      threat_intel_enabled: this.standardLogTypes.has(detectorType),
+      threat_intel_enabled: false,
     };
 
     this.updateDetectorCreationState(newDetector);
@@ -251,6 +251,7 @@ export default class DefineDetector extends Component<DefineDetectorProps, Defin
 
         {this.standardLogTypes.has(detector_type) && (
           <ThreatIntelligence
+            isEdit={isEdit}
             threatIntelChecked={threat_intel_enabled}
             onThreatIntelChange={this.onThreatIntelligenceChanged}
           />
diff --git a/public/pages/Detectors/components/DetectorBasicDetailsView/DetectorBasicDetailsView.tsx b/public/pages/Detectors/components/DetectorBasicDetailsView/DetectorBasicDetailsView.tsx
index 683397fd..1b2d3627 100644
--- a/public/pages/Detectors/components/DetectorBasicDetailsView/DetectorBasicDetailsView.tsx
+++ b/public/pages/Detectors/components/DetectorBasicDetailsView/DetectorBasicDetailsView.tsx
@@ -3,12 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EuiSmallButton, EuiSpacer, EuiLink, EuiIcon, EuiText } from '@elastic/eui';
+import { EuiSmallButton, EuiSpacer, EuiLink, EuiIcon, EuiText, EuiCallOut } from '@elastic/eui';
 import React from 'react';
 import { ContentPanel } from '../../../../components/ContentPanel';
-import { createTextDetailsGroup, parseSchedule } from '../../../../utils/helpers';
+import { buildRouteUrl, createTextDetailsGroup, parseSchedule } from '../../../../utils/helpers';
 import moment from 'moment';
-import { DEFAULT_EMPTY_DATA, logTypesWithDashboards } from '../../../../utils/constants';
+import {
+  DEFAULT_EMPTY_DATA,
+  logTypesWithDashboards,
+  ROUTES,
+  THREAT_INTEL_NAV_ID,
+} from '../../../../utils/constants';
 import { Detector } from '../../../../../types';
 import { getLogTypeLabel } from '../../../LogTypes/utils/helpers';
 
@@ -51,7 +56,10 @@ export const DetectorBasicDetailsView: React.FC<DetectorBasicDetailsViewProps> =
       actions={
         isEditable
           ? [
-              <EuiSmallButton onClick={onEditClicked} data-test-subj={'edit-detector-basic-details'}>
+              <EuiSmallButton
+                onClick={onEditClicked}
+                data-test-subj={'edit-detector-basic-details'}
+              >
                 Edit
               </EuiSmallButton>,
             ]
@@ -101,6 +109,24 @@ export const DetectorBasicDetailsView: React.FC<DetectorBasicDetailsViewProps> =
       {createTextDetailsGroup([
         { label: 'Threat intelligence', content: threat_intel_enabled ? 'Enabled' : 'Disabled' },
       ])}
+      {threat_intel_enabled && (
+        <EuiCallOut
+          size="s"
+          title={
+            <p>
+              To match your data against known indicators of compromise we recommend configuring
+              scan using the new{' '}
+              <EuiLink
+                target="_blank"
+                href={buildRouteUrl(THREAT_INTEL_NAV_ID, ROUTES.THREAT_INTEL_OVERVIEW)}
+              >
+                Threat Intelligence
+              </EuiLink>{' '}
+              platform and disabling threat intelligence in the detector.
+            </p>
+          }
+        />
+      )}
       {rulesCanFold ? children : null}
     </ContentPanel>
   );
diff --git a/public/pages/Detectors/components/UpdateBasicDetails/UpdateBasicDetails.tsx b/public/pages/Detectors/components/UpdateBasicDetails/UpdateBasicDetails.tsx
index 4bf7c284..a74976b3 100644
--- a/public/pages/Detectors/components/UpdateBasicDetails/UpdateBasicDetails.tsx
+++ b/public/pages/Detectors/components/UpdateBasicDetails/UpdateBasicDetails.tsx
@@ -295,6 +295,7 @@ export const UpdateDetectorBasicDetails: React.FC<UpdateDetectorBasicDetailsProp
         <EuiSpacer size={'l'} />
 
         <ThreatIntelligence
+          isEdit={true}
           threatIntelChecked={detector.threat_intel_enabled}
           onThreatIntelChange={onThreatIntelFeedToggle}
         />
diff --git a/public/pages/Detectors/components/UpdateBasicDetails/__snapshots__/UpdateDetectorBasicDetails.test.tsx.snap b/public/pages/Detectors/components/UpdateBasicDetails/__snapshots__/UpdateDetectorBasicDetails.test.tsx.snap
index 6c0bbb94..2e2d68e6 100644
--- a/public/pages/Detectors/components/UpdateBasicDetails/__snapshots__/UpdateDetectorBasicDetails.test.tsx.snap
+++ b/public/pages/Detectors/components/UpdateBasicDetails/__snapshots__/UpdateDetectorBasicDetails.test.tsx.snap
@@ -1171,17 +1171,20 @@ exports[`<UpdateDetectorBasicDetails /> spec renders the component 1`] = `
         />
       </EuiSpacer>
       <ThreatIntelligence
+        isEdit={true}
         onThreatIntelChange={[Function]}
       >
-        <EuiTitle
+        <EuiText
           size="m"
         >
-          <h3
-            className="euiTitle euiTitle--medium"
+          <div
+            className="euiText euiText--medium"
           >
-            Threat intelligence feeds
-          </h3>
-        </EuiTitle>
+            <h3>
+              Threat intelligence feeds
+            </h3>
+          </div>
+        </EuiText>
         <EuiText
           size="s"
         >
@@ -1189,41 +1192,46 @@ exports[`<UpdateDetectorBasicDetails /> spec renders the component 1`] = `
             className="euiText euiText--small"
           >
             <p>
-              Match your data source against known malicious IP-addresses. Available for standard log types only.
+              To match your data source against known indicators of compromise configure logs scan with threat intel sources on the
+               
+              <EuiLink
+                href="#/threat-intel"
+                target="_blank"
+              >
+                <a
+                  className="euiLink euiLink--primary"
+                  href="#/threat-intel"
+                  rel="noopener noreferrer"
+                  target="_blank"
+                >
+                  Threat intelligence
+                  <EuiIcon
+                    aria-label="External link"
+                    className="euiLink__externalIcon"
+                    size="s"
+                    type="popout"
+                  >
+                    EuiIconMock
+                  </EuiIcon>
+                  <EuiScreenReaderOnly>
+                    <span
+                      className="euiScreenReaderOnly"
+                    >
+                      <EuiI18n
+                        default="(opens in a new tab or window)"
+                        token="euiLink.newTarget.screenReaderOnlyText"
+                      >
+                        (opens in a new tab or window)
+                      </EuiI18n>
+                    </span>
+                  </EuiScreenReaderOnly>
+                </a>
+              </EuiLink>
+               
+              page.
             </p>
           </div>
         </EuiText>
-        <EuiCompressedCheckbox
-          checked={false}
-          compressed={true}
-          disabled={false}
-          id="some_html_id"
-          indeterminate={false}
-          label="Enable threat intelligence-based detection"
-          onChange={[Function]}
-        >
-          <div
-            className="euiCheckbox euiCheckbox--compressed"
-          >
-            <input
-              checked={false}
-              className="euiCheckbox__input"
-              disabled={false}
-              id="some_html_id"
-              onChange={[Function]}
-              type="checkbox"
-            />
-            <div
-              className="euiCheckbox__square"
-            />
-            <label
-              className="euiCheckbox__label"
-              htmlFor="some_html_id"
-            >
-              Enable threat intelligence-based detection
-            </label>
-          </div>
-        </EuiCompressedCheckbox>
       </ThreatIntelligence>
       <EuiSpacer
         size="l"
@@ -1419,15 +1427,17 @@ exports[`<UpdateDetectorBasicDetails /> spec renders the component 1`] = `
         }
         onDetectorScheduleChange={[Function]}
       >
-        <EuiTitle
+        <EuiText
           size="m"
         >
-          <h3
-            className="euiTitle euiTitle--medium"
+          <div
+            className="euiText euiText--medium"
           >
-            Detector schedule
-          </h3>
-        </EuiTitle>
+            <h3>
+              Detector schedule
+            </h3>
+          </div>
+        </EuiText>
         <EuiSpacer>
           <div
             className="euiSpacer euiSpacer--l"
diff --git a/public/pages/Overview/components/GettingStarted/GettingStartedContent.tsx b/public/pages/Overview/components/GettingStarted/GettingStartedContent.tsx
index 328e68a3..f23b58e1 100644
--- a/public/pages/Overview/components/GettingStarted/GettingStartedContent.tsx
+++ b/public/pages/Overview/components/GettingStarted/GettingStartedContent.tsx
@@ -4,14 +4,7 @@
  */
 
 import React, { useMemo } from 'react';
-import {
-  EuiHorizontalRule,
-  EuiLink,
-  EuiPanel,
-  EuiSpacer,
-  EuiSteps,
-  EuiText,
-} from '@elastic/eui';
+import { EuiHorizontalRule, EuiLink, EuiPanel, EuiSpacer, EuiSteps, EuiText } from '@elastic/eui';
 import { EuiContainedStepProps } from '@elastic/eui/src/components/steps/steps';
 import {
   BREADCRUMBS,
diff --git a/public/pages/Overview/containers/Overview/Overview.tsx b/public/pages/Overview/containers/Overview/Overview.tsx
index 398fe695..cd98ec27 100644
--- a/public/pages/Overview/containers/Overview/Overview.tsx
+++ b/public/pages/Overview/containers/Overview/Overview.tsx
@@ -107,7 +107,11 @@ export const Overview: React.FC<OverviewProps> = (props) => {
   const isSecurityAnalyticsUseCase = currentNavGroup?.id === SECURITY_ANALYTICS_USE_CASE_ID;
 
   useEffect(() => {
-    setBreadcrumbs(isSecurityAnalyticsUseCase ? [ BREADCRUMBS.OVERVIEW] : [{...BREADCRUMBS.OVERVIEW, text: 'Security Analytics overview'}]);
+    setBreadcrumbs(
+      isSecurityAnalyticsUseCase
+        ? [BREADCRUMBS.OVERVIEW]
+        : [{ ...BREADCRUMBS.OVERVIEW, text: 'Security Analytics overview' }]
+    );
     overviewViewModelActor.registerRefreshHandler(updateState, true /* allowPartialResults */);
     overviewViewModelActor.registerRefreshHandler(
       onLoadingComplete,
@@ -273,7 +277,13 @@ export const Overview: React.FC<OverviewProps> = (props) => {
             <EuiFlexGroup gutterSize="m">
               {getOverviewsCardsProps().map((p, idx) => (
                 <EuiFlexItem key={idx}>
-                  <EuiCard {...p} layout="vertical" textAlign="left" titleElement='h4' titleSize='s'/>
+                  <EuiCard
+                    {...p}
+                    layout="vertical"
+                    textAlign="left"
+                    titleElement="h4"
+                    titleSize="s"
+                  />
                 </EuiFlexItem>
               ))}
             </EuiFlexGroup>
diff --git a/public/utils/constants.ts b/public/utils/constants.ts
index 87e36ea2..25ab3da8 100644
--- a/public/utils/constants.ts
+++ b/public/utils/constants.ts
@@ -320,5 +320,3 @@ const LocalCluster: DataSourceOption = {
 export const dataSourceObservable = new BehaviorSubject<DataSourceOption>({});
 
 export const DATA_SOURCE_NOT_SET_ERROR = 'Data source is not set';
-
-
diff --git a/public/utils/helpers.tsx b/public/utils/helpers.tsx
index 14527df3..ff3ba0b6 100644
--- a/public/utils/helpers.tsx
+++ b/public/utils/helpers.tsx
@@ -70,6 +70,7 @@ import {
   getUseUpdatedUx,
   setBrowserServices,
   getDataSourceManagementPlugin,
+  getApplication,
 } from '../services/utils/constants';
 import DetectorsService from '../services/DetectorService';
 import CorrelationService from '../services/CorrelationService';
@@ -84,6 +85,7 @@ import semver from 'semver';
 import * as pluginManifest from '../../opensearch_dashboards.json';
 import { DataSourceThreatAlertsCard } from '../components/DataSourceThreatAlertsCard/DataSourceThreatAlertsCard';
 import { DataSourceAttributes } from '../../../../src/plugins/data_source/common/data_sources';
+import { RouteComponentProps } from 'react-router-dom';
 
 export const parseStringsToOptions = (strings: string[]) => {
   return strings.map((str) => ({ id: str, label: str }));
@@ -770,3 +772,12 @@ export function initializeServices(coreStart: CoreStart, indexPattern: CoreIndex
   setBrowserServices(services);
   DataStore.init(services, coreStart.notifications);
 }
+
+export const buildRouteUrl = (appId: string, route: string) => {
+  const useUpdatedUx = getUseUpdatedUx();
+  if (useUpdatedUx) {
+    return getApplication().getUrlForApp(appId, { path: `#${route}` });
+  } else {
+    return `#${route}`;
+  }
+};