diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap b/x-pack/plugins/ml/public/application/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap
index 6717e8fa5a51..b4a424535c9e 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap
@@ -96,7 +96,7 @@ exports[`RuleEditorFlyout renders the flyout after adding a condition to a rule
             values={
               Object {
                 "learnMoreLink": <EuiLink
-                  href="https://www.elastic.co/guide/en/machine-learning/jest-metadata-mock-branch/ml-rules.html"
+                  href="jest-metadata-mock-url"
                   target="_blank"
                 >
                   <FormattedMessage
@@ -355,7 +355,7 @@ exports[`RuleEditorFlyout renders the flyout after setting the rule to edit 1`]
             values={
               Object {
                 "learnMoreLink": <EuiLink
-                  href="https://www.elastic.co/guide/en/machine-learning/jest-metadata-mock-branch/ml-rules.html"
+                  href="jest-metadata-mock-url"
                   target="_blank"
                 >
                   <FormattedMessage
@@ -600,7 +600,7 @@ exports[`RuleEditorFlyout renders the flyout for creating a rule with conditions
             values={
               Object {
                 "learnMoreLink": <EuiLink
-                  href="https://www.elastic.co/guide/en/machine-learning/jest-metadata-mock-branch/ml-rules.html"
+                  href="jest-metadata-mock-url"
                   target="_blank"
                 >
                   <FormattedMessage
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js b/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js
index 5b0224c8e9f0..b4e5d194265d 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js
@@ -479,8 +479,7 @@ class RuleEditorFlyoutUI extends Component {
   };
 
   render() {
-    const { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } = this.props.kibana.services.docLinks;
-    const docsUrl = `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-rules.html`;
+    const docsUrl = this.props.kibana.services.docLinks.links.ml.customRules;
     const {
       isFlyoutVisible,
       job,
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.test.js
index b5c4abc5efd7..4b89cafd7916 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.test.js
@@ -86,8 +86,11 @@ function prepareTest() {
     kibana: {
       services: {
         docLinks: {
-          ELASTIC_WEBSITE_URL: 'https://www.elastic.co/',
-          DOC_LINK_VERSION: 'jest-metadata-mock-branch',
+          links: {
+            ml: {
+              customRules: 'jest-metadata-mock-url',
+            },
+          },
         },
       },
     },
diff --git a/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.js b/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.js
index 1ce4188d8e06..cf379a3eaf18 100644
--- a/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.js
+++ b/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.js
@@ -309,8 +309,7 @@ export class ValidateJobUI extends Component {
   };
 
   render() {
-    const { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } = getDocLinks();
-    const jobTipsUrl = `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/create-jobs.html#job-tips`;
+    const jobTipsUrl = getDocLinks().links.ml.anomalyDetectionJobTips;
     // only set to false if really false and not another falsy value, so it defaults to true.
     const fill = this.props.fill === false ? false : true;
     // default to false if not explicitly set to true
diff --git a/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.test.js b/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.test.js
index 7e473f12ee50..1bebe7fa596f 100644
--- a/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.test.js
+++ b/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.test.js
@@ -11,8 +11,11 @@ import { ValidateJob } from './validate_job_view';
 
 jest.mock('../../util/dependency_cache', () => ({
   getDocLinks: () => ({
-    ELASTIC_WEBSITE_URL: 'https://www.elastic.co/',
-    DOC_LINK_VERSION: 'jest-metadata-mock-branch',
+    links: {
+      ml: {
+        anomalyDetectionJobTips: 'jest-metadata-mock-url',
+      },
+    },
   }),
 }));
 
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/details_step/details_step_form.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/details_step/details_step_form.tsx
index b59fbe926aa4..448dcd8b2e1b 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/details_step/details_step_form.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/details_step/details_step_form.tsx
@@ -43,8 +43,7 @@ export const DetailsStepForm: FC<CreateAnalyticsStepProps> = ({
   const {
     services: { docLinks, notifications },
   } = useMlKibana();
-  const { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } = docLinks;
-
+  const createIndexLink = docLinks.links.apis.createIndex;
   const { setFormState } = actions;
   const { form, cloneJob, hasSwitchedToEditor, isJobCreated } = state;
   const {
@@ -240,10 +239,7 @@ export const DetailsStepForm: FC<CreateAnalyticsStepProps> = ({
                   }
                 )}
                 <br />
-                <EuiLink
-                  href={`${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}/indices-create-index.html#indices-create-index`}
-                  target="_blank"
-                >
+                <EuiLink href={createIndexLink} target="_blank">
                   {i18n.translate(
                     'xpack.ml.dataframe.stepDetailsForm.destinationIndexInvalidErrorLink',
                     {
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/__snapshots__/overrides.test.js.snap b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/__snapshots__/overrides.test.js.snap
index 24c9dc85979e..6ab89fe3e4b2 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/__snapshots__/overrides.test.js.snap
+++ b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/__snapshots__/overrides.test.js.snap
@@ -84,7 +84,7 @@ exports[`Overrides render overrides 1`] = `
         size="xs"
       >
         <EuiLink
-          href="https://www.elastic.co/guide/en/elasticsearch/reference/jest-metadata-mock-branch/search-aggregations-bucket-daterange-aggregation.html#date-format-pattern"
+          href="jest-metadata-mock-url"
           target="_blank"
         >
           See more on accepted formats
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/overrides.js b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/overrides.js
index bbbc33052f3c..36d49bd37152 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/overrides.js
+++ b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/overrides.js
@@ -268,8 +268,7 @@ class OverridesUI extends Component {
 
     const fieldOptions = getSortedFields(fields);
     const timestampFormatErrorsList = [this.customTimestampFormatErrors, timestampFormatError];
-    const { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } = this.props.kibana.services.docLinks;
-    const docsUrl = `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}/search-aggregations-bucket-daterange-aggregation.html#date-format-pattern`;
+    const docsUrl = this.props.kibana.services.docLinks.links.aggs.date_format_pattern;
 
     const timestampFormatHelp = (
       <EuiText size="xs">
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/overrides.test.js b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/overrides.test.js
index 05ebf601b597..4ad04cd248a1 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/overrides.test.js
+++ b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/overrides.test.js
@@ -26,8 +26,11 @@ function getProps() {
     kibana: {
       services: {
         docLinks: {
-          ELASTIC_WEBSITE_URL: 'https://www.elastic.co/',
-          DOC_LINK_VERSION: 'jest-metadata-mock-branch',
+          links: {
+            aggs: {
+              date_format_pattern: 'jest-metadata-mock-url',
+            },
+          },
         },
       },
     },
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/list/__snapshots__/header.test.js.snap b/x-pack/plugins/ml/public/application/settings/calendars/list/__snapshots__/header.test.js.snap
index 2925b2c3d1c3..c19d8effb1b9 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/list/__snapshots__/header.test.js.snap
+++ b/x-pack/plugins/ml/public/application/settings/calendars/list/__snapshots__/header.test.js.snap
@@ -90,7 +90,7 @@ exports[`CalendarListsHeader renders header 1`] = `
             Object {
               "br": <br />,
               "learnMoreLink": <EuiLink
-                href="https://www.elastic.co/guide/en/machine-learning/jest-metadata-mock-branch/ml-calendars.html"
+                href="jest-metadata-mock-url"
                 target="_blank"
               >
                 <FormattedMessage
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.test.js b/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.test.js
index 2efa75119f10..33806e19d718 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.test.js
+++ b/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.test.js
@@ -117,10 +117,6 @@ const props = {
           addDanger: () => {},
         },
       },
-      docLinks: {
-        ELASTIC_WEBSITE_URL: 'https://www.elastic.co/',
-        DOC_LINK_VERSION: 'jest-metadata-mock-branch',
-      },
     },
   },
 };
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/list/header.js b/x-pack/plugins/ml/public/application/settings/calendars/list/header.js
index bf4bc48b3472..62af8e5b6420 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/list/header.js
+++ b/x-pack/plugins/ml/public/application/settings/calendars/list/header.js
@@ -26,9 +26,7 @@ import {
 import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 
 function CalendarsListHeaderUI({ totalCount, refreshCalendars, kibana }) {
-  const { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } = kibana.services.docLinks;
-
-  const docsUrl = `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-calendars.html`;
+  const docsUrl = kibana.services.docLinks.links.ml.calendars;
   return (
     <React.Fragment>
       <EuiFlexGroup justifyContent="spaceBetween" alignItems="baseline">
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/list/header.test.js b/x-pack/plugins/ml/public/application/settings/calendars/list/header.test.js
index 3b674f3a7195..6600849b1c32 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/list/header.test.js
+++ b/x-pack/plugins/ml/public/application/settings/calendars/list/header.test.js
@@ -24,8 +24,11 @@ describe('CalendarListsHeader', () => {
     kibana: {
       services: {
         docLinks: {
-          ELASTIC_WEBSITE_URL: 'https://www.elastic.co/',
-          DOC_LINK_VERSION: 'jest-metadata-mock-branch',
+          links: {
+            ml: {
+              calendars: 'jest-metadata-mock-url',
+            },
+          },
         },
       },
     },
diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/list/header.js b/x-pack/plugins/ml/public/application/settings/filter_lists/list/header.js
index 1d300e3ae630..bf8e5175568a 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/list/header.js
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/list/header.js
@@ -26,8 +26,7 @@ import {
 import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 
 function FilterListsHeaderUI({ totalCount, refreshFilterLists, kibana }) {
-  const { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } = kibana.services.docLinks;
-  const docsUrl = `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-rules.html`;
+  const docsUrl = kibana.services.docLinks.links.ml.customRules;
   return (
     <React.Fragment>
       <EuiFlexGroup justifyContent="spaceBetween" alignItems="baseline">