diff --git a/src/plugins/custom_integrations/kibana.json b/src/plugins/custom_integrations/kibana.json
index cd58c1aec1ecb..7c11f47f4d82a 100755
--- a/src/plugins/custom_integrations/kibana.json
+++ b/src/plugins/custom_integrations/kibana.json
@@ -9,11 +9,8 @@
   "description": "Add custom data integrations so they can be displayed in the Fleet integrations app",
   "ui": true,
   "server": true,
-  "extraPublicDirs": [
-    "common"
-  ],
-  "requiredPlugins": [
-    "presentationUtil"
-  ],
+  "extraPublicDirs": ["common"],
+  "requiredPlugins": [],
+  "requiredBundles": ["presentationUtil"],
   "optionalPlugins": []
 }
diff --git a/src/plugins/custom_integrations/public/types.ts b/src/plugins/custom_integrations/public/types.ts
index 946115329e2b5..d4123cd2f1e13 100755
--- a/src/plugins/custom_integrations/public/types.ts
+++ b/src/plugins/custom_integrations/public/types.ts
@@ -6,8 +6,6 @@
  * Side Public License, v 1.
  */
 
-import type { PresentationUtilPluginStart } from '../../presentation_util/public';
-
 import { CustomIntegration } from '../common';
 
 export interface CustomIntegrationsSetup {
@@ -19,6 +17,5 @@ export interface CustomIntegrationsStart {
   ContextProvider: React.FC;
 }
 
-export interface CustomIntegrationsStartDependencies {
-  presentationUtil: PresentationUtilPluginStart;
-}
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface CustomIntegrationsStartDependencies {}
diff --git a/src/plugins/data/kibana.json b/src/plugins/data/kibana.json
index 3d70d138d80ed..e3369c2d571a6 100644
--- a/src/plugins/data/kibana.json
+++ b/src/plugins/data/kibana.json
@@ -5,7 +5,7 @@
   "ui": true,
   "requiredPlugins": ["bfetch", "expressions", "uiActions", "share", "inspector", "fieldFormats", "dataViews"],
   "serviceFolders": ["search", "query", "autocomplete", "ui"],
-  "optionalPlugins": ["usageCollection"],
+  "optionalPlugins": ["usageCollection", "taskManager", "security"],
   "extraPublicDirs": ["common"],
   "requiredBundles": ["kibanaUtils", "kibanaReact", "inspector"],
   "owner": {
diff --git a/src/plugins/home/tsconfig.json b/src/plugins/home/tsconfig.json
index 17d0fc7bd91ac..613bb8c08d448 100644
--- a/src/plugins/home/tsconfig.json
+++ b/src/plugins/home/tsconfig.json
@@ -10,7 +10,7 @@
   "include": ["common/**/*", "public/**/*", "server/**/*", "config.ts"],
   "references": [
     { "path": "../../core/tsconfig.json" },
-    { "path": "../data/tsconfig.json" },
+    { "path": "../data_views/tsconfig.json" },
     { "path": "../custom_integrations/tsconfig.json" },
     { "path": "../kibana_react/tsconfig.json" },
     { "path": "../share/tsconfig.json" },
diff --git a/x-pack/plugins/security/kibana.json b/x-pack/plugins/security/kibana.json
index 2eeac40e22f14..3d0bd9cbcbedc 100644
--- a/x-pack/plugins/security/kibana.json
+++ b/x-pack/plugins/security/kibana.json
@@ -8,7 +8,7 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "configPath": ["xpack", "security"],
-  "requiredPlugins": ["data", "features", "licensing", "taskManager"],
+  "requiredPlugins": ["dataViews", "features", "licensing", "taskManager"],
   "optionalPlugins": ["home", "management", "usageCollection", "spaces", "share"],
   "server": true,
   "ui": true,
diff --git a/x-pack/plugins/security/public/management/roles/roles_management_app.tsx b/x-pack/plugins/security/public/management/roles/roles_management_app.tsx
index 3c723bdfcc988..18a0ad37b88fc 100644
--- a/x-pack/plugins/security/public/management/roles/roles_management_app.tsx
+++ b/x-pack/plugins/security/public/management/roles/roles_management_app.tsx
@@ -44,7 +44,7 @@ export const rolesManagementApp = Object.freeze({
       title,
       async mount({ element, theme$, setBreadcrumbs, history }) {
         const [
-          [startServices, { data, features, spaces }],
+          [startServices, { dataViews, features, spaces }],
           { RolesGridPage },
           { EditRolePage },
           { RolesAPIClient },
@@ -108,7 +108,7 @@ export const rolesManagementApp = Object.freeze({
                 license={license}
                 docLinks={docLinks}
                 uiCapabilities={application.capabilities}
-                dataViews={data.dataViews}
+                dataViews={dataViews}
                 history={history}
                 spacesApiUi={spacesApiUi}
               />
diff --git a/x-pack/plugins/security/public/plugin.test.tsx b/x-pack/plugins/security/public/plugin.test.tsx
index 2bc4932b12a0b..98d0ea0ab25a2 100644
--- a/x-pack/plugins/security/public/plugin.test.tsx
+++ b/x-pack/plugins/security/public/plugin.test.tsx
@@ -10,7 +10,7 @@ import { Observable } from 'rxjs';
 
 import type { CoreSetup } from 'src/core/public';
 import { coreMock } from 'src/core/public/mocks';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
+import type { DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
 import { managementPluginMock } from 'src/plugins/management/public/mocks';
 
 import type { FeaturesPluginStart } from '../../features/public';
@@ -92,7 +92,7 @@ describe('Security Plugin', () => {
 
       expect(
         plugin.start(coreMock.createStart({ basePath: '/some-base-path' }), {
-          data: {} as DataPublicPluginStart,
+          dataViews: {} as DataViewsPublicPluginStart,
           features: {} as FeaturesPluginStart,
         })
       ).toEqual({
@@ -133,7 +133,7 @@ describe('Security Plugin', () => {
 
       const coreStart = coreMock.createStart({ basePath: '/some-base-path' });
       plugin.start(coreStart, {
-        data: {} as DataPublicPluginStart,
+        dataViews: {} as DataViewsPublicPluginStart,
         features: {} as FeaturesPluginStart,
         management: managementStartMock,
       });
@@ -162,7 +162,7 @@ describe('Security Plugin', () => {
       );
 
       plugin.start(coreMock.createStart({ basePath: '/some-base-path' }), {
-        data: {} as DataPublicPluginStart,
+        dataViews: {} as DataViewsPublicPluginStart,
         features: {} as FeaturesPluginStart,
       });
 
diff --git a/x-pack/plugins/security/public/plugin.tsx b/x-pack/plugins/security/public/plugin.tsx
index c2860ec059b8d..02618bbc7977a 100644
--- a/x-pack/plugins/security/public/plugin.tsx
+++ b/x-pack/plugins/security/public/plugin.tsx
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import type { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
+import type { DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
 import type { HomePublicPluginSetup } from 'src/plugins/home/public';
 import type { ManagementSetup, ManagementStart } from 'src/plugins/management/public';
 
@@ -39,7 +39,7 @@ export interface PluginSetupDependencies {
 }
 
 export interface PluginStartDependencies {
-  data: DataPublicPluginStart;
+  dataViews: DataViewsPublicPluginStart;
   features: FeaturesPluginStart;
   management?: ManagementStart;
   spaces?: SpacesPluginStart;
diff --git a/x-pack/plugins/security/tsconfig.json b/x-pack/plugins/security/tsconfig.json
index 5cc25bbb44055..e4566248efc46 100644
--- a/x-pack/plugins/security/tsconfig.json
+++ b/x-pack/plugins/security/tsconfig.json
@@ -12,7 +12,7 @@
     { "path": "../licensing/tsconfig.json" },
     { "path": "../spaces/tsconfig.json" },
     { "path": "../task_manager/tsconfig.json" },
-    { "path": "../../../src/plugins/data/tsconfig.json" },
+    { "path": "../../../src/plugins/data_views/tsconfig.json" },
     { "path": "../../../src/plugins/es_ui_shared/tsconfig.json" },
     { "path": "../../../src/plugins/home/tsconfig.json" },
     { "path": "../../../src/plugins/kibana_react/tsconfig.json" },