diff --git a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md
index 93bd6886c0974..ff2a8a2b5f75f 100644
--- a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md
+++ b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md
@@ -108,7 +108,7 @@ readonly links: {
         readonly ml: Record<string, string>;
         readonly transforms: Record<string, string>;
         readonly visualize: Record<string, string>;
-        readonly apis: {
+        readonly apis: Readonly<{
             createIndex: string;
             createSnapshotLifecyclePolicy: string;
             createRoleMapping: string;
@@ -123,12 +123,12 @@ readonly links: {
             putComponentTemplateMetadata: string;
             putWatch: string;
             updateTransform: string;
-        };
+        }>;
         readonly observability: Record<string, string>;
         readonly alerting: Record<string, string>;
         readonly maps: Record<string, string>;
         readonly monitoring: Record<string, string>;
-        readonly security: {
+        readonly security: Readonly<{
             apiKeyServiceSettings: string;
             clusterPrivileges: string;
             elasticsearchSettings: string;
@@ -139,7 +139,7 @@ readonly links: {
             mappingRoles: string;
             mappingRolesFieldRules: string;
             runAsPrivilege: string;
-        };
+        }>;
         readonly watcher: Record<string, string>;
         readonly ccs: Record<string, string>;
     };
diff --git a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md
index 6db8c98633834..8404326f773e6 100644
--- a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md
+++ b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md
@@ -17,5 +17,5 @@ export interface DocLinksStart
 |  --- | --- | --- |
 |  [DOC\_LINK\_VERSION](./kibana-plugin-core-public.doclinksstart.doc_link_version.md) | <code>string</code> |  |
 |  [ELASTIC\_WEBSITE\_URL](./kibana-plugin-core-public.doclinksstart.elastic_website_url.md) | <code>string</code> |  |
-|  [links](./kibana-plugin-core-public.doclinksstart.links.md) | <code>{</code><br/><code>        readonly dashboard: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly drilldowns: string;</code><br/><code>            readonly drilldownsTriggerPicker: string;</code><br/><code>            readonly urlDrilldownTemplateSyntax: string;</code><br/><code>            readonly urlDrilldownVariables: string;</code><br/><code>        };</code><br/><code>        readonly discover: Record&lt;string, string&gt;;</code><br/><code>        readonly filebeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly installation: string;</code><br/><code>            readonly configuration: string;</code><br/><code>            readonly elasticsearchOutput: string;</code><br/><code>            readonly startup: string;</code><br/><code>            readonly exportedFields: string;</code><br/><code>        };</code><br/><code>        readonly auditbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly metricbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly heartbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly logstash: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly functionbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly winlogbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly aggs: {</code><br/><code>            readonly date_histogram: string;</code><br/><code>            readonly date_range: string;</code><br/><code>            readonly date_format_pattern: string;</code><br/><code>            readonly filter: string;</code><br/><code>            readonly filters: string;</code><br/><code>            readonly geohash_grid: string;</code><br/><code>            readonly histogram: string;</code><br/><code>            readonly ip_range: string;</code><br/><code>            readonly range: string;</code><br/><code>            readonly significant_terms: string;</code><br/><code>            readonly terms: string;</code><br/><code>            readonly avg: string;</code><br/><code>            readonly avg_bucket: string;</code><br/><code>            readonly max_bucket: string;</code><br/><code>            readonly min_bucket: string;</code><br/><code>            readonly sum_bucket: string;</code><br/><code>            readonly cardinality: string;</code><br/><code>            readonly count: string;</code><br/><code>            readonly cumulative_sum: string;</code><br/><code>            readonly derivative: string;</code><br/><code>            readonly geo_bounds: string;</code><br/><code>            readonly geo_centroid: string;</code><br/><code>            readonly max: string;</code><br/><code>            readonly median: string;</code><br/><code>            readonly min: string;</code><br/><code>            readonly moving_avg: string;</code><br/><code>            readonly percentile_ranks: string;</code><br/><code>            readonly serial_diff: string;</code><br/><code>            readonly std_dev: string;</code><br/><code>            readonly sum: string;</code><br/><code>            readonly top_hits: string;</code><br/><code>        };</code><br/><code>        readonly runtimeFields: string;</code><br/><code>        readonly scriptedFields: {</code><br/><code>            readonly scriptFields: string;</code><br/><code>            readonly scriptAggs: string;</code><br/><code>            readonly painless: string;</code><br/><code>            readonly painlessApi: string;</code><br/><code>            readonly painlessSyntax: string;</code><br/><code>            readonly luceneExpressions: string;</code><br/><code>        };</code><br/><code>        readonly indexPatterns: {</code><br/><code>            readonly loadingData: string;</code><br/><code>            readonly introduction: string;</code><br/><code>        };</code><br/><code>        readonly addData: string;</code><br/><code>        readonly kibana: string;</code><br/><code>        readonly elasticsearch: Record&lt;string, string&gt;;</code><br/><code>        readonly siem: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly gettingStarted: string;</code><br/><code>        };</code><br/><code>        readonly query: {</code><br/><code>            readonly eql: string;</code><br/><code>            readonly luceneQuerySyntax: string;</code><br/><code>            readonly queryDsl: string;</code><br/><code>            readonly kueryQuerySyntax: string;</code><br/><code>        };</code><br/><code>        readonly date: {</code><br/><code>            readonly dateMath: string;</code><br/><code>        };</code><br/><code>        readonly management: Record&lt;string, string&gt;;</code><br/><code>        readonly ml: Record&lt;string, string&gt;;</code><br/><code>        readonly transforms: Record&lt;string, string&gt;;</code><br/><code>        readonly visualize: Record&lt;string, string&gt;;</code><br/><code>        readonly apis: {</code><br/><code>            createIndex: string;</code><br/><code>            createSnapshotLifecyclePolicy: string;</code><br/><code>            createRoleMapping: string;</code><br/><code>            createRoleMappingTemplates: string;</code><br/><code>            createApiKey: string;</code><br/><code>            createPipeline: string;</code><br/><code>            createTransformRequest: string;</code><br/><code>            executeWatchActionModes: string;</code><br/><code>            openIndex: string;</code><br/><code>            putComponentTemplate: string;</code><br/><code>            painlessExecute: string;</code><br/><code>            putComponentTemplateMetadata: string;</code><br/><code>            putWatch: string;</code><br/><code>            updateTransform: string;</code><br/><code>        };</code><br/><code>        readonly observability: Record&lt;string, string&gt;;</code><br/><code>        readonly alerting: Record&lt;string, string&gt;;</code><br/><code>        readonly maps: Record&lt;string, string&gt;;</code><br/><code>        readonly monitoring: Record&lt;string, string&gt;;</code><br/><code>        readonly security: {</code><br/><code>            apiKeyServiceSettings: string;</code><br/><code>            clusterPrivileges: string;</code><br/><code>            elasticsearchSettings: string;</code><br/><code>            elasticsearchEnableSecurity: string;</code><br/><code>            indicesPrivileges: string;</code><br/><code>            kibanaTLS: string;</code><br/><code>            kibanaPrivileges: string;</code><br/><code>            mappingRoles: string;</code><br/><code>            mappingRolesFieldRules: string;</code><br/><code>            runAsPrivilege: string;</code><br/><code>        };</code><br/><code>        readonly watcher: Record&lt;string, string&gt;;</code><br/><code>        readonly ccs: Record&lt;string, string&gt;;</code><br/><code>    }</code> |  |
+|  [links](./kibana-plugin-core-public.doclinksstart.links.md) | <code>{</code><br/><code>        readonly dashboard: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly drilldowns: string;</code><br/><code>            readonly drilldownsTriggerPicker: string;</code><br/><code>            readonly urlDrilldownTemplateSyntax: string;</code><br/><code>            readonly urlDrilldownVariables: string;</code><br/><code>        };</code><br/><code>        readonly discover: Record&lt;string, string&gt;;</code><br/><code>        readonly filebeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly installation: string;</code><br/><code>            readonly configuration: string;</code><br/><code>            readonly elasticsearchOutput: string;</code><br/><code>            readonly startup: string;</code><br/><code>            readonly exportedFields: string;</code><br/><code>        };</code><br/><code>        readonly auditbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly metricbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly heartbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly logstash: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly functionbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly winlogbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly aggs: {</code><br/><code>            readonly date_histogram: string;</code><br/><code>            readonly date_range: string;</code><br/><code>            readonly date_format_pattern: string;</code><br/><code>            readonly filter: string;</code><br/><code>            readonly filters: string;</code><br/><code>            readonly geohash_grid: string;</code><br/><code>            readonly histogram: string;</code><br/><code>            readonly ip_range: string;</code><br/><code>            readonly range: string;</code><br/><code>            readonly significant_terms: string;</code><br/><code>            readonly terms: string;</code><br/><code>            readonly avg: string;</code><br/><code>            readonly avg_bucket: string;</code><br/><code>            readonly max_bucket: string;</code><br/><code>            readonly min_bucket: string;</code><br/><code>            readonly sum_bucket: string;</code><br/><code>            readonly cardinality: string;</code><br/><code>            readonly count: string;</code><br/><code>            readonly cumulative_sum: string;</code><br/><code>            readonly derivative: string;</code><br/><code>            readonly geo_bounds: string;</code><br/><code>            readonly geo_centroid: string;</code><br/><code>            readonly max: string;</code><br/><code>            readonly median: string;</code><br/><code>            readonly min: string;</code><br/><code>            readonly moving_avg: string;</code><br/><code>            readonly percentile_ranks: string;</code><br/><code>            readonly serial_diff: string;</code><br/><code>            readonly std_dev: string;</code><br/><code>            readonly sum: string;</code><br/><code>            readonly top_hits: string;</code><br/><code>        };</code><br/><code>        readonly runtimeFields: string;</code><br/><code>        readonly scriptedFields: {</code><br/><code>            readonly scriptFields: string;</code><br/><code>            readonly scriptAggs: string;</code><br/><code>            readonly painless: string;</code><br/><code>            readonly painlessApi: string;</code><br/><code>            readonly painlessSyntax: string;</code><br/><code>            readonly luceneExpressions: string;</code><br/><code>        };</code><br/><code>        readonly indexPatterns: {</code><br/><code>            readonly loadingData: string;</code><br/><code>            readonly introduction: string;</code><br/><code>        };</code><br/><code>        readonly addData: string;</code><br/><code>        readonly kibana: string;</code><br/><code>        readonly elasticsearch: Record&lt;string, string&gt;;</code><br/><code>        readonly siem: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly gettingStarted: string;</code><br/><code>        };</code><br/><code>        readonly query: {</code><br/><code>            readonly eql: string;</code><br/><code>            readonly luceneQuerySyntax: string;</code><br/><code>            readonly queryDsl: string;</code><br/><code>            readonly kueryQuerySyntax: string;</code><br/><code>        };</code><br/><code>        readonly date: {</code><br/><code>            readonly dateMath: string;</code><br/><code>        };</code><br/><code>        readonly management: Record&lt;string, string&gt;;</code><br/><code>        readonly ml: Record&lt;string, string&gt;;</code><br/><code>        readonly transforms: Record&lt;string, string&gt;;</code><br/><code>        readonly visualize: Record&lt;string, string&gt;;</code><br/><code>        readonly apis: Readonly&lt;{</code><br/><code>            createIndex: string;</code><br/><code>            createSnapshotLifecyclePolicy: string;</code><br/><code>            createRoleMapping: string;</code><br/><code>            createRoleMappingTemplates: string;</code><br/><code>            createApiKey: string;</code><br/><code>            createPipeline: string;</code><br/><code>            createTransformRequest: string;</code><br/><code>            executeWatchActionModes: string;</code><br/><code>            openIndex: string;</code><br/><code>            putComponentTemplate: string;</code><br/><code>            painlessExecute: string;</code><br/><code>            putComponentTemplateMetadata: string;</code><br/><code>            putWatch: string;</code><br/><code>            updateTransform: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly observability: Record&lt;string, string&gt;;</code><br/><code>        readonly alerting: Record&lt;string, string&gt;;</code><br/><code>        readonly maps: Record&lt;string, string&gt;;</code><br/><code>        readonly monitoring: Record&lt;string, string&gt;;</code><br/><code>        readonly security: Readonly&lt;{</code><br/><code>            apiKeyServiceSettings: string;</code><br/><code>            clusterPrivileges: string;</code><br/><code>            elasticsearchSettings: string;</code><br/><code>            elasticsearchEnableSecurity: string;</code><br/><code>            indicesPrivileges: string;</code><br/><code>            kibanaTLS: string;</code><br/><code>            kibanaPrivileges: string;</code><br/><code>            mappingRoles: string;</code><br/><code>            mappingRolesFieldRules: string;</code><br/><code>            runAsPrivilege: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly watcher: Record&lt;string, string&gt;;</code><br/><code>        readonly ccs: Record&lt;string, string&gt;;</code><br/><code>    }</code> |  |
 
diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts
index 605f9dcfd8b63..6c0ced7022cb2 100644
--- a/src/core/public/doc_links/doc_links_service.ts
+++ b/src/core/public/doc_links/doc_links_service.ts
@@ -344,7 +344,7 @@ export interface DocLinksStart {
     readonly ml: Record<string, string>;
     readonly transforms: Record<string, string>;
     readonly visualize: Record<string, string>;
-    readonly apis: {
+    readonly apis: Readonly<{
       createIndex: string;
       createSnapshotLifecyclePolicy: string;
       createRoleMapping: string;
@@ -359,12 +359,12 @@ export interface DocLinksStart {
       putComponentTemplateMetadata: string;
       putWatch: string;
       updateTransform: string;
-    };
+    }>;
     readonly observability: Record<string, string>;
     readonly alerting: Record<string, string>;
     readonly maps: Record<string, string>;
     readonly monitoring: Record<string, string>;
-    readonly security: {
+    readonly security: Readonly<{
       apiKeyServiceSettings: string;
       clusterPrivileges: string;
       elasticsearchSettings: string;
@@ -375,7 +375,7 @@ export interface DocLinksStart {
       mappingRoles: string;
       mappingRolesFieldRules: string;
       runAsPrivilege: string;
-    };
+    }>;
     readonly watcher: Record<string, string>;
     readonly ccs: Record<string, string>;
   };
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 99277c7e31c24..2f4c871c33431 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -587,7 +587,7 @@ export interface DocLinksStart {
         readonly ml: Record<string, string>;
         readonly transforms: Record<string, string>;
         readonly visualize: Record<string, string>;
-        readonly apis: {
+        readonly apis: Readonly<{
             createIndex: string;
             createSnapshotLifecyclePolicy: string;
             createRoleMapping: string;
@@ -602,12 +602,12 @@ export interface DocLinksStart {
             putComponentTemplateMetadata: string;
             putWatch: string;
             updateTransform: string;
-        };
+        }>;
         readonly observability: Record<string, string>;
         readonly alerting: Record<string, string>;
         readonly maps: Record<string, string>;
         readonly monitoring: Record<string, string>;
-        readonly security: {
+        readonly security: Readonly<{
             apiKeyServiceSettings: string;
             clusterPrivileges: string;
             elasticsearchSettings: string;
@@ -618,7 +618,7 @@ export interface DocLinksStart {
             mappingRoles: string;
             mappingRolesFieldRules: string;
             runAsPrivilege: string;
-        };
+        }>;
         readonly watcher: Record<string, string>;
         readonly ccs: Record<string, string>;
     };
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.test.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.test.tsx
index 04d543fc0292b..a55d872ca60f9 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.test.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.test.tsx
@@ -67,10 +67,9 @@ describe('APIKeysGridPage', () => {
 
   const coreStart = coreMock.createStart();
   const renderView = () => {
-    const { docLinks, notifications, application } = coreStart;
     return mountWithIntl(
-      <KibanaContextProvider services={{ application, docLinks }}>
-        <APIKeysGridPage apiKeysAPIClient={apiClientMock} notifications={notifications} />
+      <KibanaContextProvider services={coreStart}>
+        <APIKeysGridPage apiKeysAPIClient={apiClientMock} notifications={coreStart.notifications} />
       </KibanaContextProvider>
     );
   };
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/empty_prompt/empty_prompt.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/empty_prompt/empty_prompt.tsx
index 2a75ff1723c64..39a34efb9f934 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/empty_prompt/empty_prompt.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/empty_prompt/empty_prompt.tsx
@@ -44,7 +44,7 @@ export const EmptyPrompt: React.FunctionComponent<Props> = ({ isAdmin }) => {
               defaultMessage="You can create an {link} from Console."
               values={{
                 link: (
-                  <EuiLink href={`${docLinks.links.apis.createApiKey}`} target="_blank">
+                  <EuiLink href={docLinks.links.apis.createApiKey} target="_blank">
                     <FormattedMessage
                       id="xpack.security.management.apiKeys.table.emptyPromptDocsLinkMessage"
                       defaultMessage="API key"
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx
index 8a925d062ca9a..241bb43828814 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx
@@ -35,24 +35,20 @@ export const apiKeysManagementApp = Object.freeze({
           },
         ]);
 
-        const [
-          [{ docLinks, http, notifications, i18n: i18nStart, application }],
-          { APIKeysGridPage },
-          { APIKeysAPIClient },
-        ] = await Promise.all([
+        const [[core], { APIKeysGridPage }, { APIKeysAPIClient }] = await Promise.all([
           getStartServices(),
           import('./api_keys_grid'),
           import('./api_keys_api_client'),
         ]);
 
         render(
-          <KibanaContextProvider services={{ application, docLinks }}>
-            <i18nStart.Context>
+          <KibanaContextProvider services={core}>
+            <core.i18n.Context>
               <APIKeysGridPage
-                notifications={notifications}
-                apiKeysAPIClient={new APIKeysAPIClient(http)}
+                notifications={core.notifications}
+                apiKeysAPIClient={new APIKeysAPIClient(core.http)}
               />
-            </i18nStart.Context>
+            </core.i18n.Context>
           </KibanaContextProvider>,
           element
         );
diff --git a/x-pack/plugins/security/public/management/role_mappings/components/no_compatible_realms/no_compatible_realms.tsx b/x-pack/plugins/security/public/management/role_mappings/components/no_compatible_realms/no_compatible_realms.tsx
index 0c70a8228e454..a3a7377b0d395 100644
--- a/x-pack/plugins/security/public/management/role_mappings/components/no_compatible_realms/no_compatible_realms.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/components/no_compatible_realms/no_compatible_realms.tsx
@@ -27,7 +27,7 @@ export const NoCompatibleRealms: React.FunctionComponent = () => {
         defaultMessage="Role mappings will not be applied to any users. Contact your system administrator and refer to the {link} for more information."
         values={{
           link: (
-            <EuiLink href={docLinks.links.security.mappingRoles} external={true} target="_blank">
+            <EuiLink href={docLinks.links.security.mappingRoles} external target="_blank">
               <FormattedMessage
                 id="xpack.security.management.roleMappings.noCompatibleRealmsErrorLinkText"
                 defaultMessage="docs"
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.test.tsx
index 587552c26d7c9..64ef1459a5246 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.test.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.test.tsx
@@ -35,15 +35,15 @@ describe('EditRoleMappingPage', () => {
     roleMappingsAPI: ReturnType<typeof roleMappingsAPIClientMock.create>,
     name?: string
   ) => {
-    const { docLinks, notifications } = coreMock.createStart();
+    const coreStart = coreMock.createStart();
     return mountWithIntl(
-      <KibanaContextProvider services={{ docLinks }}>
+      <KibanaContextProvider services={coreStart}>
         <EditRoleMappingPage
           name={name}
           roleMappingsAPI={roleMappingsAPI}
           rolesAPIClient={rolesAPI}
-          notifications={notifications}
-          docLinks={docLinks}
+          notifications={coreStart.notifications}
+          docLinks={coreStart.docLinks}
           history={history}
         />
       </KibanaContextProvider>
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.test.tsx
index 4d73c70f891e3..5c7c6ed5b3ca1 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.test.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.test.tsx
@@ -24,9 +24,9 @@ import { coreMock } from '../../../../../../../../src/core/public/mocks';
 
 describe('JSONRuleEditor', () => {
   const renderView = (props: React.ComponentProps<typeof JSONRuleEditor>) => {
-    const { docLinks } = coreMock.createStart();
+    const coreStart = coreMock.createStart();
     return mountWithIntl(
-      <KibanaContextProvider services={{ docLinks }}>
+      <KibanaContextProvider services={coreStart}>
         <JSONRuleEditor {...props} />
       </KibanaContextProvider>
     );
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.test.tsx
index 2cc414f1fbd1f..5a44a7c05c193 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.test.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.test.tsx
@@ -22,10 +22,12 @@ import { KibanaContextProvider } from '../../../../../../../../src/plugins/kiban
 import { coreMock } from '../../../../../../../../src/core/public/mocks';
 
 describe('RuleEditorPanel', () => {
-  const renderView = (props: React.ComponentProps<typeof RuleEditorPanel>) => {
+  const renderView = (props: Omit<React.ComponentProps<typeof RuleEditorPanel>, 'docLinks'>) => {
+    const coreStart = coreMock.createStart();
+    const viewProps = { ...props, docLinks: coreStart.docLinks };
     return mountWithIntl(
-      <KibanaContextProvider services={{ docLinks: props.docLinks }}>
-        <RuleEditorPanel {...props} />
+      <KibanaContextProvider services={coreStart}>
+        <RuleEditorPanel {...viewProps} />
       </KibanaContextProvider>
     );
   };
@@ -35,7 +37,6 @@ describe('RuleEditorPanel', () => {
       onChange: jest.fn(),
       onValidityChange: jest.fn(),
       validateForm: false,
-      docLinks: coreMock.createStart().docLinks,
     };
     const wrapper = renderView(props);
     expect(wrapper.find(VisualRuleEditor)).toHaveLength(1);
@@ -80,7 +81,6 @@ describe('RuleEditorPanel', () => {
       onChange: jest.fn(),
       onValidityChange: jest.fn(),
       validateForm: false,
-      docLinks: coreMock.createStart().docLinks,
     };
     const wrapper = renderView(props);
 
@@ -116,7 +116,6 @@ describe('RuleEditorPanel', () => {
       onChange: jest.fn(),
       onValidityChange: jest.fn(),
       validateForm: false,
-      docLinks: coreMock.createStart().docLinks,
     };
     const wrapper = renderView(props);
 
diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.test.tsx b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.test.tsx
index 5c79cb4b7742d..05edd3a370092 100644
--- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.test.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.test.tsx
@@ -27,16 +27,15 @@ describe('RoleMappingsGridPage', () => {
     roleMappingsAPI: ReturnType<typeof roleMappingsAPIClientMock.create>,
     rolesAPI: ReturnType<typeof rolesAPIClientMock.create> = rolesAPIClientMock.create()
   ) => {
-    const { application, docLinks, notifications } = coreStart;
     return mountWithIntl(
-      <KibanaContextProvider services={{ docLinks }}>
+      <KibanaContextProvider services={coreStart}>
         <RoleMappingsGridPage
           rolesAPIClient={rolesAPI}
           roleMappingsAPI={roleMappingsAPI}
-          notifications={notifications}
-          docLinks={docLinks}
+          notifications={coreStart.notifications}
+          docLinks={coreStart.docLinks}
           history={history}
-          navigateToApp={application.navigateToApp}
+          navigateToApp={coreStart.application.navigateToApp}
         />
       </KibanaContextProvider>
     );
diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx b/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx
index 3f3bf4ad809ce..28b452c10c237 100644
--- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx
@@ -39,7 +39,7 @@ export const roleMappingsManagementApp = Object.freeze({
         ];
 
         const [
-          [{ docLinks, http, notifications, i18n: i18nStart }],
+          [core],
           { RoleMappingsGridPage },
           { EditRoleMappingPage },
           { RoleMappingsAPIClient },
@@ -52,15 +52,15 @@ export const roleMappingsManagementApp = Object.freeze({
           import('../roles'),
         ]);
 
-        const roleMappingsAPIClient = new RoleMappingsAPIClient(http);
+        const roleMappingsAPIClient = new RoleMappingsAPIClient(core.http);
         const RoleMappingsGridPageWithBreadcrumbs = () => {
           setBreadcrumbs(roleMappingsBreadcrumbs);
           return (
             <RoleMappingsGridPage
-              notifications={notifications}
-              rolesAPIClient={new RolesAPIClient(http)}
+              notifications={core.notifications}
+              rolesAPIClient={new RolesAPIClient(core.http)}
               roleMappingsAPI={roleMappingsAPIClient}
-              docLinks={docLinks}
+              docLinks={core.docLinks}
               history={history}
               navigateToApp={coreStart.application.navigateToApp}
             />
@@ -89,17 +89,17 @@ export const roleMappingsManagementApp = Object.freeze({
             <EditRoleMappingPage
               name={decodedName}
               roleMappingsAPI={roleMappingsAPIClient}
-              rolesAPIClient={new RolesAPIClient(http)}
-              notifications={notifications}
-              docLinks={docLinks}
+              rolesAPIClient={new RolesAPIClient(core.http)}
+              notifications={core.notifications}
+              docLinks={core.docLinks}
               history={history}
             />
           );
         };
 
         render(
-          <KibanaContextProvider services={{ docLinks }}>
-            <i18nStart.Context>
+          <KibanaContextProvider services={core}>
+            <core.i18n.Context>
               <Router history={history}>
                 <Switch>
                   <Route path={['/', '']} exact={true}>
@@ -110,7 +110,7 @@ export const roleMappingsManagementApp = Object.freeze({
                   </Route>
                 </Switch>
               </Router>
-            </i18nStart.Context>
+            </core.i18n.Context>
           </KibanaContextProvider>,
           element
         );